dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08703
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2150: Cleaning Manpower module, work in progress
------------------------------------------------------------
revno: 2150
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-11-23 15:20:29 +0530
message:
Cleaning Manpower module, work in progress
modified:
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePost.vm
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePostDetailsResult.vm
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/form.js
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/select.vm
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/summaryReportResult.vm
local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateEmployeePostForm.vm
--
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 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePost.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePost.vm 2010-11-22 11:37:31 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePost.vm 2010-11-23 09:50:29 +0000
@@ -1,9 +1,7 @@
-<script type="text/javascript" src="../"></script>
-
<form id="employeePostForm" action="saveEmployeePost.action" method="post" >
- <table align="centre">
+ <table align="center">
<tr>
<td><label for="department"><Strong>Department</Strong> </label></td>
<td>
@@ -15,59 +13,51 @@
<td><label for="post"><Strong>Post</Strong> </label></td>
<td>
<input id="post" name="post" type="text" readonly="readonly" value="$linelistOptionName" style="min-width:200px">
- </td>
- <td>
- <input type="hidden" name="groupid" id="groupid" value="$linelistGroupId">
- <input type="hidden" name="reportingDate" id="reportingDate" value="$reportingDate">
- <input type="hidden" name="dataValue" id="dataValue" value="$dataValue">
- </td>
- <td>
- <input type="hidden" name="dataValueMapKey" id="dataValueMapKey" value="$dataValueMapKey">
+ <input type="hidden" name="groupid" id="groupid" value="$linelistGroupId">
+ <input type="hidden" name="reportingDate" id="reportingDate" value="$reportingDate">
+ <input type="hidden" name="dataValue" id="dataValue" value="$dataValue">
+ <input type="hidden" name="dataValueMapKey" id="dataValueMapKey" value="$dataValueMapKey">
</td>
</tr>
- <tr><td></td></tr><tr><td></td></tr>
+ <tr><td> </td><td> </td></tr>
#set( $count = 0 )
#foreach( $lineListElement in $lineListElements )
<tr>
<td><label>$lineListElement.name</label></td>
#if($lineListElement.PresentationType == 'text')
- <td>
- <input type="text" name="$lineListElement.shortName" id = "$lineListElement.shortName" style="width:10em" #if($count==0) onchange="getEmployeeName( '$lineListElement.shortName', this.value )" #end onkeypress="return keyPress(event, this)" value=$!llElementValuesMap.get($element)>
- </td>
- #elseif($lineListElement.PresentationType == 'combobox')
- <td>
- <select name="$lineListElement.shortName" id="$lineListElement.shortName" onkeypress="return keyPress(event, this)">
- <option name="SelectOption" value="" selected>--Select--</option>
- ##set($lineListOptions = $llElementOptionsMap.get($lineListElement.shortName))
- #set( $lineListOptions = $lineListElement.lineListElementOptions )
- #foreach( $lineListOption in $lineListOptions )
- <option name="$lineListOption.name" value="$lineListOption.name" #if($lineListOption.name == $llElementValuesMap.get($element)) selected #end>$lineListOption.name</option>
- #end
- </select>
- </td>
- #elseif($lineListElement.PresentationType == 'calender')
- #set($fordate = $lineListElement.shortName)
- <td>
- <input type="text" id="$fordate" name="$fordate" style="width:10em" onkeypress="return keyPress(event, this)">
- <script>datePickerValid( '$fordate', false );</script>
- </td>
- #end
+ <td>
+ <input type="text" name="$lineListElement.shortName" id = "$lineListElement.shortName" style="width:10em" #if($count==0) onchange="getEmployeeName( '$lineListElement.shortName', this.value )" #end onkeypress="return keyPress(event, this)" value=$!llElementValuesMap.get($element)>
+ </td>
+ #elseif($lineListElement.PresentationType == 'combobox')
+ <td>
+ <select name="$lineListElement.shortName" id="$lineListElement.shortName" onkeypress="return keyPress(event, this)">
+ <option name="SelectOption" value="" selected>--Select--</option>
+ #set( $lineListOptions = $lineListElement.lineListElementOptions )
+ #foreach( $lineListOption in $lineListOptions )
+ <option name="$lineListOption.name" value="$lineListOption.name" #if($lineListOption.name == $llElementValuesMap.get($element)) selected #end>$lineListOption.name</option>
+ #end
+ </select>
+ </td>
+ #elseif($lineListElement.PresentationType == 'calender')
+ ##set($fordate = $lineListElement.shortName)
+ <td>
+ <input type="text" id="$lineListElement.shortName" name="$lineListElement.shortName" style="width:10em" onkeypress="return keyPress(event, this)">
+ <script>datePickerValid( '$lineListElement.shortName', false );</script>
+ </td>
+ #end
</tr>
#set ($count=$count+1)
#end
- <tr><td></td><td></td></tr>
+ <tr><td> </td><td> </td></tr>
<tr>
- <td align="centre">
- <input type="submit" value="Save">
- <input type="hidden" id="reportedDate" name="reportedDate">
- </td>
- <td>
- <input type="reset" value="Reset">
- </td>
- </tr>
+ <td align="center" colspan="2">
+ <input type="submit" value="Save">
+ <input type="reset" value="Reset">
+ <input type="hidden" id="reportedDate" name="reportedDate">
+ </td>
+ </tr>
</table>
-
</form>
=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePostDetailsResult.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePostDetailsResult.vm 2010-11-22 07:28:23 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/employeePostDetailsResult.vm 2010-11-23 09:50:29 +0000
@@ -1,13 +1,13 @@
-<table>
- <tr>
+<table cellspacing="0" cellpadding="0" border="1" style="border-collapse: collapse;">
+ <tr bgcolor="#c0c0c0" align="ceter" style="font-size: 12px;">
#foreach( $lineListElement in $lineListElements)
<th>$lineListElement.name</th>
#end
</tr>
#foreach( $llDataValue in $llDataValuesList )
#set( $llValueMap = $llDataValue.lineListValues )
- <tr>
+ <tr align="center" style="font-size: 12px;">
#foreach( $lineListElement in $lineListElements )
<td>$llValueMap.get( $lineListElement.shortName )</td>
#end
=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/form.js'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/form.js 2010-11-19 12:52:40 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/javascript/form.js 2010-11-23 09:50:29 +0000
@@ -177,7 +177,7 @@
modal:true,
overlay:{background:'#000000', opacity:0.1},
width: 420,
- height: 380
+ height: 330
});
}
=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm 2010-11-19 09:33:44 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/menuForSummaryReport.vm 2010-11-23 09:50:29 +0000
@@ -5,19 +5,20 @@
</ul>
<div style=" float:right; font-size:6pt; cursor:pointer; margin-top:-20px; ">
- <a href="index.action">
- <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )"></a>
+ <a href="index.action">
+ <img src="images/goback.png" width="36" height="30" alt="$i18n.getString( "go_back" )">
+ </a>
</div>
+<br />
+
#parse( "/dhis-web-commons/ouwt/orgunittree.vm" )
-<script>
-
+<script>
function organisationUnitSelected( orgUnits )
{
window.location.href = 'summaryReport.action';
}
- selection.setListenerFunction( organisationUnitSelected );
-
+ selection.setListenerFunction( organisationUnitSelected );
</script>
=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/select.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/select.vm 2010-11-22 14:00:26 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/select.vm 2010-11-23 09:50:29 +0000
@@ -52,7 +52,11 @@
</tr>
<tr #if( !$selectedLineListGroup.getPeriodType().getName().equalsIgnoreCase( "OnChange" ) ) style="display:none" #end>
- <td><label for="reportingDate">$i18n.getString( "reporting_date" )</label></td>
+ <td>
+ <label for="reportingDate">$i18n.getString( "reporting_date" )</label>
+ <br />
+ (YYYY-MM-DD)
+ </td>
<td>
<input type="text" id="reportingDate" name="reportingDate" value="$curDate" style="width:200px" >
</td>
=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/summaryReportResult.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/summaryReportResult.vm 2010-11-22 07:28:23 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/summaryReportResult.vm 2010-11-23 09:50:29 +0000
@@ -29,7 +29,7 @@
closable: true,
modal:true,
overlay:{background:'#000000', opacity:0.1},
- width: 800,
+ width: 850,
height: 380
});
}
=== modified file 'local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateEmployeePostForm.vm'
--- local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateEmployeePostForm.vm 2010-11-20 12:16:50 +0000
+++ local/bd/dhis-web-linelisting-manpower/src/main/webapp/dhis-web-linelisting-mp/updateEmployeePostForm.vm 2010-11-23 09:50:29 +0000
@@ -1,8 +1,8 @@
-<script type="text/javascript" src="../"></script>
+<!--<script type="text/javascript" src="../"></script>-->
<form id="employeePostForm" action="updateEmployeePost.action" method="post" >
- <table align="centre">
+ <table align="center">
<tr>
<td><label for="department"><Strong>Department</Strong> </label></td>
<td>
@@ -14,54 +14,45 @@
<td><label for="post"><Strong>Post</Strong> </label></td>
<td>
<input id="post" name="post" type="text" readonly="readonly" value="$linelistOptionName" style="min-width:200px">
- </td>
- <td>
- <input type="hidden" name="groupid" id="groupid" value="$linelistGroupId">
- <input type="hidden" name="reportingDate" id="reportingDate" value="$reportingDate">
+ <input type="hidden" name="groupid" id="groupid" value="$linelistGroupId">
+ <input type="hidden" name="reportingDate" id="reportingDate" value="$reportingDate">
</td>
</tr>
- <tr><td></td></tr>
+ <tr><td> </td><td> </td></tr>
#set( $count = 0 )
#foreach( $lineListElement in $lineListElements )
<tr>
<td><label>$lineListElement.name</label></td>
#if($lineListElement.PresentationType == 'text')
- <td>
- <input type="text" name="$lineListElement.shortName" id = "$lineListElement.shortName" style="width:10em" #if($count==0) readonly="readonly" #end onkeypress="return keyPress(event, this)" value=$llDataValuesMap.get($lineListElement.shortName)>
- </td>
- #elseif($lineListElement.PresentationType == 'combobox')
- <td>
- <select name="$lineListElement.shortName" id="$lineListElement.shortName" onkeypress="return keyPress(event, this)">
- <option name="SelectOption" value="" selected>--Select--</option>
- ##set($lineListOptions = $llElementOptionsMap.get($lineListElement.shortName))
- #set($lineListOptions = $lineListElement.lineListElementOptions)
- #foreach( $lineListOption in $lineListOptions )
- <option value="$lineListOption.name" name="$llDataValuesMap.get($lineListElement.shortName)" #if($lineListOption.name == $llDataValuesMap.get($lineListElement.shortName)) selected #end>$lineListOption.name</option>
- #end
- </select>
- </td>
- #elseif($lineListElement.PresentationType == 'calender')
- #set($fordate = $lineListElement.shortName)
-
- <td>
- <input type="text" id="$fordate" name="$fordate" style="width:10em" onkeypress="return keyPress(event, this)" value=$llDataValuesMap.get($lineListElement.shortName)>
- <script>datePickerValid( '$fordate', false );</script>
- </td>
- #end
+ <td>
+ <input type="text" name="$lineListElement.shortName" id = "$lineListElement.shortName" style="width:10em" #if($count==0) readonly="readonly" #end onkeypress="return keyPress(event, this)" value=$llDataValuesMap.get($lineListElement.shortName)>
+ </td>
+ #elseif($lineListElement.PresentationType == 'combobox')
+ <td>
+ <select name="$lineListElement.shortName" id="$lineListElement.shortName" onkeypress="return keyPress(event, this)">
+ <option name="SelectOption" value="" selected>--Select--</option>
+ #set($lineListOptions = $lineListElement.lineListElementOptions)
+ #foreach( $lineListOption in $lineListOptions )
+ <option value="$lineListOption.name" name="$llDataValuesMap.get($lineListElement.shortName)" #if($lineListOption.name == $llDataValuesMap.get($lineListElement.shortName)) selected #end>$lineListOption.name</option>
+ #end
+ </select>
+ </td>
+ #elseif($lineListElement.PresentationType == 'calender')
+ <td>
+ <input type="text" id="$lineListElement.shortName" name="$lineListElement.shortName" style="width:10em" onkeypress="return keyPress(event, this)" value="$llDataValuesMap.get($lineListElement.shortName)" >
+ <script>datePickerValid( '$lineListElement.shortName', false );</script>
+ </td>
+ #end
</tr>
#set ($count=$count+1)
#end
- <tr><td></td><td></td></tr>
-
+ <tr><td> </td><td> </td></tr>
<tr>
- <td align="centre">
- <input type="submit" value="Save">
- <input type="hidden" id="reportedDate" name="reportedDate">
- </td>
- <td>
- <input type="reset" value="Reset">
- </td>
- </tr>
-
+ <td align="center" colspan="2">
+ <input type="submit" value="Save">
+ <input type="reset" value="Reset">
+ <input type="hidden" id="reportedDate" name="reportedDate">
+ </td>
+ </tr>
</table>
</form>
\ No newline at end of file
