dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21730
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-14 15:03:34 +0100
message:
  Not showing scheduled option for events with hidden duedate
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-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-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2016-01-13 16:56:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2016-01-14 14:03:34 +0000
@@ -559,9 +559,11 @@
             }
             else{
                 angular.forEach($scope.programStages, function(stage){
-                    if($scope.stageNeedsEvent(stage)){
-                        availableStages.push(stage);
-                    }
+                    if(eventCreationAction !== $scope.eventCreationActions.schedule || stage.hideDueDate !== true){
+                        if($scope.stageNeedsEvent(stage)){
+                            availableStages.push(stage);
+                        }
+                    }                    
                 });
             }           
             if(availableStages.length === 0) {

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html	2016-01-08 13:43:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-layout.html	2016-01-14 14:03:34 +0000
@@ -41,18 +41,22 @@
                                 <a href title="{{'create_new_event'| translate}}" ng-click="showCreateEvent(stage,eventCreationActions.add)" style="vertical-align:middle">
                                     {{'add'|translate}}
                                 </a>
+                            </span>
+                            <span ng-if="!stage.hideDueDate">
                                 |
                                 <a href title="{{'schedule_new_event'| translate}}" ng-click="showCreateEvent(stage,eventCreationActions.schedule)" style="vertical-align:middle">
                                     {{'schedule'|translate}}
-                                </a>
-                                <!-- hides referral in trunk
+                                </a>                                
+                            </span>
+                            <!-- hides referral in trunk
+                            <span>                                
                                 |
                                 <a href title="{{'make_referral' | translate}}" ng-click="showCreateEvent(stage, eventCreationActions.referral)" style="vertical-align: middle" ng-if="showReferral">
                                     {{'referral'|translate}}
                                 </a>
-                                -->
+                                
                             </span>
-
+                            -->
                         </div>
                     </div>
                 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css	2015-12-28 14:53:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css	2016-01-14 14:03:34 +0000
@@ -4,7 +4,7 @@
 }
 
 .not-for-screen {
-    display: block;
+    display: block !important;
 }
 
 ::-webkit-input-placeholder { /* WebKit browsers */

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-01-12 15:27:08 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-01-14 14:03:34 +0000
@@ -18,7 +18,7 @@
     }
 
     .not-for-screen {
-        display: block;
+        display: block !important;
     }
 
     ::-webkit-input-placeholder { /* WebKit browsers */