dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31243
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15904: clean up
------------------------------------------------------------
revno: 15904
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Mon 2014-06-30 09:21:49 +0200
message:
clean up
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.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/components/dataentry/dataentry.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-06-30 07:19:37 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html 2014-06-30 07:21:49 +0000
@@ -37,6 +37,7 @@
</div>
<div ng-show="!dhis2Events && selectedEnrollment" class="alert alert-warning">{{'no_event_is_yet_created'| translate}}</div>
<div ng-show="dhis2Events && showEventCreationDiv" class="alert alert-warning">{{'event_creation'| translate}}</div>
+ <div ng-show="!selectedEnrollment" class="alert alert-warning">{{'not_yet_enrolled_data_entry'| translate}}</div>
<div ng-show="dummyEvents && showEventCreationDiv">
<table class="table-borderless">
<tbody>
@@ -154,172 +155,6 @@
</tr>
</table>
</form>
- </div>
- <div ng-show="!selectedEnrollment">
- <div class="alert alert-warning">{{'not_yet_enrolled_data_entry'| translate}}</div>
- </div>
- </div>
-</div>
-
-
-
-
-<!--<div class="panel panel-primary" ng-controller="DataEntryController">
- <div class="panel-heading">
- {{dataentryWidget.title| translate}}
- <span class="nav-pills" ng-show="selectedEnrollment && allowEventCreation">
- | <a href ng-click="createNewEvent()" title="{{'create_new_event'| translate}}"><span class="bold">{{'create_new_event'| translate}}</span></a>
- </span>
- <span class="pull-right">
- <a class="small-horizonal-spacing" href ng-click="expandCollapse(dataentryWidget)">
- <span ng-show="dataentryWidget.expand"><i class="fa fa-chevron-up" title="{{'collapse'| translate}}"></i></span>
- <span ng-show="!dataentryWidget.expand"><i class="fa fa-chevron-down" title="{{'expand'| translate}}"></i></span>
- </a>
- <a class="small-horizonal-spacing" href ng-click="removeWidget(dataentryWidget)" title="{{'remove'| translate}}"><i class="fa fa-times-circle"></i></a>
- </span>
- </div>
-
- <div ng-show="dataentryWidget.expand" class="panel-body dashboard-widget-container">
- <div ng-show="dhis2Events">
- <table class="table-borderless">
- <tbody>
- <tr>
- <td class="inline-block" ng-repeat="dhis2Event in dhis2Events">
- <span class="block align-center">{{dhis2Event.orgUnitName}}</span>
- <span class="stage-container"
- ng-class="{'current-stage': currentEvent && currentEvent.event == dhis2Event.event, '{{dhis2Event.statusColor}}': true}"
- ng-click="showDataEntry(dhis2Event)">
- {{dhis2Event.name}}<br/>
- {{dhis2Event.eventDate}}
- </span>
- <i class="fa fa-arrow-right" ng-show="$index < dhis2Events.length - 1"></i>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- <div ng-show="!dhis2Events && selectedEnrollment">
- <div ng-show="dummyEvents">
- <div class="alert alert-warning">{{'no_event_is_yet_created'| translate}}</div>
- <table class="table-borderless">
- <tbody>
- <tr>
- <td class="inline-block" ng-repeat="dummyEvent in dummyEvents">
- <span class="block align-center">{{dhis2Event.orgUnitName}}</span>
- <span class="stage-container"
- ng-class="{'current-stage': currentDummyEvent && currentDummyEvent.programStage == dummyEvent.programStage, '{{dummyEvent.statusColor}}': true}"
- ng-click="showEventCreation(dummyEvent)">
- {{dummyEvent.name}}<br/>
- {{dummyEvent.dueDate}}
- </span>
- <i class="fa fa-arrow-right" ng-show="$index < dummyEvents.length - 1"></i>
- </td>
- </tr>
- </tbody>
- </table>
- <form name="eventCreationForm" novalidate ng-show="currentDummyEvent">
- <div class="row">
- <div class="col-md-6">
- {{currentDummyEvent.reportDateDescription}}
- <input type="text" name="eventDate" class="form-control" ng-date ng-model="currentDummyEvent.eventDate" ng-required="true"/>
- <span ng-show="eventCreationForm.submitted && eventCreationForm.eventDate.$invalid" style="color:red;font-size:12px">{{'required'| translate}}</span>
- </div>
- <div class="col-md-6">
- {{'due_date'| translate}}
- <input type="text" name="dueDate" class="form-control" ng-date ng-model="currentDummyEvent.dueDate" />
- <span ng-show="eventCreationForm.submitted && eventCreationForm.dueDate.$invalid" style="color:red;font-size:12px">{{'required'| translate}}</span>
- </div>
- </div>
- <div class="row vertical-spacing">
- <div class="col-md-6">
- <button type="button" class="btn btn-primary" ng-click="createEvent()">{{'create'| translate}}</button>
- <button type="button" class="btn btn-default small-horizonal-spacing" ng-click="closeEventCreation()">{{'cancel'| translate}}</button>
- </div>
- </div>
- </form>
- </div>
</div>
-
- <hr ng-if='currentEvent'>
- <form name="dataEntryOuterForm" novalidate>
- <table class="table-borderless table-striped" ng-if='currentEvent'>
- <thead>
- <tr class="col-md-12">
- <th class="col-md-5">
- {{'data_element'| translate}}
- </th>
- <th class="col-md-5 align-center">
- {{'value'| translate}}
- </th>
- <th class="col-md-2 align-center" ng-if="allowProvidedElsewhereExists">
- {{'provided_elsewhere'| translate}}
- </th>
- </tr>
- </thead>
- <tr class="col-md-12" ng-repeat="prStDe in currentStage.programStageDataElements">
- <td class="col-md-5">
- {{prStDe.dataElement.name}}
- </td>
- <td class="col-md-5">
- <ng-form name="dataEntryInnerForm">
- <div ng-switch="prStDe.dataElement.type">
- <div ng-switch-when="int">
- <input type="number"
- ng-class='getClass(prStDe.dataElement.id)'
- ng-model="currentEvent[prStDe.dataElement.id]"
- ng-required={{prStDe.compulsory}}
- ng-blur="saveDatavalue(prStDe)"
- name="foo"/>
- <span ng-show="dataEntryOuterForm.submitted && dataEntryInnerForm.foo.$invalid" style="color:red;font-size:12px">{{'number_required' | translate}}</span>
- </div>
- <div ng-switch-when="string">
- <input type="text"
- ng-class='getClass(prStDe.dataElement.id)'
- ng-model="currentEvent[prStDe.dataElement.id]"
- ng-required={{prStDe.compulsory}}
- typeahead="option for option in prStDe.dataElement.optionSet.options | filter:$viewValue | limitTo:20"
- typeahead-open-on-focus
- ng-blur="saveDatavalue(prStDe)"
- name="foo"/>
- </div>
- <div ng-switch-when="bool">
- <select ng-class='getClass(prStDe.dataElement.id)'
- ng-model="currentEvent[prStDe.dataElement.id]"
- ng-required={{prStDe.compulsory}}
- ng-change="saveDatavalue(prStDe)"
- name="foo">
- <option value="">{{'please_select'| translate}}</option>
- <option value="0">{{'no'| translate}}</option>
- <option value="1">{{'yes'| translate}}</option>
- </select>
-
- </div>
- <div ng-switch-when="date">
- <input type="text"
- placeholder="yyyy-mm-dd"
- ng-date
- ng-class='getClass(prStDe.dataElement.id)'
- ng-model="saveDatavalue(prStDe)"
- ng-required={{prStDe.compulsory}}
- blur-or-change="saveDatavalue(dhis2Event, eventGridColumn.id)"
- name="foo"/>
- </div>
- </div>
- </ng-form>
- </td>
- <td class="col-md-2" ng-if="allowProvidedElsewhereExists">
- <div class="align-center" ng-show="prStDe.allowProvidedElsewhere">
- <input type="checkbox"
- ng-model="currentEvent.providedElsewhere[prStDe.dataElement.id]"
- ng-change="saveDatavalueLocation(prStDe)"/>
- </div>
- </td>
- </tr>
- </table>
- </form>
-
- <div ng-show="!selectedEnrollment">
- <div class="alert alert-warning">{{'not_yet_enrolled_data_entry'| translate}}</div>
- </div>
</div>
-</div>-->
\ No newline at end of file
+</div>
\ No newline at end of file
