------------------------------------------------------------
revno: 14489
committer: Abyot Asalefew Gizaw aby...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-03-27 14:57:00 +0100
message:
some improvements to event-capture UI
modified:
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.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-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-03-27 10:00:29 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-03-27 13:57:00 +0000
@@ -19,6 +19,10 @@
"save_and_close": "Save and close",
"delete": "Delete",
"cancel": "Cancel",
+ "close": "Close",
+ "discard": "Discard",
+ "ok": "Ok",
+ "done": "Done",
"remove": "Remove",
"are_you_sure_to_remove": "Are you sure you want to remove the selected item?",
"show_hide_columns": "Show/Hide columns",
@@ -49,65 +53,14 @@
"periods": "Periods",
"start_date": "Start date",
"end_date": "End date",
- "please_select": "[Please Select]",
- "available_data_items": "Available data items",
- "selected_data_items": "Selected data items",
- "move_to_selected": "Move to selected",
- "move_all_to_selected": "Move all to selected",
- "move_to_available": "Move to available",
- "move_all_to_available": "Move all to available",
- "add_new_filter": "Add new filter",
- "remove_filter": "Remove filter",
- "eq": "=",
- "gt": ">",
- "gt_eq": ">=",
- "lt": "<",
- "lt_eq": "<=",
- "neq": "!=",
- "one_of": "One of",
- "generate": "Generate",
- "update": "Update",
- "save": "Save",
- "save_pdf": "Save PDF",
- "cancel": "Cancel",
- "close": "Close",
- "close_editing": "Close editing",
- "ok": "OK",
+ "please_select": "[Please Select]",
"not_selected": "NOT_SELECTED",
"search": "Search",
"register_new": "Register New",
"empty_event_list": "There are no events",
"empty_search_result": "Empty Search Result",
"no": "NO",
- "yes": "YES",
- "operations": "Operations",
- "menu": "Menu",
- "edit": "Edit",
- "enrollment": "Enrollment",
- "enroll": "Enroll",
- "unenroll": "Remove Enrollment",
- "are_you_sure_to_unenroll": "Are you sure you want to remove the enrollment?",
- "add": "Add",
- "type_for_search": "TYPE_FOR_SEARCH",
- "data_element": "Data Element",
- "data_value": "Data Value",
- "date": "Date",
- "invalid_date": "Invalid date",
- "next": "Next",
- "back": "Back",
- "expand": "Expand",
- "collapse": "Collapse",
- "required": "Required",
- "none": "NONE",
- "date": "Date",
- "details": "Details",
- "minimal": "Minimal",
- "enrollment_error": "Enrollment - ERROR",
- "registration_error": "Registration - ERROR",
- "relationship": "Relationship",
- "settings_error": "Settings - ERROR",
- "please_select_orgunit_or_program": "Please select OrgUnit/Program from settings page",
- "please_select_orgunit_or_program_or_relationship": "Please select OrgUnit, Program and Relationship",
+ "yes": "YES",
"offline_notification": "You are offline, data will be stored locally",
"online_nofification": "You are online"
}
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-03-27 10:00:29 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-03-27 13:57:00 +0000
@@ -134,26 +134,20 @@
<!-- event grid begins -->
<div ng-show="selectedProgramStage && !eventRegistration && !editingEventInFull">
- <h2>
- {{'registered_events'| translate}}
- </h2>
-
<div ng-switch="dhis2Events.length">
-
<div ng-switch-when="undefined">
- <p>
+ <h2>
{{'empty_event_list'| translate}}
- </p>
- </div>
-
+ </2>
+ </div>
<div ng-switch-when="0">
- <p>
- {{'empty_event_list'| translate}}
- </p>
+ <img id="ouwt_loader" src="../images/ajax-loader-bar.gif"/>
</div>
-
<div ng-switch-default>
-
+ <h2>
+ {{'registered_events'| translate}}
+ </h2>
+
<!-- context menu for event grid -->
<div id="contextMenu" class="contextMenu" style="width: 180px;">
<ul id="contextMenuItems" class="contextMenuItems">
@@ -300,7 +294,7 @@
</td>
<td>
<span ng-show="currentEvent.event == dhis2Event.event">
- <a href ng-click="showEventList()" title="{{'close_editing'| translate}}"><span class='black'><i class="fa fa-times-circle-o fa-2x"></i></span></a>
+ <a href ng-click="showEventList()" title="{{'done'| translate}}"><span class='black'><i class="fa fa-check-square fa-2x"></i></span></a>
</span>
</td>
</tr>
@@ -415,27 +409,7 @@
<h2>
{{'new_event'| translate}}
</h2>
- <div class="bordered-div" style="width:50%;">
- <table class="dhis2-list-table-striped">
- <tbody id="list">
- <tr>
- <td>
- {{selectedProgram.dateOfIncidentDescription}}
- </td>
- <td>
- <input type="text"
- placeholder="yyyy-mm-dd"
- ng-date
- ng-model="currentEvent.eventDate"
- ng-required="true"
- name="eventDate"
- style="width:98%;">
- <span ng-show="outerForm.submitted && outerForm.eventDate.$invalid" class="red">{{'required'| translate}}</span>
- </td>
- </tr>
- </tbody>
- </table>
- <hr>
+ <div class="bordered-div" style="width:50%;">
<table class="dhis2-list-table-striped">
<thead>
<tr>
@@ -448,6 +422,21 @@
</tr>
</thead>
<tbody id="list">
+ <tr>
+ <td>
+ {{selectedProgram.dateOfIncidentDescription}}
+ </td>
+ <td>
+ <input type="text"
+ placeholder="yyyy-mm-dd"
+ ng-date
+ ng-model="currentEvent.eventDate"
+ ng-required="true"
+ name="eventDate"
+ style="width:98%;">
+ <span ng-show="outerForm.submitted && outerForm.eventDate.$invalid" class="red">{{'required'| translate}}</span>
+ </td>
+ </tr>
<tr ng-repeat="eventGridColumn in eventGridColumns">
<td class="max-column-width">
{{eventGridColumn.name}}
@@ -506,13 +495,14 @@
<button ng-click="addEvent()" class="button">{{'save_and_close'| translate}}</button>
- <button ng-click="showEventList(null)" class="button">{{'close'| translate}}</button>
+ <button ng-click="showEventList(null)" class="button">{{'discard'| translate}}</button>
</div>
</div>
</form>
<!-- event registration ends -->
</div>
+
</div>
</body>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
