dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39610
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20061: some clean up
------------------------------------------------------------
revno: 20061
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-09-09 14:11:18 +0200
message:
some clean up
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.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-event-capture/event-capture.appcache'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-09-09 09:33:56 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-09-09 12:11:18 +0000
@@ -47,17 +47,8 @@
../dhis-web-commons/javascripts/dhis2/dhis2.util.js
../dhis-web-commons/javascripts/commons.js
../dhis-web-commons/javascripts/commons.ajax.js
-../dhis-web-commons/javascripts/lists.js
-../dhis-web-commons/javascripts/periodType.js
-../dhis-web-commons/javascripts/date.js
-../dhis-web-commons/javascripts/json2.js
-../dhis-web-commons/javascripts/validationRules.js
-../dhis-web-commons/javascripts/dhis2/dhis2.array.js
-../dhis-web-commons/javascripts/dhis2/dhis2.select.js
-../dhis-web-commons/javascripts/dhis2/dhis2.comparator.js
../dhis-web-commons/javascripts/dhis2/dhis2.availability.js
../dhis-web-commons/javascripts/dhis2/dhis2.trigger.js
-../dhis-web-commons/javascripts/dhis2/dhis2.sharing.js
../dhis-web-commons/javascripts/dhis2/dhis2.validation.js
../dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.js
../dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js
@@ -72,8 +63,6 @@
../dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js
../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js
../dhis-web-commons/javascripts/angular/plugins/select.js
-../dhis-web-commons/javascripts/angular/plugins/select2.js
-../dhis-web-commons/javascripts/angular/plugins/ng-infinite-scroll.js
../dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js
../dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js
../dhis-web-commons/javascripts/dhis2/dhis2.angular.filters.js
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-09-08 09:15:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-09-09 12:11:18 +0000
@@ -53,17 +53,8 @@
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/commons.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/commons.ajax.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/lists.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/periodType.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/date.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/json2.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/validationRules.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.array.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.select.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.comparator.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.availability.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.trigger.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.sharing.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.validation.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js"></script>
@@ -78,8 +69,6 @@
<script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/select.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/select2.js"></script>
- <script type="text/javascript" src="../dhis-web-commons/javascripts/angular/plugins/ng-infinite-scroll.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.angular.filters.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js"></script>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-09-08 09:15:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js 2015-09-09 12:11:18 +0000
@@ -10,7 +10,6 @@
function($rootScope,
$scope,
$modal,
- $timeout,
$translate,
$anchorScroll,
orderByFilter,
@@ -598,12 +597,6 @@
$scope.outerForm.$setPristine();
$scope.disableSaveAndAddNew = false;
- //this is to hide typeAheadPopUps - shouldn't be an issue in
- //the first place.
- $timeout(function() {
- angular.element('#hideTypeAheadPopUp').trigger('click');
- }, 10);
-
//decide whether to stay in the current screen or not.
if(addingAnotherEvent){
$scope.showEventRegistration();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-09-08 09:15:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css 2015-09-09 12:11:18 +0000
@@ -3,6 +3,7 @@
margin: 0;
padding: 0;
background-color: white;
+ overflow: auto;
}
.not-for-screen {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-09-08 09:15:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html 2015-09-09 12:11:18 +0000
@@ -96,59 +96,9 @@
<span ng-if="editingEventInFull">{{'print_details'| translate}}</span>
</button>
</div>
- </div>
- <!--<table>
- <tr>
- <td><label>{{registeringUnitLabel}}</label></td>
- <td><input type="text" class="form-control" selected-org-unit ng-model="selectedOrgUnit.name" value="{{selectedOrgUnit.name|| pleaseSelectLabel}}" disabled=""></td>
- </tr>
- <tr>
- <td><label>{{programLabel}}</label></td>
- <td>
- <select id="programId"
- class="form-control"
- name="programId"
- ng-model="selectedProgram"
- ng-options="program as program.name for program in programs | orderBy: 'name'"
- ng-change="getProgramDetails()"
- ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid">
- <option value="">{{pleaseSelectLabel}}</option>
- </select>
- </td>
- <td style='padding-left: 10px;'>
- <button class="btn btn-success hideInPrint"
- type="button"
- ng-show="selectedProgramStage"
- ng-click="showEventRegistration()"
- ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid">
- {{'register_event'| translate}}
- </button>
- </td>
- <td ng-if="dhis2Events.length > 0 || eventRegistration || editingEventInFull" style='padding-left: 10px;'>
- <button class="btn btn-info hideInPrint"
- type="button"
- onclick="javascript:window.print()">
- <span ng-if="!eventRegistration && !editingEventInFull">{{'print_list'| translate}}</span>
- <span ng-if="eventRegistration">{{'print_form'| translate}}</span>
- <span ng-if="editingEventInFull">{{'print_details'| translate}}</span>
- </button>
- </td>
- </tr>
- <tr ng-if="selectedProgramStage && selectedProgramStage.programStageSections.length && eventRegistration || editingEventInFull">
- <td><label>{{'section'| translate}}</label></td>
- <td>
- <select class="form-control"
- name="section"
- ng-model="selectedSection.id">
- <option value="ALL">{{'show_all'| translate}}</option>
- <option ng-repeat="section in selectedProgramStage.programStageSections" value={{section.id}}>{{section.name}}</option>
- </select>
- </td>
- </tr>
- </table>-->
- <!-- selection ends -->
+ </div>
+ <!-- selection ends -->
- <div id="hideTypeAheadPopUp" ng-hide="true"></div>
<!-- event grid begins -->
<div ng-include="'views/eventList.html'"></div>
<!-- event grid ends -->
