From c7d41e5bea4a5f96979a08da9cc9f79355edfe70 Mon Sep 17 00:00:00 2001 From: wei <> Date: Sun, 16 Jul 2006 06:19:36 +0000 Subject: Update Time Tracker demo. --- .gitattributes | 51 ++-- buildscripts/texbuilder/quickstart/build.php | 2 +- buildscripts/texbuilder/sqlmap/build.php | 2 +- buildscripts/texbuilder/sqlmap/pages.php | 6 +- buildscripts/texbuilder/time-tracker/db.vsd | Bin 102912 -> 102912 bytes buildscripts/texbuilder/time-tracker/pages.php | 18 +- .../texbuilder/time-tracker/time-tracker.tex | 11 + demos/sqlmap/protected/APP_CODE/Person.php | 26 ++ demos/sqlmap/protected/application.xml | 17 +- demos/sqlmap/protected/business-objects/Person.php | 26 -- demos/sqlmap/protected/controls/Layout.php | 7 - demos/sqlmap/protected/controls/Layout.tpl | 45 ---- demos/sqlmap/protected/controls/TopicList.php | 8 - demos/sqlmap/protected/controls/TopicList.tpl | 66 ----- demos/sqlmap/protected/pages/Home.page | 1 - demos/sqlmap/protected/pages/Manual/Layout.php | 7 + demos/sqlmap/protected/pages/Manual/Layout.tpl | 45 ++++ demos/sqlmap/protected/pages/Manual/Overview.page | 10 +- demos/sqlmap/protected/pages/Manual/TopicList.php | 8 + demos/sqlmap/protected/pages/Manual/TopicList.tpl | 66 +++++ .../protected/pages/Manual/Tutorial/TestAgain.page | 214 ++++++++++++++++ .../protected/pages/Manual/Tutorial/TestFirst.page | 238 +++++++++++++++++ .../pages/Manual/Tutorial/TestSecond.page | 116 +++++++++ .../protected/pages/Manual/Tutorial/example1.png | Bin 0 -> 236887 bytes .../protected/pages/Manual/Tutorial/grid1.png | Bin 0 -> 275250 bytes .../protected/pages/Manual/Tutorial/grid2.png | Bin 0 -> 218210 bytes .../sqlmap/protected/pages/Tutorial/TestAgain.page | 214 ---------------- .../sqlmap/protected/pages/Tutorial/TestFirst.page | 238 ----------------- .../protected/pages/Tutorial/TestSecond.page | 116 --------- demos/sqlmap/protected/pages/Tutorial/example1.png | Bin 236887 -> 0 bytes demos/sqlmap/protected/pages/Tutorial/grid1.png | Bin 275250 -> 0 bytes demos/sqlmap/protected/pages/Tutorial/grid2.png | Bin 218210 -> 0 bytes demos/sqlmap/protected/pages/config.xml | 8 - demos/time-tracker/protected/APP_CODE/BaseDao.php | 27 ++ .../time-tracker/protected/APP_CODE/DaoManager.php | 126 +++++++++ demos/time-tracker/protected/APP_CODE/Project.php | 18 ++ .../time-tracker/protected/APP_CODE/ProjectDao.php | 23 +- .../protected/APP_CODE/TimeTrackerException.php | 19 ++ .../protected/APP_CODE/TimeTrackerUser.php | 51 ++-- .../APP_CODE/TimeTrackerUserTypeHandler.php | 54 ++++ demos/time-tracker/protected/APP_CODE/UserDao.php | 155 +++++++++++ .../protected/APP_CODE/UserManager.php | 68 +++++ .../time-tracker/protected/APP_CODE/exceptions.txt | 6 +- .../protected/App_Data/time_tracker.db | Bin 0 -> 16384 bytes demos/time-tracker/protected/data/time_tracker.db | Bin 16384 -> 0 bytes .../protected/pages/Docs/TopicList.tpl | 2 +- .../protected/pages/Docs/WritingUnitTest.page | 43 ++-- demos/time-tracker/protected/pages/Docs/config.xml | 12 +- demos/time-tracker/protected/pages/Docs/db.png | Bin 26879 -> 26521 bytes .../protected/pages/TimeTracker/Login.page | 38 +++ .../protected/pages/TimeTracker/Login.php | 53 ++++ .../protected/pages/TimeTracker/Logout.page | 0 .../protected/pages/TimeTracker/Logout.php | 34 +++ .../protected/pages/TimeTracker/MainLayout.php | 7 + .../protected/pages/TimeTracker/MainLayout.tpl | 40 +++ .../protected/pages/TimeTracker/SiteMap.php | 8 + .../protected/pages/TimeTracker/SiteMap.tpl | 43 ++++ .../protected/pages/TimeTracker/UserCreate.page | 65 +++++ .../protected/pages/TimeTracker/UserCreate.php | 78 ++++++ .../protected/pages/TimeTracker/UserList.page | 3 + .../protected/pages/TimeTracker/config.xml | 24 ++ demos/time-tracker/protected/pages/Welcome.page | 168 ++++++++++++ demos/time-tracker/tests/functional.php | 2 +- demos/time-tracker/tests/unit.php | 2 +- .../tests/unit/AddUserToProjectTestCase.php | 35 --- demos/time-tracker/tests/unit/BaseTestCase.php | 35 +++ .../tests/unit/CreateNewProjectTestCase.php | 90 ------- .../time-tracker/tests/unit/ProjectDaoTestCase.php | 92 ------- demos/time-tracker/tests/unit/ProjectTestCase.php | 6 +- demos/time-tracker/tests/unit/UserDaoTestCase.php | 283 +++++++++++++++++++++ .../time-tracker/themes/TimeTracker/background.png | Bin 0 -> 4674 bytes demos/time-tracker/themes/TimeTracker/site.css | 217 ++++++++++++++++ demos/time-tracker/themes/TimeTracker/tabs.png | Bin 0 -> 324 bytes .../SQLMap/Configuration/TConfigDeserialize.php | 1 + .../SQLMap/Configuration/TDomSqlMapBuilder.php | 52 +++- .../SQLMap/Configuration/TParameterMap.php | 2 +- .../DataAccess/SQLMap/Configuration/TResultMap.php | 22 +- .../SQLMap/Configuration/TSqlMapStatement.php | 8 +- .../SQLMap/DataMapper/TPropertyAccess.php | 6 +- .../SQLMap/DataMapper/TTypeHandlerFactory.php | 10 +- .../DataAccess/SQLMap/DataMapper/messages.txt | 13 +- .../SQLMap/Statements/TInsertMappedStatement.php | 8 +- .../SQLMap/Statements/TMappedStatement.php | 60 +++-- .../SQLMap/Statements/TSelectMappedStatement.php | 4 +- .../SQLMap/Statements/TUpdateMappedStatement.php | 8 +- tests/unit/SQLMap/BaseTest.php | 6 +- tests/unit/SQLMap/InheritanceTest.php | 2 +- tests/unit/SQLMap/sqlite/tests.db | Bin 32768 -> 32768 bytes 88 files changed, 2605 insertions(+), 1090 deletions(-) create mode 100644 demos/sqlmap/protected/APP_CODE/Person.php delete mode 100644 demos/sqlmap/protected/business-objects/Person.php delete mode 100644 demos/sqlmap/protected/controls/Layout.php delete mode 100644 demos/sqlmap/protected/controls/Layout.tpl delete mode 100644 demos/sqlmap/protected/controls/TopicList.php delete mode 100644 demos/sqlmap/protected/controls/TopicList.tpl delete mode 100644 demos/sqlmap/protected/pages/Home.page create mode 100644 demos/sqlmap/protected/pages/Manual/Layout.php create mode 100644 demos/sqlmap/protected/pages/Manual/Layout.tpl create mode 100644 demos/sqlmap/protected/pages/Manual/TopicList.php create mode 100644 demos/sqlmap/protected/pages/Manual/TopicList.tpl create mode 100644 demos/sqlmap/protected/pages/Manual/Tutorial/TestAgain.page create mode 100644 demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page create mode 100644 demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page create mode 100644 demos/sqlmap/protected/pages/Manual/Tutorial/example1.png create mode 100644 demos/sqlmap/protected/pages/Manual/Tutorial/grid1.png create mode 100644 demos/sqlmap/protected/pages/Manual/Tutorial/grid2.png delete mode 100644 demos/sqlmap/protected/pages/Tutorial/TestAgain.page delete mode 100644 demos/sqlmap/protected/pages/Tutorial/TestFirst.page delete mode 100644 demos/sqlmap/protected/pages/Tutorial/TestSecond.page delete mode 100644 demos/sqlmap/protected/pages/Tutorial/example1.png delete mode 100644 demos/sqlmap/protected/pages/Tutorial/grid1.png delete mode 100644 demos/sqlmap/protected/pages/Tutorial/grid2.png delete mode 100644 demos/sqlmap/protected/pages/config.xml create mode 100644 demos/time-tracker/protected/APP_CODE/DaoManager.php create mode 100644 demos/time-tracker/protected/APP_CODE/TimeTrackerUserTypeHandler.php create mode 100644 demos/time-tracker/protected/APP_CODE/UserDao.php create mode 100644 demos/time-tracker/protected/APP_CODE/UserManager.php create mode 100644 demos/time-tracker/protected/App_Data/time_tracker.db delete mode 100644 demos/time-tracker/protected/data/time_tracker.db create mode 100644 demos/time-tracker/protected/pages/TimeTracker/Login.page create mode 100644 demos/time-tracker/protected/pages/TimeTracker/Login.php create mode 100644 demos/time-tracker/protected/pages/TimeTracker/Logout.page create mode 100644 demos/time-tracker/protected/pages/TimeTracker/Logout.php create mode 100644 demos/time-tracker/protected/pages/TimeTracker/MainLayout.php create mode 100644 demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl create mode 100644 demos/time-tracker/protected/pages/TimeTracker/SiteMap.php create mode 100644 demos/time-tracker/protected/pages/TimeTracker/SiteMap.tpl create mode 100644 demos/time-tracker/protected/pages/TimeTracker/UserCreate.page create mode 100644 demos/time-tracker/protected/pages/TimeTracker/UserCreate.php create mode 100644 demos/time-tracker/protected/pages/TimeTracker/UserList.page create mode 100644 demos/time-tracker/protected/pages/TimeTracker/config.xml create mode 100644 demos/time-tracker/protected/pages/Welcome.page delete mode 100644 demos/time-tracker/tests/unit/AddUserToProjectTestCase.php create mode 100644 demos/time-tracker/tests/unit/BaseTestCase.php delete mode 100644 demos/time-tracker/tests/unit/CreateNewProjectTestCase.php delete mode 100644 demos/time-tracker/tests/unit/ProjectDaoTestCase.php create mode 100644 demos/time-tracker/tests/unit/UserDaoTestCase.php create mode 100644 demos/time-tracker/themes/TimeTracker/background.png create mode 100644 demos/time-tracker/themes/TimeTracker/site.css create mode 100644 demos/time-tracker/themes/TimeTracker/tabs.png diff --git a/.gitattributes b/.gitattributes index 3127d88f..6cdc6483 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1011,13 +1011,8 @@ demos/soap/protected/pages/Home.php -text demos/soap/protected/webservices/SimpleService.php -text demos/sqlmap/index.php -text demos/sqlmap/protected/.htaccess -text +demos/sqlmap/protected/APP_CODE/Person.php -text demos/sqlmap/protected/application.xml -text -demos/sqlmap/protected/business-objects/Person.php -text -demos/sqlmap/protected/controls/Layout.php -text -demos/sqlmap/protected/controls/Layout.tpl -text -demos/sqlmap/protected/controls/TopicList.php -text -demos/sqlmap/protected/controls/TopicList.tpl -text -demos/sqlmap/protected/pages/Home.page -text demos/sqlmap/protected/pages/Manual/BigPicture.page -text demos/sqlmap/protected/pages/Manual/BuildingTSqlMapper.page -text demos/sqlmap/protected/pages/Manual/CacheModels.page -text @@ -1033,6 +1028,8 @@ demos/sqlmap/protected/pages/Manual/ImplicitResultMaps.page -text demos/sqlmap/protected/pages/Manual/InheritanceMapping.page -text demos/sqlmap/protected/pages/Manual/InlineParameterMaps.page -text demos/sqlmap/protected/pages/Manual/Installing.page -text +demos/sqlmap/protected/pages/Manual/Layout.php -text +demos/sqlmap/protected/pages/Manual/Layout.tpl -text demos/sqlmap/protected/pages/Manual/MappedStatements.page -text demos/sqlmap/protected/pages/Manual/Overview.page -text demos/sqlmap/protected/pages/Manual/ParameterMap.page -text @@ -1040,6 +1037,14 @@ demos/sqlmap/protected/pages/Manual/ResultMapAttributes.page -text demos/sqlmap/protected/pages/Manual/ResultMaps.page -text demos/sqlmap/protected/pages/Manual/StatementElementAttributes.page -text demos/sqlmap/protected/pages/Manual/TheSQL.page -text +demos/sqlmap/protected/pages/Manual/TopicList.php -text +demos/sqlmap/protected/pages/Manual/TopicList.tpl -text +demos/sqlmap/protected/pages/Manual/Tutorial/TestAgain.page -text +demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page -text +demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page -text +demos/sqlmap/protected/pages/Manual/Tutorial/example1.png -text +demos/sqlmap/protected/pages/Manual/Tutorial/grid1.png -text +demos/sqlmap/protected/pages/Manual/Tutorial/grid2.png -text demos/sqlmap/protected/pages/Manual/WorkingWithDataMaps.page -text demos/sqlmap/protected/pages/Manual/diagram.png -text demos/sqlmap/protected/pages/Sample/Home.page -text @@ -1049,22 +1054,19 @@ demos/sqlmap/protected/pages/Sample/crud1.page -text demos/sqlmap/protected/pages/Sample/crud1.php -text demos/sqlmap/protected/pages/Sample/crud2.page -text demos/sqlmap/protected/pages/Sample/crud2.php -text -demos/sqlmap/protected/pages/Tutorial/TestAgain.page -text -demos/sqlmap/protected/pages/Tutorial/TestFirst.page -text -demos/sqlmap/protected/pages/Tutorial/TestSecond.page -text -demos/sqlmap/protected/pages/Tutorial/example1.png -text -demos/sqlmap/protected/pages/Tutorial/grid1.png -text -demos/sqlmap/protected/pages/Tutorial/grid2.png -text -demos/sqlmap/protected/pages/config.xml -text demos/time-tracker/index.php -text demos/time-tracker/protected/.htaccess -text demos/time-tracker/protected/APP_CODE/BaseDao.php -text +demos/time-tracker/protected/APP_CODE/DaoManager.php -text demos/time-tracker/protected/APP_CODE/Project.php -text demos/time-tracker/protected/APP_CODE/ProjectDao.php -text demos/time-tracker/protected/APP_CODE/TimeTrackerException.php -text demos/time-tracker/protected/APP_CODE/TimeTrackerUser.php -text +demos/time-tracker/protected/APP_CODE/TimeTrackerUserTypeHandler.php -text +demos/time-tracker/protected/APP_CODE/UserDao.php -text +demos/time-tracker/protected/APP_CODE/UserManager.php -text demos/time-tracker/protected/APP_CODE/exceptions.txt -text -demos/time-tracker/protected/data/time_tracker.db -text +demos/time-tracker/protected/App_Data/time_tracker.db -text demos/time-tracker/protected/pages/Docs/CreateBusinessCode.page -text demos/time-tracker/protected/pages/Docs/GettingStarted.page -text demos/time-tracker/protected/pages/Docs/Home.page -text @@ -1087,13 +1089,28 @@ demos/time-tracker/protected/pages/Docs/project1.png -text demos/time-tracker/protected/pages/Docs/unit_test1.png -text demos/time-tracker/protected/pages/Docs/unit_test2.png -text demos/time-tracker/protected/pages/Docs/unit_test3.png -text +demos/time-tracker/protected/pages/TimeTracker/Login.page -text +demos/time-tracker/protected/pages/TimeTracker/Login.php -text +demos/time-tracker/protected/pages/TimeTracker/Logout.page -text +demos/time-tracker/protected/pages/TimeTracker/Logout.php -text +demos/time-tracker/protected/pages/TimeTracker/MainLayout.php -text +demos/time-tracker/protected/pages/TimeTracker/MainLayout.tpl -text +demos/time-tracker/protected/pages/TimeTracker/SiteMap.php -text +demos/time-tracker/protected/pages/TimeTracker/SiteMap.tpl -text +demos/time-tracker/protected/pages/TimeTracker/UserCreate.page -text +demos/time-tracker/protected/pages/TimeTracker/UserCreate.php -text +demos/time-tracker/protected/pages/TimeTracker/UserList.page -text +demos/time-tracker/protected/pages/TimeTracker/config.xml -text +demos/time-tracker/protected/pages/Welcome.page -text demos/time-tracker/tests/functional.php -text demos/time-tracker/tests/functional/HelloPradoTestCase.php -text demos/time-tracker/tests/unit.php -text -demos/time-tracker/tests/unit/AddUserToProjectTestCase.php -text -demos/time-tracker/tests/unit/CreateNewProjectTestCase.php -text -demos/time-tracker/tests/unit/ProjectDaoTestCase.php -text +demos/time-tracker/tests/unit/BaseTestCase.php -text demos/time-tracker/tests/unit/ProjectTestCase.php -text +demos/time-tracker/tests/unit/UserDaoTestCase.php -text +demos/time-tracker/themes/TimeTracker/background.png -text +demos/time-tracker/themes/TimeTracker/site.css -text +demos/time-tracker/themes/TimeTracker/tabs.png -text docs/application.xml -text docs/specs/application.dtd -text docs/specs/application.xsd -text diff --git a/buildscripts/texbuilder/quickstart/build.php b/buildscripts/texbuilder/quickstart/build.php index c0577c8f..79d6d7ec 100644 --- a/buildscripts/texbuilder/quickstart/build.php +++ b/buildscripts/texbuilder/quickstart/build.php @@ -8,7 +8,7 @@ $pdfTex = "$pdflatexExec -interaction=nonstopmode -max-print-line=120 %s"; $mainTexFile = dirname(__FILE__).'/quickstart.tex'; //page root location -$base = realpath(dirname(__FILE__).'/../../demos/quickstart/protected/pages/'); +$base = realpath(dirname(__FILE__).'/../../../demos/quickstart/protected/pages/'); //-------------- END CONFIG ------------------ diff --git a/buildscripts/texbuilder/sqlmap/build.php b/buildscripts/texbuilder/sqlmap/build.php index 5717c50c..46773390 100644 --- a/buildscripts/texbuilder/sqlmap/build.php +++ b/buildscripts/texbuilder/sqlmap/build.php @@ -8,7 +8,7 @@ $pdfTex = "$pdflatexExec -interaction=nonstopmode -max-print-line=120 %s"; $mainTexFile = dirname(__FILE__).'/sqlmap.tex'; //page root location -$base = realpath(dirname(__FILE__).'/../protected/pages/'); +$base = realpath(dirname(__FILE__).'/../../../demos/sqlmap/protected/pages/'); //-------------- END CONFIG ------------------ diff --git a/buildscripts/texbuilder/sqlmap/pages.php b/buildscripts/texbuilder/sqlmap/pages.php index 411ebc4c..adf788ff 100644 --- a/buildscripts/texbuilder/sqlmap/pages.php +++ b/buildscripts/texbuilder/sqlmap/pages.php @@ -13,9 +13,9 @@ $pages['Installation and Setup'] = array( ); $pages['SQLMap for PHP Tutorial'] = array( - 'Tutorial/TestFirst.page', - 'Tutorial/TestSecond.page', - 'Tutorial/TestAgain.page' + 'Manual/Tutorial/TestFirst.page', + 'Manual/Tutorial/TestSecond.page', + 'Manual/Tutorial/TestAgain.page' ); $pages['Using SQLMap DataMapper'] = array( diff --git a/buildscripts/texbuilder/time-tracker/db.vsd b/buildscripts/texbuilder/time-tracker/db.vsd index aa32902d..b12bb87b 100644 Binary files a/buildscripts/texbuilder/time-tracker/db.vsd and b/buildscripts/texbuilder/time-tracker/db.vsd differ diff --git a/buildscripts/texbuilder/time-tracker/pages.php b/buildscripts/texbuilder/time-tracker/pages.php index ccad934d..5ec3335a 100644 --- a/buildscripts/texbuilder/time-tracker/pages.php +++ b/buildscripts/texbuilder/time-tracker/pages.php @@ -1,21 +1,17 @@ _birthDate; + } + + public function setBirthDate($value) + { + $this->_birthDate = $value; + } +} + +?> \ No newline at end of file diff --git a/demos/sqlmap/protected/application.xml b/demos/sqlmap/protected/application.xml index 7cfb440f..7dcde037 100644 --- a/demos/sqlmap/protected/application.xml +++ b/demos/sqlmap/protected/application.xml @@ -1,16 +1,11 @@ - + + + - - - - - + + + \ No newline at end of file diff --git a/demos/sqlmap/protected/business-objects/Person.php b/demos/sqlmap/protected/business-objects/Person.php deleted file mode 100644 index ad9da4b3..00000000 --- a/demos/sqlmap/protected/business-objects/Person.php +++ /dev/null @@ -1,26 +0,0 @@ -_birthDate; - } - - public function setBirthDate($value) - { - $this->_birthDate = $value; - } -} - -?> \ No newline at end of file diff --git a/demos/sqlmap/protected/controls/Layout.php b/demos/sqlmap/protected/controls/Layout.php deleted file mode 100644 index e612d52d..00000000 --- a/demos/sqlmap/protected/controls/Layout.php +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/demos/sqlmap/protected/controls/Layout.tpl b/demos/sqlmap/protected/controls/Layout.tpl deleted file mode 100644 index c62cc046..00000000 --- a/demos/sqlmap/protected/controls/Layout.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - -Home | -PradoSoft.com | -PDF Version | - - - - - - - - -
- - -
- -
-
- - - - - - \ No newline at end of file diff --git a/demos/sqlmap/protected/controls/TopicList.php b/demos/sqlmap/protected/controls/TopicList.php deleted file mode 100644 index ce827cc0..00000000 --- a/demos/sqlmap/protected/controls/TopicList.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/demos/sqlmap/protected/controls/TopicList.tpl b/demos/sqlmap/protected/controls/TopicList.tpl deleted file mode 100644 index 6c7a3e9e..00000000 --- a/demos/sqlmap/protected/controls/TopicList.tpl +++ /dev/null @@ -1,66 +0,0 @@ -
- -
-
Introduction
- - -
Installation and Setup
- - -
SQLMap for PHP Tutorial
- - -
Using SQLMap DataMapper
- - -
Working with Data Maps
- - -
Parameter Maps and Inline Parameters
- - -
Result Maps
- - -
Advanced Topics
- - -
- - - -
\ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Home.page b/demos/sqlmap/protected/pages/Home.page deleted file mode 100644 index ff226d4e..00000000 --- a/demos/sqlmap/protected/pages/Home.page +++ /dev/null @@ -1 +0,0 @@ -

