dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18840
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8005: Remove polling interval in SMS config page, Auto create SMS service if it doesn't have
------------------------------------------------------------
revno: 8005
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-09-05 23:25:31 +0700
message:
Remove polling interval in SMS config page, Auto create SMS service if it doesn't have
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/RemoveGatewayConfigAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.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 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java 2012-08-30 12:47:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java 2012-09-05 16:25:31 +0000
@@ -176,6 +176,12 @@
}
}
}
+ else
+ {
+ smsConfig = new SmsConfiguration( true );
+
+ smsConfigurationManager.updateSmsConfiguration( smsConfig );
+ }
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/RemoveGatewayConfigAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/RemoveGatewayConfigAction.java 2012-03-21 02:20:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/RemoveGatewayConfigAction.java 2012-09-05 16:25:31 +0000
@@ -69,22 +69,22 @@
public String execute()
throws Exception
{
+
SmsConfiguration smsConfig = smsConfigurationManager.getSmsConfiguration();
Iterator<SmsGatewayConfig> it = smsConfig.getGateways().iterator();
-
- while( it.hasNext() )
+
+ while ( it.hasNext() )
{
if ( smsConfig.getGateways().indexOf( it.next() ) == id )
{
it.remove();
-
+
smsConfigurationManager.updateSmsConfiguration( smsConfig );
-
+
break;
}
}
-
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js 2012-09-05 03:16:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js 2012-09-05 16:25:31 +0000
@@ -209,7 +209,6 @@
if ( result )
{
lockScreen();
- refreshIndex( itemId );
$.postJSON(
action,
{
@@ -232,6 +231,7 @@
}
unLockScreen();
showSuccessMessage( i18n_delete_success );
+ refreshIndex( itemId );
}
else if ( json.response == "error" )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm 2012-08-22 07:08:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm 2012-09-05 16:25:31 +0000
@@ -51,19 +51,38 @@
function refreshIndex( indexDeleted ) {
var gwSize = getFieldValue( 'gatewaySize' );
- if ( indexDeleted < gwSize )
+ if ( indexDeleted + 1 < gwSize )
{
- for ( indexDeleted + 1 ;indexDeleted + 1 <= gwSize - 1 ;indexDeleted++ )
+ for ( indexDeleted + 1 ; indexDeleted + 1 <= gwSize - 1; indexDeleted++ )
{
- document.getElementById(indexDeleted + 1).href = 'showUpdateGateWayConfigForm.action?index='+indexDeleted;
+ var temp = indexDeleted + 1;
+
+ document.getElementById('edit'+temp).href = "showUpdateGateWayConfigForm.action?index="+ indexDeleted;
+
+ var removeLinkTemp = document.getElementById('remove'+temp).getAttribute("href");
+
+ var newRemoveLink = removeLinkTemp.substring(removeLinkTemp.lastIndexOf(','),removeLinkTemp.length-1);
+
+ document.getElementById('remove'+temp).href = "javascript:removeGateway("+ indexDeleted + newRemoveLink +")";
+
+ document.getElementById('tr'+temp).id = "tr" + indexDeleted;
+
+ document.getElementById('edit'+temp).id = "edit" + indexDeleted;
+
+ document.getElementById('remove'+temp).id = "remove" + indexDeleted;
}
}
jQuery( '#gatewaySize' ).val(gwSize - 1);
- if ( gwSize == 4 )
+ if ( gwSize == 5 )
{
document.getElementById( 'btnAddGw' ).disabled = false;
}
+
+ if ( gwSize == 1 )
+ {
+ window.location.href='showSMSConfigureForm.action';
+ }
//document.getElementById("1").getAttribute("href");
};
@@ -92,13 +111,13 @@
<tbody>
<tr>
<td colspan="2">
- #if( $!smsConfig )
+ #if( $gwSizeTemp != 0)
<div class="generalOverlaps overlaps" id="noOverlapsDiv" style="display: block;">
$i18n.getString( $!encoder.htmlEncode( $!smsServiceStatus ) )
</div>
#else
<div class="generalOverlaps overlapsWarning" id="noOverlapsDiv" style="display: block;">
- $i18n.getString( "sms_configuration_not_initialized" )
+ $i18n.getString( "unable_load_configuration_cause_of_there_is_no_gateway" )
</div>
#end
</td>
@@ -110,27 +129,6 @@
</td>
</tr>
<tr><td> </td><td> </td></tr>
- </tbody>
-
- <thead>
- <tr>
- <th colspan="2">$i18n.getString("configuration")</th>
- </tr>
- </thead>
-
- <tbody>
- <tr>
- <td><label for="pollingInterval">$i18n.getString( "polling_interval_in_seconds" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="pollingInterval" name="pollingInterval" style="width:20em" value="$!smsConfig.pollingInterval"/></td>
- </tr>
- <tr>
- <td><label for="serverPhoneNumber">$i18n.getString( "server_phone_number" )</label></td>
- <td><input type="text" id="serverPhoneNumber" name="serverPhoneNumber" style="width:20em" value="$!smsConfig.longNumber"/>
- <input type="submit" value="$i18n.getString( 'save_settings' )" style="width:13em"/>
- </td>
- </tr>
-
- <tr><td align="right" colspan="2"><br/></td></tr>
<tr>
<td colspan="2">
@@ -149,8 +147,8 @@
#set( $gw = $!gatewayConfigMap.get( $key ) )
<td>$!encoder.htmlEncode( $gw.name )</td>
<td style="text-align:right">
- <a id="$key" href="showUpdateGateWayConfigForm.action?index=$key" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
- <a href="javascript:removeGateway( $key, '$!encoder.jsEncode( $gw.name )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
+ <a id="edit$key" href="showUpdateGateWayConfigForm.action?index=$key" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"/></a>
+ <a id="remove$key" href="javascript:removeGateway($key,'$!encoder.jsEncode( $gw.name )')" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"/></a>
</td>
</tr>
#end
@@ -160,7 +158,7 @@
</tr>
<tr>
<td align="right" colspan="2">
- <input type="button" id="btnAddGw" value="$i18n.getString( 'add_gw' )" style="width:13em" #if( $!gwSizeTemp == 4 ) disabled="true" #end onclick="window.location.href='showUpdateGateWayConfigForm.action'"/>
+ <input type="button" id="btnAddGw" value="$i18n.getString( 'add_gw' )" style="width:13em" #if( $!gwSizeTemp == 5 ) disabled="true" #end onclick="window.location.href='showUpdateGateWayConfigForm.action'"/>
</td>
</tr>
</tbody>
