------------------------------------------------------------
revno: 14901
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Fri 2014-04-18 17:05:20 +0200
message:
Event capture, minor fix
modified:
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableGridTest.java
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
dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css
--
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-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableGridTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableGridTest.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableGridTest.java 2014-04-18 15:05:20 +0000
@@ -48,6 +48,7 @@
import org.hisp.dhis.aggregation.AggregatedIndicatorValue;
import org.hisp.dhis.analytics.AnalyticsService;
import org.hisp.dhis.analytics.data.MockAnalyticsService;
+import org.hisp.dhis.common.BaseAnalyticalObject;
import org.hisp.dhis.common.Grid;
import org.hisp.dhis.completeness.DataSetCompletenessResult;
import org.hisp.dhis.dataelement.DataElement;
@@ -915,7 +916,7 @@
ReportTable reportTable = new ReportTable( "Embezzlement",
new ArrayList<DataElement>(), indicators, new ArrayList<DataSet>(), periods, units,
false, false, true, null, null, "january_2000" );
- reportTable.setSortOrder( ReportTable.DESC );
+ reportTable.setSortOrder( BaseAnalyticalObject.DESC );
reportTableService.saveReportTable( reportTable );
=== 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-04-14 02:24:15 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/i18n/en.json 2014-04-18 15:05:20 +0000
@@ -17,7 +17,7 @@
"save": "Save",
"save_and_add_new": "Save and add new",
"save_and_close": "Save and close",
- "save_and_back": "Save and back",
+ "save_and_back": "Save and go back",
"delete": "Delete",
"cancel": "Cancel",
"close": "Close",
=== 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-04-14 06:37:04 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/index.html 2014-04-18 15:05:20 +0000
@@ -294,8 +294,7 @@
<th style="width: 20px;"></th>
</tr>
</thead>
- <tbody id="list">
- <!--<tr ng-repeat="dhis2Event in dhis2Events | orderBy:sortHeader:reverse | gridFilter:filterText:filterTypes" -->
+ <tbody id="list">
<tr ng-repeat="dhis2Event in dhis2Events | orderBy:sortHeader:reverse | gridFilter:filterText:filterTypes"
ng-click="showContextMenu(dhis2Event)">
@@ -605,9 +604,7 @@
</tbody>
</table>
<button ng-click="addEvent(true)" class="button">{{'save_and_add_new'| translate}}</button>
-
<button ng-click="addEvent()" class="button">{{'save_and_back'| translate}}</button>
-
<button ng-click="showEventList(null)" class="button">{{'go_back'| translate}}</button>
</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-04-14 02:24:15 +0000
+++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/styles/style.css 2014-04-18 15:05:20 +0000
@@ -24,7 +24,6 @@
font-size: 13px;
line-height: 24px;
table-layout: fixed;
-
}
/*----------------------------------------------------------------------------*/
@@ -39,7 +38,6 @@
.container-heading {
color: white;
- /*padding: 12px;*/
}
.container-1-4 {
@@ -112,7 +110,7 @@
{
border: 1px solid #c2c2c2;
border-radius: 5px;
- padding: 5px 10px;
+ padding: 12px;
margin-bottom: 20px;
}
@@ -155,7 +153,6 @@
background-color: #ebf0f6;
}
-
.dhis2-table-striped-border tr th {
border: 1px solid #cad5e5;
}
@@ -188,7 +185,7 @@
.dhis2-list-table-striped {
width: 100%;
- padding: 5px 10px;
+ padding-bottom: 6px;
}
.dhis2-list-table-striped>thead>tr,
@@ -230,6 +227,7 @@
/*----------------------------------------------------------------------------*/
/* Bootstrap modal style
/*----------------------------------------------------------------------------*/
+
.modal-open {
overflow: hidden
}
@@ -488,7 +486,6 @@
.open > .dropdown-menu {
display: block
}
-
.dropdown-menu li:hover {
cursor: pointer;
}
_______________________________________________
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
