dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #35497
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18171: minor
------------------------------------------------------------
revno: 18171
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-02-03 18:46:00 +0100
message:
minor
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/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-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2015-02-03 15:59:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2015-02-03 17:46:00 +0000
@@ -221,5 +221,9 @@
});
}
}
- };
+ };
+
+ $scope.switchRegistrationForm = function(){
+ $scope.selectedProgram.displayCustomForm = !$scope.selectedProgram.displayCustomForm;
+ };
});
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2015-02-03 17:15:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2015-02-03 17:46:00 +0000
@@ -3,6 +3,11 @@
<!--registration form starts -->
<form name="outerForm" novalidate>
+ <div ng-if="customForm">
+ <a href ng-click="switchRegistrationForm()" title="{{selectedProgram.displayCustomForm ? 'default_form' : 'custom_form'| translate}}">
+ <span class="primary pull-right"><i class="fa fa-file-text fa-2x"></i></span>
+ </a>
+ </div>
<!--custom registration form begins-->
<div class="row col-sm-12 vertical-spacing" ng-if="selectedProgram && selectedProgram.displayCustomForm">
<div ng-if="!customForm.hasProgramDate">