Welcome to Prado!

\ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Layout.php b/demos/sqlmap/protected/pages/Manual/Layout.php new file mode 100644 index 00000000..e612d52d --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/Layout.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Layout.tpl b/demos/sqlmap/protected/pages/Manual/Layout.tpl new file mode 100644 index 00000000..7c47646d --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/Layout.tpl @@ -0,0 +1,45 @@ + + + + + + + + + + + + + +Home | +PradoSoft.com | +PDF Version | + + + + + + + + +
+ + +
+ +
+
+ + + + + + \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Overview.page b/demos/sqlmap/protected/pages/Manual/Overview.page index 694daf68..258be782 100644 --- a/demos/sqlmap/protected/pages/Manual/Overview.page +++ b/demos/sqlmap/protected/pages/Manual/Overview.page @@ -34,7 +34,15 @@ material applies to both implementations. SQLMap PHP Developer Guide.

A Tutorial is also available. We recommend reviewing the Tutorial for your -platform before reading this Guide.

+platform before reading this Guide. + +SQLMap Tutorial + +

Support

diff --git a/demos/sqlmap/protected/pages/Manual/TopicList.php b/demos/sqlmap/protected/pages/Manual/TopicList.php new file mode 100644 index 00000000..ce827cc0 --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/TopicList.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/TopicList.tpl b/demos/sqlmap/protected/pages/Manual/TopicList.tpl new file mode 100644 index 00000000..58e6d9ae --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/TopicList.tpl @@ -0,0 +1,66 @@ +
+ +
+
Introduction
+ + +
Installation and Setup
+ + +
SQLMap for PHP Tutorial
+ + +
Using SQLMap DataMapper
+ + +
Working with Data Maps
+ + +
Parameter Maps and Inline Parameters
+ + +
Result Maps
+ + +
Advanced Topics
+ + +
+ + + +
\ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/TestAgain.page b/demos/sqlmap/protected/pages/Manual/Tutorial/TestAgain.page new file mode 100644 index 00000000..4adac73b --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/Tutorial/TestAgain.page @@ -0,0 +1,214 @@ + +

