=== 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 @@
{{'add'|translate}}
+
+
|
{{'schedule'|translate}}
-
-
+
-
+ -->
=== 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 */