dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15236
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Mon 2014-05-12 17:55:27 +0200
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-05-12 15:31:40 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/i18n/en.json	2014-05-12 15:55:27 +0000
@@ -64,6 +64,7 @@
     "move_all_to_selected": "Move all to selected",
     "save_and_add_new": "Save and add new",
     "save_and_go_back": "Save and go back",
+    "save_and_continue": "Save and continue",
     "go_back": "Go back",
     "more": "More",
     "profile": "Profile",

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2014-05-12 15:31:40 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js	2014-05-12 15:55:27 +0000
@@ -340,8 +340,11 @@
     
     $scope.attributes = AttributesFactory.getAll();
     
+    $scope.selectedProgram = null;
+    
     $scope.getProgramAttributes = function(program){        
         if(program){
+            $scope.selectedProgram = program;
             $scope.attributes = AttributesFactory.getByProgram(program);
         }
         else{
@@ -349,6 +352,12 @@
         }
     };
     
+    $scope.showDashboard = function(){        
+        $scope.registerEntity();
+    };
+    
+    $scope.registerEntity = function(){        
+    };
 })
 //Controller for dashboard
 .controller('DashboardController',

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html	2014-05-12 15:31:40 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/registration.html	2014-05-12 15:55:27 +0000
@@ -53,8 +53,8 @@
             </table>
 
             <div class="btn-group">
-                <button type="button" class="btn btn-default">{{'save_and_add_new'| translate}}</button>
-                <button type="button" class="btn btn-default" ng-click="loadTrackedEntities()">{{'save_and_go_back'| translate}}</button>
+                <button type="button" class="btn btn-default" ng-click="registerEntity()">{{'save_and_add_new'| translate}}</button>
+                <button type="button" class="btn btn-default" ng-click="showDashboard()">{{'save_and_continue'| translate}}</button>
                 <button type="button" class="btn btn-default" ng-click="showRegistration()">{{'go_back'| translate}}</button>
             </div>