Test, test, again ...

+

Of course, tweaking the Person List display is not going to be the end of it. +Clients always want more, and now ours wants to edit, add, or delete records. +Let's write some tests for these new tasks, as shown in the following.

+ + +function testPersonUpdate() +{ + $expect = "wei"; + $edited = "Nah"; + + //get it; + $person = TMapper::instance()->queryForObject("Select", 1); + + //test it + $this->assertNotNull($person); + $this->assertEqual($expect, $person->FirstName); + + //change it + $person->FirstName = $edited; + TMapper::instance()->update("Update", $person); + + //get it again + $person = TMapper::instance()->queryForObject("Select", 1); + + //test it + $this->assertEqual($edited, $person->FirstName); + + //change it back + $person->FirstName = $expect; + TMapper::instance()->update("Update", $person); +} + +function testPersonDelete() +{ + //insert it + $person = new Person; + $person->ID = -1; + TMapper::instance()->insert("Insert", $person); + + //delte it + $count = TMapper::instance()->delete("Delete", -1); + $this->assertEqual(1, $count); +} + + +

Not the best tests ever written, but for now, they will do :)

+ +

To make the new tests work, we'll need some new mapping statements. +The following sample shows the complete mapper document that we've called +personHelper.xml.

+ + + + + + + + + insert into PERSON + (PER_ID, PER_FIRST_NAME, PER_LAST_NAME, + PER_BIRTH_DATE, PER_WEIGHT_KG, PER_HEIGHT_M) + values + (#ID#, #FirstName#, #LastName#, + #BirthDate#, #WeightInKilograms#, #HeightInMeters#) + + + + update PERSON set + PER_FIRST_NAME = #FirstName#, + PER_LAST_NAME = #LastName#, + PER_BIRTH_DATE = #BirthDate#, + PER_WEIGHT_KG = #WeightInKilograms#, + PER_HEIGHT_M = #HeightInMeters# + where PER_ID = #ID# + + + + delete from PERSON + where PER_ID = #value# + + + + +

Well, waddya know, if run our tests now, we are favored with a green bar!. It +all works!

+ +
Note: +Though, of course, things usually do not work perfectly the first time! We +have to fix this and that, and try, try, again. But SimpleTest makes trying +again quick and easy. You can changes to the XML mapping documents and rerun +the tests! No muss, no fuss. +
+ +

Turning back to our Prado page, we can revamp the TDataGrid to allow in-place +editing and deleting. To add records, we provide a button after the grid that +inserts a blank person for client to edit. The page code is shown as: + + + <com:TDataGrid id="personList" + DataKeyField="ID" + AutoGenerateColumns="False" + OnEditCommand="editPerson" + OnUpdateCommand="updatePerson" + OnCancelCommand="refreshList" + OnDeleteCommand="deletePerson"> + <com:TBoundColumn DataField="FirstName" HeaderText="First Name" /> + <com:TBoundColumn DataField="LastName" HeaderText="Last Name" /> + <com:TBoundColumn DataField="HeightInMeters" HeaderText="Height" /> + <com:TBoundColumn DataField="WeightInKilograms" HeaderText="Weight" /> + <com:TEditCommandColumn + HeaderText="Edit" + UpdateText="Save" /> + <com:TButtonColumn + HeaderText="Delete" + Text="Delete" + CommandName="delete"/> + </com:TDataGrid> + <com:TButton Text="Add" OnClick="addNewPerson" /> + + +

The following sample shows the corresponding methods from page PHP class.

+ + + private function sqlmap() + { + return $this->Application->getModule('SQLMap')->getClient(); + } + + private function loadData() + { + $this->personList->DataSource = + $this->sqlmap()->queryForList('SelectAll'); + $this->personList->dataBind(); + } + + public function onLoad($param) + { + if(!$this->IsPostBack) + $this->loadData(); + } + + protected function editPerson($sender,$param) + { + $this->personList->EditItemIndex=$param->Item->ItemIndex; + $this->loadData(); + } + + protected function deletePerson($sender, $param) + { + $id = $this->getKey($sender, $param); + $this->sqlmap()->update("Delete", $id); + $this->loadData(); + } + + protected function updatePerson($sender, $param) + { + $person = new Person(); + $person->FirstName = $this->getText($param, 0); + $person->LastName = $this->getText($param, 1); + $person->HeightInMeters = $this->getText($param, 2); + $person->WeightInKilograms = $this->getText($param, 3); + $person->ID = $this->getKey($sender, $param); + $this->sqlmap()->update("Update", $person); + $this->refreshList($sender, $param); + } + + protected function addNewPerson($sender, $param) + { + $person = new Person; + $person->FirstName = "-- New Person --"; + $this->sqlmap()->insert("Insert", $person); + $this->loadData();; + } + + protected function refreshList($sender, $param) + { + $this->personList->EditItemIndex=-1; + $this->loadData(); + } + + private function getText($param, $index) + { + $item = $param->Item; + return $item->Cells[$index]->Controls[0]->Text; + } + + private function getKey($sender, $param) + { + return $sender->DataKeys[$param->Item->DataSourceIndex]; + } + + +

OK, we are CRUD complete! There's more we could do here. In particular, we +should add validation methods to prevent client from entering alphabetic +characters where only numbers can live. But, that's a different Prado +tutorial, and this is an SQLMap DataMapper tutorial.

+ + class="figure" /> +
Figure 4: Person List CRUD
+ + \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page b/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page new file mode 100644 index 00000000..80a155cb --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/Tutorial/TestFirst.page @@ -0,0 +1,238 @@ + +

Test First!

+ +

Let's say that our most important client has a database and one of the tables +in the database is a list of people. Our client tells us:

+ +

"We would like to use a web application to display the people in this table +and to add, edit, and delete individual records."

+ +

Not a complicated story, but it will cover the CRUD most developers want to +learn first. :) Let's start with the people table that the client mentioned. +Since we're keeping it simple, we'll say it's a table in an Access database. +The table definition is shown as:

