dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20081
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9039: Don't hide current event entry form after to click Completed button.
------------------------------------------------------------
revno: 9039
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-11-15 11:44:29 +0700
message:
Don't hide current event entry form after to click Completed button.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/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-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-11-15 04:25:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-11-15 04:44:29 +0000
@@ -842,11 +842,8 @@
enable('ps_' + programStageInstanceId );
if( jQuery(".stage-object-selected").attr('id')!=jQuery(this).attr('id') )
{
- hideById('entryForm');
- hideById('executionDateTB');
- hideById('inputCriteriaDiv');
+ hasActiveEvent = true;
}
- hasActiveEvent = true;
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-11-15 04:25:25 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/entry.js 2012-11-15 04:44:29 +0000
@@ -523,7 +523,6 @@
resetActiveEvent( eventBox.attr("pi") );
hideLoader();
- hideById('contentDiv');
if( isCreateEvent ){
showAddEventForm();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-11-13 04:54:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css 2012-11-15 04:44:29 +0000
@@ -152,7 +152,7 @@
.entryScreen
{
margin-bottom: 20px;
- width: 70%;
+ width: 80%;
font-size: 13px;
line-height: 18px;
}