dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43391
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 22006: tracker-capture: minor style fix in new event creation
------------------------------------------------------------
revno: 22006
committer: Abyot Asalefew Gizaw <abyot@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-02-19 10:36:11 +0100
message:
tracker-capture: minor style fix in new event creation
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.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/dataentry/new-event.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html 2016-02-15 12:05:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html 2016-02-19 09:36:11 +0000
@@ -5,56 +5,49 @@
</div>
<div class="modal-body page">
<form name="eventCreationForm" class="form-horizontal" role="form" novalidate>
- <div ng-if="!stageSpecifiedOnModalOpen">
- <div class="form-group">
- <div class="col-sm-11">
- <label class="col-sm-3 control-label" style="padding-left: 0px">
- {{'program_stage' | translate}}
- </label>
- <div class="col-sm-9">
- <select class="form-control-program"
- ng-model="model.selectedStage"
- ng-options="stage.displayName for stage in stages">
- </select>
- </div>
- </div>
- </div>
+ <div class="row" ng-if="!stageSpecifiedOnModalOpen">
+ <div class="col-sm-3">
+ {{'program_stage' | translate}}
+ </div>
+ <div class="col-sm-9">
+ <select class="form-control-program"
+ ng-model="model.selectedStage"
+ ng-options="stage.displayName for stage in stages">
+ </select>
+ </div>
</div>
<div ng-if="model.selectedStage && !model.selectedStage.periodType">
- <div ng-if="isScheduleEvent && !isReferralEvent && !model.selectedStage.hideDueDate" class="form-group">
- <div class="col-sm-11">
- <label class="col-sm-3 control-label">{{'scheduled_date'| translate}}</label>
- <div class="col-sm-9">
- <input type="text"
- class="form-control"
- name="dueDate"
- placeholder="{{dhis2CalendarFormat.keyDateFormat}}"
- ng-rquired="true"
- d2-date
- ng-model="dhis2Event.dueDate">
- <span ng-if="model.dueDateInvalid" class="error">{{'required'| translate}}</span>
- </div>
- </div>
- </div>
- <div ng-if="isNewEvent" class="form-group">
- <div class="col-sm-11">
- <label class="col-sm-3 control-label" style="padding-left: 0px">{{model.selectedStage.excecutionDateLabel}}</label>
- <div class="col-sm-9">
- <input type="text"
- class="form-control"
- name="eventDate"
- placeholder="{{dhis2CalendarFormat.keyDateFormat}}"
- ng-rquired="true"
- d2-date
- max-date="0"
- min-date=""
- ng-model="dhis2Event.eventDate">
- <span ng-if="model.eventDateInvalid" class="error">{{'required'| translate}}</span>
- </div>
- </div>
- </div>
- <div ng-if="isReferralEvent">
+ <div class="row" ng-if="isScheduleEvent && !isReferralEvent && !model.selectedStage.hideDueDate">
+ <div class="col-sm-3">{{'scheduled_date'| translate}}</div>
+ <div class="col-sm-9">
+ <input type="text"
+ class="form-control"
+ name="dueDate"
+ placeholder="{{dhis2CalendarFormat.keyDateFormat}}"
+ ng-rquired="true"
+ d2-date
+ ng-model="dhis2Event.dueDate">
+ <span ng-if="model.dueDateInvalid" class="error">{{'required'| translate}}</span>
+ </div>
+
+ </div>
+ <div class="row" ng-if="isNewEvent">
+ <div class="col-sm-3" style="padding-left: 0px">{{model.selectedStage.excecutionDateLabel}}</div>
+ <div class="col-sm-9">
+ <input type="text"
+ class="form-control"
+ name="eventDate"
+ placeholder="{{dhis2CalendarFormat.keyDateFormat}}"
+ ng-rquired="true"
+ d2-date
+ max-date="0"
+ min-date=""
+ ng-model="dhis2Event.eventDate">
+ <span ng-if="model.eventDateInvalid" class="error">{{'required'| translate}}</span>
+ </div>
+ </div>
+ <div class="row" ng-if="isReferralEvent">
<h4>Select an organizaton unit</h4>
<div class="org-unit-tree row" data-stop-propagation="true">
<i class="fa fa-spinner fa-spin fa-2x" ng-show="orgUnitsLoading"></i>
@@ -96,34 +89,29 @@
<span ng-if="model.dueDateInvalid" class="error">{{'required'| translate}}</span>
</div>
</div>
- <div ng-if="model.selectedStage && model.selectedStage.periodType">
- <div class="form-group">
- <label class="control-label">
- {{'period'| translate}}
- </label>
+ <div class="row" ng-if="model.selectedStage && model.selectedStage.periodType">
+ <div class="col-sm-3">
+ {{'period'| translate}}
+ </div>
+ <div class="col-sm-9">
<select class="form-control-program"
ng-model="dhis2Event.selectedPeriod"
ng-options="period.name for period in dhis2Event.periods">
</select>
<button ng-disabled="true" type="button" class="btn btn-default small-horizonal-spacing trim" ng-click="fetchPeriod('PREV')" title="{{'prev_period'| translate}}"><i class="fa fa-backward"></i></button>
<button ng-disabled="true" type="button" class="btn btn-default small-horizonal-spacing trim" ng-click="fetchPeriod('NEXT')" title="{{'nxt_period'| translate}}"><i class="fa fa-forward"></i></button>
-
- </div>
+ </div>
</div>
- <div ng-if="selectedProgram" ng-repeat="category in selectedCategories">
- <div class="form-group">
- <div class="col-sm-11">
- <label class="col-sm-3 control-label">{{category.displayName}}</label>
- <div class="col-sm-9">
- <select class="form-control"
- name="option"
- ng-model="category.selectedOption"
- ng-options="option as option.displayName for option in category.categoryOptions"
- ng-change="getCategoryOptions()">
- <option value="" ng-selected="selectDefault.selected">{{pleaseSelectLabel}}</option>
- </select>
- </div>
- </div>
+ <div class="row" ng-if="selectedProgram" ng-repeat="category in selectedCategories">
+ <div class="col-sm-3">{{category.displayName}}</div>
+ <div class="col-sm-9">
+ <select class="form-control"
+ name="option"
+ ng-model="category.selectedOption"
+ ng-options="option as option.displayName for option in category.categoryOptions"
+ ng-change="getCategoryOptions()">
+ <option value="" ng-selected="selectDefault.selected">{{pleaseSelectLabel}}</option>
+ </select>
</div>
</div>