+ + +Name Type Size +PER_ID Long Integer 4 +PER_FIRST_NAME Text 40 +PER_LAST_NAME Text 40 +PER_BIRTH_DATE Date/Time 8 +PER_WEIGHT_KG Double 8 +PER_HEIGHT_M Double 8 + + +
Tip: + This example is bundled with a SQLite database file "Data/test.db" + that contains the Person table and some data, ready to use. +
+ +

The first thing our story says is that client would like to display a list of +people. The following example shows our test for that.

+ + +<?php +class PersonTest extends UnitTestCase +{ + function testPersonList() + { + //try it + $people = TMapper::instance()->queryForList("SelectAll"); + + //test it + $this->assertNotNull($people, "Person list is not returned"); + $this->assertTrue($people->getCount() > 0, "Person list is empty"); + $person = $people[0]; + $this->assertNotNull($person, "Person not returned"); + } +} +?> + + +

Well, the example sure looks easy enough! We ask a method to "select all", and +it returns a list of person objects. But, what code do we need to write to +pass this test?

+ +
Note: + Save the PersonTest.php into a tests directory. + The unit tests are written for the SimpleTest Unit Testing framework. +
+ +

Now, to setup the testing framework, suppose you have the SimpleTest +framework installed. Then we need to create an entry file to run the tests. +See the SimpleTest documentation for further details on setting up tests.

+ + +<?php +require_once('../tests/simpletest/unit_tester.php'); +require_once('../tests/simpletest/reporter.php'); +require_once('../SQLMap/TMapper.php'); +require_once('Models/Person.php'); + +//supress strict warnings from Adodb. +error_reporting(E_ALL); + +$test = new GroupTest('All tests'); +$test->addTestFile('Tests/PersonTest.php'); $test->run(new HtmlReporter()); +?> + + +

To run the tests, point your browser to the "run_test.php" script file +served from your web server.

+ +

Let's see. The test uses a list of person objects. We could start with a blank +object, just to satisfy the test, and add the display properties later. But +let's be naughty and skip a step. Our fully-formed person object is shown in +the following example

+ + +<?php +class Person +{ + public $ID = -1; + public $FirstName; + public $LastName; + public $WeightInKilograms = 0.0; + public $HeightInMeters = 0.0; + + private $_birthDate; + + //setters and getter for BirthDate + public function getBirthDate() + { + return $this->_birthDate; + } + + public function setBirthDate($value) + { + $this->_birthDate = $value; + } +} +?> + + +

OK, that was fun! The $this->assertXXX(...) methods are built into +UnitTestCase class. So to run the unit test example, we just need the +TMapper object and queryForList method. Wonderfully, the SQLMap +DataMapper framework has a TMapperclass built into it that will work just +fine for for us to use in this tutorial, so we don't need to write that +either.

+ +

When the TMapper->instance() method is called, an instance of the SQLMap +TSqlMapper class is returned that has various methods available such as +queryForList. In this example, the SQLMap TSqlMapper->queryForList() +method executes our SQL statement (or stored procedure) and returns the result +as a list. Each row in the result becomes an entry in the list. Along with +queryForList(), there are also delete(), insert(), +queryForObject(), queryForPagedList() and a few other methods in the +SQLMap API. + +

Looking at unit test example, we see that the queryForList() method +takes the name of the statement we want to run. OK. Easy enough. But where +does SQLMap get the "SelectAll" statement? Some systems try to generate SQL +statements for you, but SQLMap specializes in data mapping, not code +generation. It's our job (or the job of our database administrator) to craft +the SQL or provide a stored procedure. We then describe the statement in an +XML element, like the one shown the following where +we use XML elements to map a database statement to an application object. + + + + + + + + +

The SQLMap mapping documents can hold several sets of related elements, like +those shown in the unit test case example. We can also have as many mapping +documents as we need to help organize our code. Additionally, having multiple +mapping documents is handy when several developers are working on the project +at once.

+ +

So, the framework gets the SQL code for the query from the mapping, and plugs +it into a prepared statement. But, how does SQLMap know where to find the +table's datasource?

+ +

Surprise! More XML! You can define a configuration file for each datasource +your application uses. The following code shows a configuration file named "sqlmap.config" for +our SQLite database.

+ + + + + + + + + + + + + +

The <provider> specifies the database provider class, in this case +TAdodbProvider using the Adodb library. The <datasource> tag +specifies the database connection details. In this case, for an SQLite +database, we just need the driver name, and the host that points to the actual +SQLite database file.

+ +

The last part of the configuration file ("sqlMaps") is where we list our +mapping documents, like the one shown back in the previous code sample. We can +list as many documents as we need here, and they will all be read when the +configuration is parsed.

+ +

OK, so how does the configuration get parsed?

+ +

Look back at the unit test case example. The heart of the code is the call to the +"TMapper" object (under the remark "try it"). The TMapper object +is a singleton that handles the instantiation and configuration of an SQLMap +TSqlMapper object, which provides a facade to the SQLMap DataMapper +framework API.

+ +

The first time that the TMapper is called, it reads in the +sqlmap.config file and associated mapping documents to create an instance +of the TSqlMapper class. On subsequent calls, it reuses the +TSqlMapper object so that the configuration is not re-read.

+ +

The framework comes bundled with a default TMapper class for you to use +immediately to get access to the SQLMap client TSqlMapper object. If you want to use a +different name other than sqlmap.config at the default location for the +configuration file, or need to use more than one database and have one +TSqlMapper per database, you can also write your own class to mimic the role of +the Mapper class view by copying and modifying the standard version.

+ +
Tip: + You can also call TMapper::configure('/path/to/your/sqlmap.config') + to configure the TMapper for a specific configuration file. +
+ +

If we put this all together into a solution, we can "green bar" our test. At +this point you should have the following files.

+ +Data/person.xml % Mapping file. +Data/test.db % SQLite database file. + +Models/Person.php % Person class file. + +Tests/PersonTest.php % Unit test case for Person mapping. + +run_tests.php % Unit test entry point. +sqlmap.config % SQLMap configuration file. + + +

Run the tests by pointing your browser URL to the "run_tests.php" server +file.

+ + class="figure" /> +
Figure 2: Green Bar!
+ + \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page b/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page new file mode 100644 index 00000000..706b5220 --- /dev/null +++ b/demos/sqlmap/protected/pages/Manual/Tutorial/TestSecond.page @@ -0,0 +1,116 @@ + + +

Playtest second!

+

Now that we have a passing test, we want to display some results as web pages. +The following examples utilize the Prado framework to display and manipulate +the database through SQLMap. Since SQLMap framework and Prado framework solve +different problems, they are both fairly independent, they can be used +together or separately.

+ +

SQLMap and Prado

+

To setup Prado, we need to create the follow files and directory structure +under our example/WebView directory.

+ +assets/ % application public assets + +protected/pages/Home.page % default page +protected/pages/Home.php % default page class +protected/runtime/ % run time data + +protected/application.xml % application configuration + +index.php % application entry point + + +

The application.xml and assets directory are not necessary but we +will make use of them later. The application.xml is used to define some +directory aliases and override the data source definitions in the +sqlmap.config. This is because SQLite database files are defined +relatively, otherwise we don't need to override the data source definitions. +The example application.xml is shown below, defining path aliases and override SQLite database +location.

+ + + + + + + + + + + + + + + + + + + +

The entry point to a Prado application in this example is index.php +and generally contains the following code.

+ + +<?php +error_reporting(E_ALL); +require_once('/path/to/prado/framework/prado.php'); +$application=new TApplication; +$application->run(); +?> + + +

Now we are ready to setup a page to display our list of people. +The following sample shows the Prado code for our display page. The key +piece is the TDataGrid. We save the file as Home.page.

+ + + + + + Person + + +<com:TForm> +

Person List

+ <com:TDataGrid id="personList"> + <com:TBoundColumn DataField="BirthDate" + HeaderText="Birth Date"/> + </com:TDataGrid> +</com:TForm> + + + + +

Of course, we still need to populate that TDataGrid. The following code +shows the PHP for Home.php. The operative method is loadData(). +The rest is supporting code.

+ + +<?php +Prado::using('Example.Models.Person'); +class Home extends TPage +{ + private function loadData() + { + $sqlmap = $this->Application->getModule('SQLMap')->getClient(); + $this->personList->DataSource = $sqlmap->queryForList('SelectAll'); + $this->personList->dataBind(); + } + + public function onLoad($param) + { + if(!$this->IsPostBack) + $this->loadData(); + } +} +?> + + +

If we run this now, we'll get a list like the one shown the figure below.

+ class="figure" /> +
Figure 3: A quick-and-dirty Person List
+ + \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/example1.png b/demos/sqlmap/protected/pages/Manual/Tutorial/example1.png new file mode 100644 index 00000000..b5241de6 Binary files /dev/null and b/demos/sqlmap/protected/pages/Manual/Tutorial/example1.png differ diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/grid1.png b/demos/sqlmap/protected/pages/Manual/Tutorial/grid1.png new file mode 100644 index 00000000..845b9581 Binary files /dev/null and b/demos/sqlmap/protected/pages/Manual/Tutorial/grid1.png differ diff --git a/demos/sqlmap/protected/pages/Manual/Tutorial/grid2.png b/demos/sqlmap/protected/pages/Manual/Tutorial/grid2.png new file mode 100644 index 00000000..dcafc33d Binary files /dev/null and b/demos/sqlmap/protected/pages/Manual/Tutorial/grid2.png differ diff --git a/demos/sqlmap/protected/pages/Tutorial/TestAgain.page b/demos/sqlmap/protected/pages/Tutorial/TestAgain.page deleted file mode 100644 index 4adac73b..00000000 --- a/demos/sqlmap/protected/pages/Tutorial/TestAgain.page +++ /dev/null @@ -1,214 +0,0 @@ - -

Test, test, again ...

-

Of course, tweaking the Person List display is not going to be the end of it. -Clients always want more, and now ours wants to edit, add, or delete records. -Let's write some tests for these new tasks, as shown in the following.

- - -function testPersonUpdate() -{ - $expect = "wei"; - $edited = "Nah"; - - //get it; - $person = TMapper::instance()->queryForObject("Select", 1); - - //test it - $this->assertNotNull($person); - $this->assertEqual($expect, $person->FirstName); - - //change it - $person->FirstName = $edited; - TMapper::instance()->update("Update", $person); - - //get it again - $person = TMapper::instance()->queryForObject("Select", 1); - - //test it - $this->assertEqual($edited, $person->FirstName); - - //change it back - $person->FirstName = $expect; - TMapper::instance()->update("Update", $person); -} - -function testPersonDelete() -{ - //insert it - $person = new Person; - $person->ID = -1; - TMapper::instance()->insert("Insert", $person); - - //delte it - $count = TMapper::instance()->delete("Delete", -1); - $this->assertEqual(1, $count); -} - - -

Not the best tests ever written, but for now, they will do :)

- -

To make the new tests work, we'll need some new mapping statements. -The following sample shows the complete mapper document that we've called -personHelper.xml.

- - - - - - - - - insert into PERSON - (PER_ID, PER_FIRST_NAME, PER_LAST_NAME, - PER_BIRTH_DATE, PER_WEIGHT_KG, PER_HEIGHT_M) - values - (#ID#, #FirstName#, #LastName#, - #BirthDate#, #WeightInKilograms#, #HeightInMeters#) - - - - update PERSON set - PER_FIRST_NAME = #FirstName#, - PER_LAST_NAME = #LastName#, - PER_BIRTH_DATE = #BirthDate#, - PER_WEIGHT_KG = #WeightInKilograms#, - PER_HEIGHT_M = #HeightInMeters# - where PER_ID = #ID# - - - - delete from PERSON - where PER_ID = #value# - - - - -

Well, waddya know, if run our tests now, we are favored with a green bar!. It -all works!

- -
Note: -Though, of course, things usually do not work perfectly the first time! We -have to fix this and that, and try, try, again. But SimpleTest makes trying -again quick and easy. You can changes to the XML mapping documents and rerun -the tests! No muss, no fuss. -
- -

Turning back to our Prado page, we can revamp the TDataGrid to allow in-place -editing and deleting. To add records, we provide a button after the grid that -inserts a blank person for client to edit. The page code is shown as: - - - <com:TDataGrid id="personList" - DataKeyField="ID" - AutoGenerateColumns="False" - OnEditCommand="editPerson" - OnUpdateCommand="updatePerson" - OnCancelCommand="refreshList" - OnDeleteCommand="deletePerson"> - <com:TBoundColumn DataField="FirstName" HeaderText="First Name" /> - <com:TBoundColumn DataField="LastName" HeaderText="Last Name" /> - <com:TBoundColumn DataField="HeightInMeters" HeaderText="Height" /> - <com:TBoundColumn DataField="WeightInKilograms" HeaderText="Weight" /> - <com:TEditCommandColumn - HeaderText="Edit" - UpdateText="Save" /> - <com:TButtonColumn - HeaderText="Delete" - Text="Delete" - CommandName="delete"/> - </com:TDataGrid> - <com:TButton Text="Add" OnClick="addNewPerson" /> - - -

The following sample shows the corresponding methods from page PHP class.

- - - private function sqlmap() - { - return $this->Application->getModule('SQLMap')->getClient(); - } - - private function loadData() - { - $this->personList->DataSource = - $this->sqlmap()->queryForList('SelectAll'); - $this->personList->dataBind(); - } - - public function onLoad($param) - { - if(!$this->IsPostBack) - $this->loadData(); - } - - protected function editPerson($sender,$param) - { - $this->personList->EditItemIndex=$param->Item->ItemIndex; - $this->loadData(); - } - - protected function deletePerson($sender, $param) - { - $id = $this->getKey($sender, $param); - $this->sqlmap()->update("Delete", $id); - $this->loadData(); - } - - protected function updatePerson($sender, $param) - { - $person = new Person(); - $person->FirstName = $this->getText($param, 0); - $person->LastName = $this->getText($param, 1); - $person->HeightInMeters = $this->getText($param, 2); - $person->WeightInKilograms = $this->getText($param, 3); - $person->ID = $this->getKey($sender, $param); - $this->sqlmap()->update("Update", $person); - $this->refreshList($sender, $param); - } - - protected function addNewPerson($sender, $param) - { - $person = new Person; - $person->FirstName = "-- New Person --"; - $this->sqlmap()->insert("Insert", $person); - $this->loadData();; - } - - protected function refreshList($sender, $param) - { - $this->personList->EditItemIndex=-1; - $this->loadData(); - } - - private function getText($param, $index) - { - $item = $param->Item; - return $item->Cells[$index]->Controls[0]->Text; - } - - private function getKey($sender, $param) - { - return $sender->DataKeys[$param->Item->DataSourceIndex]; - } - - -

OK, we are CRUD complete! There's more we could do here. In particular, we -should add validation methods to prevent client from entering alphabetic -characters where only numbers can live. But, that's a different Prado -tutorial, and this is an SQLMap DataMapper tutorial.

- - class="figure" /> -
Figure 4: Person List CRUD
- - \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Tutorial/TestFirst.page b/demos/sqlmap/protected/pages/Tutorial/TestFirst.page deleted file mode 100644 index 80a155cb..00000000 --- a/demos/sqlmap/protected/pages/Tutorial/TestFirst.page +++ /dev/null @@ -1,238 +0,0 @@ - -

Test First!

- -

Let's say that our most important client has a database and one of the tables -in the database is a list of people. Our client tells us:

- -

"We would like to use a web application to display the people in this table -and to add, edit, and delete individual records."

- -

Not a complicated story, but it will cover the CRUD most developers want to -learn first. :) Let's start with the people table that the client mentioned. -Since we're keeping it simple, we'll say it's a table in an Access database. -The table definition is shown as:

- - -Name Type Size -PER_ID Long Integer 4 -PER_FIRST_NAME Text 40 -PER_LAST_NAME Text 40 -PER_BIRTH_DATE Date/Time 8 -PER_WEIGHT_KG Double 8 -PER_HEIGHT_M Double 8 - - -
Tip: - This example is bundled with a SQLite database file "Data/test.db" - that contains the Person table and some data, ready to use. -
- -

The first thing our story says is that client would like to display a list of -people. The following example shows our test for that.

- - -<?php -class PersonTest extends UnitTestCase -{ - function testPersonList() - { - //try it - $people = TMapper::instance()->queryForList("SelectAll"); - - //test it - $this->assertNotNull($people, "Person list is not returned"); - $this->assertTrue($people->getCount() > 0, "Person list is empty"); - $person = $people[0]; - $this->assertNotNull($person, "Person not returned"); - } -} -?> - - -

Well, the example sure looks easy enough! We ask a method to "select all", and -it returns a list of person objects. But, what code do we need to write to -pass this test?

- -
Note: - Save the PersonTest.php into a tests directory. - The unit tests are written for the SimpleTest Unit Testing framework. -
- -

Now, to setup the testing framework, suppose you have the SimpleTest -framework installed. Then we need to create an entry file to run the tests. -See the SimpleTest documentation for further details on setting up tests.

- - -<?php -require_once('../tests/simpletest/unit_tester.php'); -require_once('../tests/simpletest/reporter.php'); -require_once('../SQLMap/TMapper.php'); -require_once('Models/Person.php'); - -//supress strict warnings from Adodb. -error_reporting(E_ALL); - -$test = new GroupTest('All tests'); -$test->addTestFile('Tests/PersonTest.php'); $test->run(new HtmlReporter()); -?> - - -

To run the tests, point your browser to the "run_test.php" script file -served from your web server.

- -

Let's see. The test uses a list of person objects. We could start with a blank -object, just to satisfy the test, and add the display properties later. But -let's be naughty and skip a step. Our fully-formed person object is shown in -the following example

- - -<?php -class Person -{ - public $ID = -1; - public $FirstName; - public $LastName; - public $WeightInKilograms = 0.0; - public $HeightInMeters = 0.0; - - private $_birthDate; - - //setters and getter for BirthDate - public function getBirthDate() - { - return $this->_birthDate; - } - - public function setBirthDate($value) - { - $this->_birthDate = $value; - } -} -?> - - -

OK, that was fun! The $this->assertXXX(...) methods are built into -UnitTestCase class. So to run the unit test example, we just need the -TMapper object and queryForList method. Wonderfully, the SQLMap -DataMapper framework has a TMapperclass built into it that will work just -fine for for us to use in this tutorial, so we don't need to write that -either.

- -

When the TMapper->instance() method is called, an instance of the SQLMap -TSqlMapper class is returned that has various methods available such as -queryForList. In this example, the SQLMap TSqlMapper->queryForList() -method executes our SQL statement (or stored procedure) and returns the result -as a list. Each row in the result becomes an entry in the list. Along with -queryForList(), there are also delete(), insert(), -queryForObject(), queryForPagedList() and a few other methods in the -SQLMap API. - -

Looking at unit test example, we see that the queryForList() method -takes the name of the statement we want to run. OK. Easy enough. But where -does SQLMap get the "SelectAll" statement? Some systems try to generate SQL -statements for you, but SQLMap specializes in data mapping, not code -generation. It's our job (or the job of our database administrator) to craft -the SQL or provide a stored procedure. We then describe the statement in an -XML element, like the one shown the following where -we use XML elements to map a database statement to an application object. - - - - - - - - -

The SQLMap mapping documents can hold several sets of related elements, like -those shown in the unit test case example. We can also have as many mapping -documents as we need to help organize our code. Additionally, having multiple -mapping documents is handy when several developers are working on the project -at once.

- -

So, the framework gets the SQL code for the query from the mapping, and plugs -it into a prepared statement. But, how does SQLMap know where to find the -table's datasource?

- -

Surprise! More XML! You can define a configuration file for each datasource -your application uses. The following code shows a configuration file named "sqlmap.config" for -our SQLite database.

- - - - - - - - - - - - - -

The <provider> specifies the database provider class, in this case -TAdodbProvider using the Adodb library. The <datasource> tag -specifies the database connection details. In this case, for an SQLite -database, we just need the driver name, and the host that points to the actual -SQLite database file.

- -

The last part of the configuration file ("sqlMaps") is where we list our -mapping documents, like the one shown back in the previous code sample. We can -list as many documents as we need here, and they will all be read when the -configuration is parsed.

- -

OK, so how does the configuration get parsed?

- -

Look back at the unit test case example. The heart of the code is the call to the -"TMapper" object (under the remark "try it"). The TMapper object -is a singleton that handles the instantiation and configuration of an SQLMap -TSqlMapper object, which provides a facade to the SQLMap DataMapper -framework API.

- -

The first time that the TMapper is called, it reads in the -sqlmap.config file and associated mapping documents to create an instance -of the TSqlMapper class. On subsequent calls, it reuses the -TSqlMapper object so that the configuration is not re-read.

- -

The framework comes bundled with a default TMapper class for you to use -immediately to get access to the SQLMap client TSqlMapper object. If you want to use a -different name other than sqlmap.config at the default location for the -configuration file, or need to use more than one database and have one -TSqlMapper per database, you can also write your own class to mimic the role of -the Mapper class view by copying and modifying the standard version.

- -
Tip: - You can also call TMapper::configure('/path/to/your/sqlmap.config') - to configure the TMapper for a specific configuration file. -
- -

If we put this all together into a solution, we can "green bar" our test. At -this point you should have the following files.

- -Data/person.xml % Mapping file. -Data/test.db % SQLite database file. - -Models/Person.php % Person class file. - -Tests/PersonTest.php % Unit test case for Person mapping. - -run_tests.php % Unit test entry point. -sqlmap.config % SQLMap configuration file. - - -

Run the tests by pointing your browser URL to the "run_tests.php" server -file.

- - class="figure" /> -
Figure 2: Green Bar!
- - \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Tutorial/TestSecond.page b/demos/sqlmap/protected/pages/Tutorial/TestSecond.page deleted file mode 100644 index 706b5220..00000000 --- a/demos/sqlmap/protected/pages/Tutorial/TestSecond.page +++ /dev/null @@ -1,116 +0,0 @@ - - -

Playtest second!

-

Now that we have a passing test, we want to display some results as web pages. -The following examples utilize the Prado framework to display and manipulate -the database through SQLMap. Since SQLMap framework and Prado framework solve -different problems, they are both fairly independent, they can be used -together or separately.

- -

SQLMap and Prado

-

To setup Prado, we need to create the follow files and directory structure -under our example/WebView directory.

- -assets/ % application public assets - -protected/pages/Home.page % default page -protected/pages/Home.php % default page class -protected/runtime/ % run time data - -protected/application.xml % application configuration - -index.php % application entry point - - -

The application.xml and assets directory are not necessary but we -will make use of them later. The application.xml is used to define some -directory aliases and override the data source definitions in the -sqlmap.config. This is because SQLite database files are defined -relatively, otherwise we don't need to override the data source definitions. -The example application.xml is shown below, defining path aliases and override SQLite database -location.

- - - - - - - - - - - - - - - - - - - -

The entry point to a Prado application in this example is index.php -and generally contains the following code.

- - -<?php -error_reporting(E_ALL); -require_once('/path/to/prado/framework/prado.php'); -$application=new TApplication; -$application->run(); -?> - - -

Now we are ready to setup a page to display our list of people. -The following sample shows the Prado code for our display page. The key -piece is the TDataGrid. We save the file as Home.page.

- - - - - - Person - - -<com:TForm> -

Person List

- <com:TDataGrid id="personList"> - <com:TBoundColumn DataField="BirthDate" - HeaderText="Birth Date"/> - </com:TDataGrid> -</com:TForm> - - - - -

Of course, we still need to populate that TDataGrid. The following code -shows the PHP for Home.php. The operative method is loadData(). -The rest is supporting code.

- - -<?php -Prado::using('Example.Models.Person'); -class Home extends TPage -{ - private function loadData() - { - $sqlmap = $this->Application->getModule('SQLMap')->getClient(); - $this->personList->DataSource = $sqlmap->queryForList('SelectAll'); - $this->personList->dataBind(); - } - - public function onLoad($param) - { - if(!$this->IsPostBack) - $this->loadData(); - } -} -?> - - -

If we run this now, we'll get a list like the one shown the figure below.

- class="figure" /> -
Figure 3: A quick-and-dirty Person List
- - \ No newline at end of file diff --git a/demos/sqlmap/protected/pages/Tutorial/example1.png b/demos/sqlmap/protected/pages/Tutorial/example1.png deleted file mode 100644 index b5241de6..00000000 Binary files a/demos/sqlmap/protected/pages/Tutorial/example1.png and /dev/null differ diff --git a/demos/sqlmap/protected/pages/Tutorial/grid1.png b/demos/sqlmap/protected/pages/Tutorial/grid1.png deleted file mode 100644 index 845b9581..00000000 Binary files a/demos/sqlmap/protected/pages/Tutorial/grid1.png and /dev/null differ diff --git a/demos/sqlmap/protected/pages/Tutorial/grid2.png b/demos/sqlmap/protected/pages/Tutorial/grid2.png deleted file mode 100644 index dcafc33d..00000000 Binary files a/demos/sqlmap/protected/pages/Tutorial/grid2.png and /dev/null differ diff --git a/demos/sqlmap/protected/pages/config.xml b/demos/sqlmap/protected/pages/config.xml deleted file mode 100644 index e0850c2c..00000000 --- a/demos/sqlmap/protected/pages/config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/BaseDao.php b/demos/time-tracker/protected/APP_CODE/BaseDao.php index f9146b59..63b91def 100644 --- a/demos/time-tracker/protected/APP_CODE/BaseDao.php +++ b/demos/time-tracker/protected/APP_CODE/BaseDao.php @@ -1,14 +1,41 @@ + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ +/** + * Base DAO class. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ class BaseDao { + /** + * @var TSqlMapper sqlmap client. + */ private $_connection; + /** + * @param TSqlMapper sqlmap client. + */ public function setConnection($connection) { $this->_connection = $connection; } + /** + * @return TSqlMapper sqlmap client. + */ protected function getConnection() { return $this->_connection; diff --git a/demos/time-tracker/protected/APP_CODE/DaoManager.php b/demos/time-tracker/protected/APP_CODE/DaoManager.php new file mode 100644 index 00000000..b8ac55af --- /dev/null +++ b/demos/time-tracker/protected/APP_CODE/DaoManager.php @@ -0,0 +1,126 @@ + + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ + +/** + * DaoManager class. + * + * A Registry for Dao and an implementation of that type. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ +class DaoManager extends TModule +{ + /** + * @var TSqlMapper sqlmap client + */ + private $_connection; + /** + * @var boolean if the module has been initialized + */ + private $_initialized=false; + /** + * @var array registered list of dao + */ + private $_dao=array(); + /** + * Initializes the module. + * This method is required by IModule and is invoked by application. + * It loads dao information from the module configuration. + * @param TXmlElement module configuration + */ + public function init($config) + { + if($this->_connection === null) + throw new TimeTrackerException('daomanager_connection_required'); + $app = $this->getApplication(); + if(is_string($this->_connection)) + { + if(($conn=$app->getModule($this->_connection)->getClient())===null) + throw new TimeTrackerException('daomanager_undefined_connection',$this->_connection); + if(!($conn instanceof TSqlMapper)) + throw new TimeTrackerException('daomanager_invalid_connection', $this->_connection); + $this->_connection = $conn; + } + $this->includeDaoImplementation($config->getElementsByTagName('dao')); + $this->_initialized = true; + } + + /** + * Register the dao type and implementation class names. + * @param array list of TXmlDocument nodes. + */ + protected function includeDaoImplementation($nodes) + { + foreach($nodes as $node) + { + $id = $node->getAttribute('id'); + $class = $node->getAttribute('class'); + $this->_dao[$id] = array('class' => $class); + } + } + + /** + * @return array list of registered Daos + */ + public function getDaos() + { + return $this->_dao; + } + + /** + * Returns an implementation of a Dao type, implements the Registery + * pattern. Multiple calls returns the same Dao instance. + * @param string Dao type to find. + * @return object instance of the Dao implementation. + */ + public function getDao($class) + { + if(isset($this->_dao[$class])) + { + if(!isset($this->_dao[$class]['instance'])) + { + $dao = Prado::createComponent($this->_dao[$class]['class']); + $dao->setConnection($this->getConnection()); + $this->_dao[$class]['instance'] = $dao; + } + return $this->_dao[$class]['instance']; + } + else + throw TimeTrackerException('daomanager_undefined_dao', $class); + } + + /** + * @return TSqlMapper sqlmap client instance + */ + public function getConnection() + { + return $this->_connection; + } + + /** + * Sets the connection for all Daos registered. + * @param string|TSqlMapper sqlmap client module id or TSqlMapper instance. + */ + public function setConnection($client) + { + if($this->_initialized) + throw new TimeTrackerException('daomanager_unchangeable'); + if(!is_string($client) && !($client instanceof TSqlMapper)) + throw new TConfigurationException('daomanager_invalid_connection',$client); + $this->_connection = $client; + } +} + +?> \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/Project.php b/demos/time-tracker/protected/APP_CODE/Project.php index ad9f7d19..660fad04 100644 --- a/demos/time-tracker/protected/APP_CODE/Project.php +++ b/demos/time-tracker/protected/APP_CODE/Project.php @@ -1,5 +1,23 @@ + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ +/** + * Time Tracker Project class. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ class Project { public $ActualDuration = 0; diff --git a/demos/time-tracker/protected/APP_CODE/ProjectDao.php b/demos/time-tracker/protected/APP_CODE/ProjectDao.php index 25a2845d..81902e0c 100644 --- a/demos/time-tracker/protected/APP_CODE/ProjectDao.php +++ b/demos/time-tracker/protected/APP_CODE/ProjectDao.php @@ -1,10 +1,26 @@ + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ -Prado::using('Application.APP_CODE.BaseDao'); - +/** + * Project DAO class. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ class ProjectDao extends BaseDao { - public function createNewProject($project) +/* public function createNewProject($project) { $sqlmap = $this->getConnection(); $creator = $sqlmap->queryForObject('GetUserByName', $project->CreatorUserName); @@ -71,6 +87,7 @@ class ProjectDao extends BaseDao return $sqlmap->insert('AddUserToProject', $param); } } +*/ } ?> \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/TimeTrackerException.php b/demos/time-tracker/protected/APP_CODE/TimeTrackerException.php index d715eefa..64b11405 100644 --- a/demos/time-tracker/protected/APP_CODE/TimeTrackerException.php +++ b/demos/time-tracker/protected/APP_CODE/TimeTrackerException.php @@ -1,5 +1,24 @@ + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ +/** + * Generic time tracker application exception. Exception messages are saved in + * "exceptions.txt" + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ class TimeTrackerException extends TException { /** diff --git a/demos/time-tracker/protected/APP_CODE/TimeTrackerUser.php b/demos/time-tracker/protected/APP_CODE/TimeTrackerUser.php index 4b6987bd..99ac1209 100644 --- a/demos/time-tracker/protected/APP_CODE/TimeTrackerUser.php +++ b/demos/time-tracker/protected/APP_CODE/TimeTrackerUser.php @@ -1,31 +1,48 @@ + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ +/** + * Import TUser and TUserManager + */ Prado::using('System.Security.TUser'); Prado::using('System.Security.TUserManager'); +/** + * User class for Time Tracker application. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ class TimeTrackerUser extends TUser { - private $_ID; + private $_emailAddress; - public function __construct() + /** + * @param string user email address + */ + public function setEmailAddress($value) { - parent::__construct(new TUserManager()); + $this->_emailAddress = $value; } - - public function getID(){ return $this->_ID; } - public function setID($value) - { - if(is_null($this->_ID)) - $this->_ID = $value; - else - throw new TimeTrackerUserException( - 'timetracker_user_readonly_id'); - } -} - -class TimeTrackerUserException extends TimeTrackerException -{ + /** + * @return string user email address + */ + public function getEmailAddress() + { + return $this->_emailAddress; + } } ?> \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/TimeTrackerUserTypeHandler.php b/demos/time-tracker/protected/APP_CODE/TimeTrackerUserTypeHandler.php new file mode 100644 index 00000000..07c46acc --- /dev/null +++ b/demos/time-tracker/protected/APP_CODE/TimeTrackerUserTypeHandler.php @@ -0,0 +1,54 @@ + + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ + +/** + * SQLMap type handler for TimeTrackerUser. + * The TimeTrackerUser requires an instance of IUserManager in constructor. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ +class TimeTrackerUserTypeHandler implements ITypeHandlerCallback +{ + /** + * Not implemented. + */ + public function getParameter($object) + { + throw new TimeTrackerException('Not implemented'); + } + + /** + * Not implemented. + */ + public function getResult($string) + { + throw new TimeTrackerException('Not implemented'); + } + + /** + * Creates a new instance of TimeTrackerUser + * @param array result data + * @return TimeTrackerUser new user instance + */ + public function createNewInstance($row=null) + { + $manager = Prado::getApplication()->getModule('users'); + if(is_null($manager)) + $manager = new UserManager(); + return new TimeTrackerUser($manager); + } +} + +?> \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/UserDao.php b/demos/time-tracker/protected/APP_CODE/UserDao.php new file mode 100644 index 00000000..4dc39b2b --- /dev/null +++ b/demos/time-tracker/protected/APP_CODE/UserDao.php @@ -0,0 +1,155 @@ + + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ + +/** + * UserDao class list, create, find and delete users. + * In addition, it can validate username and password, and update + * the user roles. Furthermore, a unique new token can be generated, + * this token can be used to perform persistent cookie login. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ +class UserDao extends BaseDao +{ + /** + * @param string username + * @return TimeTrackerUser find by user name, null if not found or disabled. + */ + public function getUserByName($username) + { + $sqlmap = $this->getConnection(); + return $sqlmap->queryForObject('GetUserByName', $username); + } + + /** + * @return array list of all enabled users. + */ + public function getAllUsers() + { + $sqlmap = $this->getConnection(); + return $sqlmap->queryForList('GetAllUsers'); + } + + /** + * @param TimeTrackerUser new user details. + * @param string new user password. + */ + public function addNewUser($user, $password) + { + $sqlmap = $this->getConnection(); + $param['user'] = $user; + $param['password'] = md5($password); + $sqlmap->insert('AddNewUser', $param); + if(count($user->getRoles()) > 0) + $this->updateUserRoles($user); + } + + /** + * @param string username to delete + */ + public function deleteUserByName($username) + { + $sqlmap = $this->getConnection(); + $sqlmap->delete('DeleteUserByName', $username); + } + + /** + * Updates the user profile details, including user roles. + * @param TimeTrackerUser updated user details. + * @param string new user password, null to avoid updating password. + */ + public function updateUser($user,$password=null) + { + $sqlmap = $this->getConnection(); + if($password !== null) + { + $param['user'] = $user; + $param['password'] = md5($password); + $sqlmap->update('UpdateUserDetailsAndPassword', $param); + } + else + { + $sqlmap->update('UpdateUserDetails', $user); + } + $this->updateUserRoles($user); + } + + /** + * @param string username to be validated + * @param string matching password + * @return boolean true if the username and password matches. + */ + public function validateUser($username, $password) + { + $sqlmap = $this->getConnection(); + $param['username'] = $username; + $param['password'] = md5($password); + return $sqlmap->queryForObject('ValidateUser', $param); + } + + /** + * @param string unique persistent session token + * @return TimeTrackerUser user details if valid token, null otherwise. + */ + public function validateSignon($token) + { + $sqlmap = $this->getConnection(); + $sqlmap->update('UpdateSignon', $token); + return $sqlmap->queryForObject('ValidateAutoSignon', $token); + } + + /** + * @param TimeTrackerUser user details to generate the token + * @return string unique persistent login token. + */ + public function createSignonToken($user) + { + $sqlmap = $this->getConnection(); + $param['username'] = $user->getName(); + $param['token'] = md5(microtime().$param['username']); + $sqlmap->insert('RegisterAutoSignon', $param); + return $param['token']; + } + + /** + * @param TimeTrackerUser deletes all signon token for given user, null to delete all + * tokens. + */ + public function clearSignonTokens($user=null) + { + $sqlmap = $this->getConnection(); + if($user !== null) + $sqlmap->delete('DeleteAutoSignon', $user->getName()); + else + $sqlmap->delete('DeleteAllSignon'); + } + + /** + * @param TimeTrackerUser user details for updating the assigned roles. + */ + public function updateUserRoles($user) + { + $sqlmap = $this->getConnection(); + $sqlmap->delete('DeleteUserRoles', $user); + foreach($user->getRoles() as $role) + { + $param['username'] = $user->getName(); + $param['role'] = $role; + $sqlmap->update('AddUserRole', $param); + } + } +} + +?> \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/UserManager.php b/demos/time-tracker/protected/APP_CODE/UserManager.php new file mode 100644 index 00000000..1327dc3c --- /dev/null +++ b/demos/time-tracker/protected/APP_CODE/UserManager.php @@ -0,0 +1,68 @@ + + * @link http://www.pradosoft.com/ + * @copyright Copyright © 2005-2006 PradoSoft + * @license http://www.pradosoft.com/license/ + * @version $Revision: $ $16/07/2006: $ + * @package Demos + */ + +/** + * User manager module class for time tracker application. + * + * @author Wei Zhuo + * @version $Revision: $ $16/07/2006: $ + * @package Demos + * @since 3.1 + */ +class UserManager extends TModule implements IUserManager +{ + /** + * @return string name for a guest user. + */ + public function getGuestName() + { + return 'Guest'; + } + + /** + * Returns a user instance given the user name. + * @param string user name, null if it is a guest. + * @return TUser the user instance, null if the specified username is not in the user database. + */ + public function getUser($username=null) + { + if($username===null) + { + $user=new TUser($this); + $user->setIsGuest(true); + return $user; + } + else + { + $daos = $this->getApplication()->getModule('daos'); + $userDao = $daos->getDao('UserDao'); + $user = $userDao->getUserByName($username); + $user->setIsGuest(false); + return $user; + } + } + + /** + * Validates if the username and password are correct. + * @param string user name + * @param string password + * @return boolean true if validation is successful, false otherwise. + */ + public function validateUser($username,$password) + { + $daos = $this->getApplication()->getModule('daos'); + $userDao = $daos->getDao('UserDao'); + return $userDao->validateUser($username, $password); + } +} + +?> \ No newline at end of file diff --git a/demos/time-tracker/protected/APP_CODE/exceptions.txt b/demos/time-tracker/protected/APP_CODE/exceptions.txt index e948f4d0..6568cc72 100644 --- a/demos/time-tracker/protected/APP_CODE/exceptions.txt +++ b/demos/time-tracker/protected/APP_CODE/exceptions.txt @@ -1,3 +1,7 @@ timetracker_user_readonly_id = Time tracker user ID is read-only. invalid_creator_and_manager = Unable to find time tracker usernames '{1}' and '{2}' for project '{0}'. -project_exists = Project '{0}' already exists. \ No newline at end of file +project_exists = Project '{0}' already exists. +daomanager_connection_required = An TSqlMapper connection is required by Dao Manager. +daomanager_undefined_connection = Connection '{0}' for Dao Manager is undefined. +daomanager_invalid_connection = Connection '{0}' does not appear to ba a TSqlMapper in Dao Manager. +daomanager_undefined_dao = Dao class '{0}' is not registered. \ No newline at end of file diff --git a/demos/time-tracker/protected/App_Data/time_tracker.db b/demos/time-tracker/protected/App_Data/time_tracker.db new file mode 100644 index 00000000..03fe9156 Binary files /dev/null and b/demos/time-tracker/protected/App_Data/time_tracker.db differ diff --git a/demos/time-tracker/protected/data/time_tracker.db b/demos/time-tracker/protected/data/time_tracker.db deleted file mode 100644 index 03fe9156..00000000 Binary files a/demos/time-tracker/protected/data/time_tracker.db and /dev/null differ diff --git a/demos/time-tracker/protected/pages/Docs/TopicList.tpl b/demos/time-tracker/protected/pages/Docs/TopicList.tpl index 5fa2adb5..53243578 100644 --- a/demos/time-tracker/protected/pages/Docs/TopicList.tpl +++ b/demos/time-tracker/protected/pages/Docs/TopicList.tpl @@ -14,7 +14,7 @@
Testing Business Code