dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #35496
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18170: minor
------------------------------------------------------------
revno: 18170
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-02-03 18:15:28 +0100
message:
minor
modified:
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.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2015-02-03 17:12:51 +0000
+++ 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
@@ -1,5 +1,9 @@
<div class="bordered-div col-md-12" ng-controller="RegistrationController">
+
+ <!--registration form starts -->
<form name="outerForm" novalidate>
+
+ <!--custom registration form begins-->
<div class="row col-sm-12 vertical-spacing" ng-if="selectedProgram && selectedProgram.displayCustomForm">
<div ng-if="!customForm.hasProgramDate">
<table class="dhis2-list-table-striped dhis2-table-hover">
@@ -39,6 +43,9 @@
</div>
<div ng-include="'../dhis-web-commons/customform/custom-form.html'"></div>
</div>
+ <!-- custom registration form ends -->
+
+ <!-- default registration form begins -->
<div class="row col-sm-12 vertical-spacing" ng-if="!selectedProgram.displayCustomForm">
<div ng-if='!selectedProgram'>
<h3>{{'category'| translate}}</h3>
@@ -58,11 +65,12 @@
<div ng-if="selectedProgram" ng-include="'views/enrollment-dates-form.html'"></div>
<div ng-include="'views/default-registration-form.html'"></div>
</div>
-
+ <!-- default registration form ends -->
+
<div ng-if="formEmpty && outerForm.submitted">
<div class="alert alert-warning">{{'form_is_empty_fill_at_least_one'| translate}}</div>
</div>
-
+
<div class="vertical-spacing">
<button type="button" class="btn btn-primary" ng-click="registerEntity('DASHBOARD')">{{'save_and_continue'| translate}}</button>
<button type="button" class="btn btn-success small-horizonal-spacing" ng-click="registerEntity('SELF')">{{'save_and_add_new'| translate}}</button>