summaryrefslogtreecommitdiff
path: root/demos/time-tracker
diff options
context:
space:
mode:
authorJean-Luc Gyger <jean-luc.gyger@vysual.ch>2016-02-11 10:01:12 +0100
committerJean-Luc Gyger <jean-luc.gyger@vysual.ch>2016-02-11 10:01:12 +0100
commitd70861a8f9368773f2f0291454e9420174e6c14a (patch)
treee44a32e401211422fb05da355c9eef4d5934d9e9 /demos/time-tracker
parentd32f65815eb6feb4bcb8a0c85572f722d7826342 (diff)
parent275f16b90a92c62935cb691d11e0bd124acf64e4 (diff)
Merge branch 'master' of https://github.com/majuca/prado
Diffstat (limited to 'demos/time-tracker')
-rwxr-xr-xdemos/time-tracker/protected/App_Code/Dao/BaseDao.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/Dao/ProjectDao.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/Dao/ProjectRecord.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/Dao/UserDao.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/DaoManager.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/TimeTrackerException.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/TimeTrackerUser.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Code/UserManager.php4
-rwxr-xr-xdemos/time-tracker/protected/App_Data/MySQL4/mysql-reset.sql6
-rwxr-xr-xdemos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql6
-rwxr-xr-xdemos/time-tracker/protected/App_Data/TimeTrackerUserTypeHandler.php4
-rwxr-xr-xdemos/time-tracker/protected/pages/TimeTracker/Login.php4
-rwxr-xr-xdemos/time-tracker/protected/pages/TimeTracker/Logout.php4
-rwxr-xr-xdemos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl2
-rwxr-xr-xdemos/time-tracker/protected/pages/TimeTracker/SiteMap.php4
-rwxr-xr-xdemos/time-tracker/protected/pages/TimeTracker/UserCreate.php4
-rwxr-xr-xdemos/time-tracker/protected/pages/TimeTracker/UserList.php4
-rwxr-xr-xdemos/time-tracker/tests/unit/UserDaoTestCase.php12
18 files changed, 41 insertions, 41 deletions
diff --git a/demos/time-tracker/protected/App_Code/Dao/BaseDao.php b/demos/time-tracker/protected/App_Code/Dao/BaseDao.php
index 571a9d1a..b64139c0 100755
--- a/demos/time-tracker/protected/App_Code/Dao/BaseDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/BaseDao.php
@@ -3,9 +3,9 @@
* Base DAO class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php b/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php
index 0110ae5e..5e71c3ea 100755
--- a/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/ProjectDao.php
@@ -3,9 +3,9 @@
* Project DAO class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php b/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php
index c02a78a5..728946e1 100755
--- a/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php
+++ b/demos/time-tracker/protected/App_Code/Dao/ProjectRecord.php
@@ -3,9 +3,9 @@
* Project class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/Dao/UserDao.php b/demos/time-tracker/protected/App_Code/Dao/UserDao.php
index 51d04c58..16981d41 100755
--- a/demos/time-tracker/protected/App_Code/Dao/UserDao.php
+++ b/demos/time-tracker/protected/App_Code/Dao/UserDao.php
@@ -3,9 +3,9 @@
* User Dao class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/DaoManager.php b/demos/time-tracker/protected/App_Code/DaoManager.php
index 90655ac8..3505f50e 100755
--- a/demos/time-tracker/protected/App_Code/DaoManager.php
+++ b/demos/time-tracker/protected/App_Code/DaoManager.php
@@ -3,9 +3,9 @@
* DaoManager class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/TimeTrackerException.php b/demos/time-tracker/protected/App_Code/TimeTrackerException.php
index 87398952..3d1d114c 100755
--- a/demos/time-tracker/protected/App_Code/TimeTrackerException.php
+++ b/demos/time-tracker/protected/App_Code/TimeTrackerException.php
@@ -3,9 +3,9 @@
* TimeTrackerException class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/TimeTrackerUser.php b/demos/time-tracker/protected/App_Code/TimeTrackerUser.php
index 5215b31c..2777d4db 100755
--- a/demos/time-tracker/protected/App_Code/TimeTrackerUser.php
+++ b/demos/time-tracker/protected/App_Code/TimeTrackerUser.php
@@ -3,9 +3,9 @@
* TimeTrackerUser class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Code/UserManager.php b/demos/time-tracker/protected/App_Code/UserManager.php
index eabbe315..5b1f66d5 100755
--- a/demos/time-tracker/protected/App_Code/UserManager.php
+++ b/demos/time-tracker/protected/App_Code/UserManager.php
@@ -3,9 +3,9 @@
* UserManager class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/App_Data/MySQL4/mysql-reset.sql b/demos/time-tracker/protected/App_Data/MySQL4/mysql-reset.sql
index e9581952..3293c433 100755
--- a/demos/time-tracker/protected/App_Data/MySQL4/mysql-reset.sql
+++ b/demos/time-tracker/protected/App_Data/MySQL4/mysql-reset.sql
@@ -13,9 +13,9 @@ INSERT INTO role_types (RoleType, Description) VALUES
('manager', 'Project manager may additionally edit all projects and view reports.');
INSERT INTO users (Username, Password, EmailAddress, Disabled) VALUES
-('admin', '21232f297a57a5a743894a0e4a801fc3', 'admin@pradosoft.com', 0),
-('manager', '1d0258c2440a8d19e716292b231e3190', 'manager@pradosoft.com', 0),
-('consultant', '7adfa4f2ba9323e6c1e024de375434b0', 'consultant@pradosoft.com', 0);
+('admin', '21232f297a57a5a743894a0e4a801fc3', 'admin@prado.local', 0),
+('manager', '1d0258c2440a8d19e716292b231e3190', 'manager@prado.local', 0),
+('consultant', '7adfa4f2ba9323e6c1e024de375434b0', 'consultant@prado.local', 0);
INSERT INTO user_roles (UserID, RoleType) VALUES
('admin', 'admin'),
diff --git a/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql b/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql
index 91481efe..41e9b211 100755
--- a/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql
+++ b/demos/time-tracker/protected/App_Data/MySQL4/time-tracker-mysql.sql
@@ -177,9 +177,9 @@ CREATE TABLE IF NOT EXISTS `users` (
-- Dumping data for table `users`
--
-INSERT INTO `users` (`Username`, `Password`, `EmailAddress`, `Disabled`) VALUES ('admin', '21232f297a57a5a743894a0e4a801fc3', 'admin@pradosoft.com', 0),
-('consultant', '7adfa4f2ba9323e6c1e024de375434b0', 'consultant@pradosoft.com', 0),
-('manager', '1d0258c2440a8d19e716292b231e3190', 'manager@pradosoft.com', 0);
+INSERT INTO `users` (`Username`, `Password`, `EmailAddress`, `Disabled`) VALUES ('admin', '21232f297a57a5a743894a0e4a801fc3', 'admin@prado.local', 0),
+('consultant', '7adfa4f2ba9323e6c1e024de375434b0', 'consultant@prado.local', 0),
+('manager', '1d0258c2440a8d19e716292b231e3190', 'manager@prado.local', 0);
--
-- Constraints for dumped tables
diff --git a/demos/time-tracker/protected/App_Data/TimeTrackerUserTypeHandler.php b/demos/time-tracker/protected/App_Data/TimeTrackerUserTypeHandler.php
index 12a8a23e..923664a9 100755
--- a/demos/time-tracker/protected/App_Data/TimeTrackerUserTypeHandler.php
+++ b/demos/time-tracker/protected/App_Data/TimeTrackerUserTypeHandler.php
@@ -3,9 +3,9 @@
* TimeTrackerUserTypeHandler class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/pages/TimeTracker/Login.php b/demos/time-tracker/protected/pages/TimeTracker/Login.php
index 8de63ad8..0eca050c 100755
--- a/demos/time-tracker/protected/pages/TimeTracker/Login.php
+++ b/demos/time-tracker/protected/pages/TimeTracker/Login.php
@@ -3,9 +3,9 @@
* Login Page class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/pages/TimeTracker/Logout.php b/demos/time-tracker/protected/pages/TimeTracker/Logout.php
index bab924f2..3ca0f96a 100755
--- a/demos/time-tracker/protected/pages/TimeTracker/Logout.php
+++ b/demos/time-tracker/protected/pages/TimeTracker/Logout.php
@@ -3,9 +3,9 @@
* Logout class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl b/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl
index 44aea22b..c1e23f45 100755
--- a/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl
+++ b/demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl
@@ -36,7 +36,7 @@
</com:TForm>
<div class="copyrights">
-Copyright &copy; 2005-2006 <a href="http://www.pradosoft.com">PradoSoft</a>.
+Copyright &copy; 2005-2015 <a href="https://github.com/pradosoft">The PRADO Group</a>.
<span class="note"><a href="http://www.famfamfam.com/lab/icons/silk/">Silk icons</a> by Mark James.</span>
</div>
diff --git a/demos/time-tracker/protected/pages/TimeTracker/SiteMap.php b/demos/time-tracker/protected/pages/TimeTracker/SiteMap.php
index ab612baf..9f5e111a 100755
--- a/demos/time-tracker/protected/pages/TimeTracker/SiteMap.php
+++ b/demos/time-tracker/protected/pages/TimeTracker/SiteMap.php
@@ -3,9 +3,9 @@
* SiteMap template class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/pages/TimeTracker/UserCreate.php b/demos/time-tracker/protected/pages/TimeTracker/UserCreate.php
index 34e69713..e58bf4ff 100755
--- a/demos/time-tracker/protected/pages/TimeTracker/UserCreate.php
+++ b/demos/time-tracker/protected/pages/TimeTracker/UserCreate.php
@@ -3,9 +3,9 @@
* UserCreate page class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/protected/pages/TimeTracker/UserList.php b/demos/time-tracker/protected/pages/TimeTracker/UserList.php
index 71b41add..344d5d2a 100755
--- a/demos/time-tracker/protected/pages/TimeTracker/UserList.php
+++ b/demos/time-tracker/protected/pages/TimeTracker/UserList.php
@@ -3,9 +3,9 @@
* UserList page class file.
*
* @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link http://www.pradosoft.com/
+ * @link https://github.com/pradosoft/prado
* @copyright Copyright &copy; 2005-2006 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package Demos
*/
diff --git a/demos/time-tracker/tests/unit/UserDaoTestCase.php b/demos/time-tracker/tests/unit/UserDaoTestCase.php
index d288faaf..5cae0f51 100755
--- a/demos/time-tracker/tests/unit/UserDaoTestCase.php
+++ b/demos/time-tracker/tests/unit/UserDaoTestCase.php
@@ -19,7 +19,7 @@ class UserDaoTestCase extends BaseTestCase
if(!$user)
return $this->fail();
$this->assertEqual($user->getName(), 'admin');
- $this->assertEqual($user->getEmailAddress(), 'admin@pradosoft.com');
+ $this->assertEqual($user->getEmailAddress(), 'admin@prado.local');
}
function assertSameUser($user1, $user2)
@@ -99,7 +99,7 @@ class UserDaoTestCase extends BaseTestCase
{
$user = new TimeTrackerUser(new UserManager());
$user->Name = "user1";
- $user->EmailAddress = 'user1@pradosoft.com';
+ $user->EmailAddress = 'user1@prado.local';
$this->userDao->addNewUser($user, 'password');
@@ -155,7 +155,7 @@ class UserDaoTestCase extends BaseTestCase
{
$user = new TimeTrackerUser(new UserManager());
$user->Name = "user1";
- $user->EmailAddress = 'user1@pradosoft.com';
+ $user->EmailAddress = 'user1@prado.local';
$user->Roles = array("manager", "consultant");
$this->userDao->addNewUser($user, 'password');
@@ -169,7 +169,7 @@ class UserDaoTestCase extends BaseTestCase
{
$user = new TimeTrackerUser(new UserManager());
$user->Name = "user1";
- $user->EmailAddress = 'user1@pradosoft.com';
+ $user->EmailAddress = 'user1@prado.local';
$user->Roles = array("manager", "consultant");
try
@@ -189,7 +189,7 @@ class UserDaoTestCase extends BaseTestCase
function testUpdateUser()
{
$user = $this->userDao->getUserByName('admin');
- $user->EmailAddress = 'something@pradosoft.com';
+ $user->EmailAddress = 'something@prado.local';
$user->Roles = array('manager', 'admin');
$this->userDao->updateUser($user);
@@ -203,7 +203,7 @@ class UserDaoTestCase extends BaseTestCase
function testUpdateUserPassword()
{
$user = $this->userDao->getUserByName('admin');
- $user->EmailAddress = 'something@pradosoft.com';
+ $user->EmailAddress = 'something@prado.local';
$user->Roles = array('manager', 'admin');
$pass = 'newpasword';