From de5b2e979d62e0f32f5e1d9ed227f8392649b940 Mon Sep 17 00:00:00 2001 From: vaneyck Date: Thu, 4 Oct 2012 15:58:58 +0300 Subject: [PATCH 0001/2668] create deploy_builds --- plugins/frontlinesms-core/do/deploy_builds | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 plugins/frontlinesms-core/do/deploy_builds diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds new file mode 100644 index 000000000..a0391fae7 --- /dev/null +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -0,0 +1,4 @@ +#ftp into frontlinesms website and upload the buils in the right folders +#Write and Upload xml file that has data for new uploads +#Write and Upload the php script that changes the links + From a421e2563789cbcfd6db3e71bf1aaecbdb88cd2e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 8 Oct 2012 10:39:27 +0300 Subject: [PATCH 0002/2668] configure curl to login to frontlinesms.com --- plugins/frontlinesms-core/do/deploy_builds | 50 ++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) mode change 100644 => 100755 plugins/frontlinesms-core/do/deploy_builds diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds old mode 100644 new mode 100755 index a0391fae7..eb3b7a256 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -1,4 +1,48 @@ -#ftp into frontlinesms website and upload the buils in the right folders -#Write and Upload xml file that has data for new uploads -#Write and Upload the php script that changes the links +#!/bin/bash +upload(){ + local=$1 + remote=$2 + curl -v -T $local --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote" +} +echo "username : $1 password : $2" +USERNAME=$1 +PASSWORD=$2 +root_url="ftp://frontlinesms.com/" + +local_windows_path=ls install/target/install4j/frontlinesms* | grep window +local_mac_path=ls install/target/install4j/frontlinesms* | grep mac +local_unix_path=ls /install/target/install4j/frontlinesms* | grep unix + +remote_windows_path=$root_url"/downloads/" +remote_mac_path=$root_url"/downloads/" +remote_unix_path=$root_url"/downloads/" + +r_path="http://www.frontlinesms.com/" + +cd install/target/install4j/ +r_windows_path=$r_path"/downloads/"ls | grep windows +r_mac_path=$r_path"/downloads/"ls | grep mac +r_unix_path=$r_path"/downloads/"ls | grep linux +cd ../../ + +#uloading the builds +echo "#### Uloading windows build.." +curl -v -T $local_windows_path --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_windows_path" +echo "#### Uloading mac build.." +curl -v -T $local_mac_path --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_mac_path" +echo "#### Uploading unix build..." +curl -v -T $local_unix_path --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_unix_path" + +echo "#### Creating the xml file with file names" +pushd #change pwd to home +touch build_links.json +"{'windows':'$r_windows_path', 'mac':'$r_mac_path', 'unix':'$r_unix_path'}" >> build_links.json + +echo "#### Uloading xml document with file names" +local_json_path=pwd"build_links.json" +remote_json_path=$r_path"/downloads/build_links.json" +upload $local_json_path $remote_json_path + +popd # change back to /do folder +echo "Complete...:-)" \ No newline at end of file From 1130b966d1cc8e29ce376b72a1499f03b590fcb9 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 9 Oct 2012 14:29:58 +0300 Subject: [PATCH 0003/2668] 90% of deploy script done --- plugins/frontlinesms-core/do/deploy_builds | 59 ++++++++++------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index eb3b7a256..3678b1c80 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -1,48 +1,45 @@ #!/bin/bash -upload(){ - local=$1 - remote=$2 - curl -v -T $local --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote" -} - -echo "username : $1 password : $2" +if [ ! -z "$1" ] && [ ! -z "$2" ] +then + echo "AWESOME #Username : $1 #Password : $2" +else + echo "Upload files to your server" + echo "Error ### Usage: ./do/deploy_builds " + exit +fi USERNAME=$1 PASSWORD=$2 -root_url="ftp://frontlinesms.com/" -local_windows_path=ls install/target/install4j/frontlinesms* | grep window -local_mac_path=ls install/target/install4j/frontlinesms* | grep mac -local_unix_path=ls /install/target/install4j/frontlinesms* | grep unix +root_url="ftp://frontlinesms.com/" +remote_upload_path=$root_url"/httpdocs/downloads/" -remote_windows_path=$root_url"/downloads/" -remote_mac_path=$root_url"/downloads/" -remote_unix_path=$root_url"/downloads/" +local_windows_path=`ls install/target/install4j/frontlinesms* | grep window` +local_mac_path=`ls install/target/install4j/frontlinesms* | grep mac` +local_unix_path=`ls install/target/install4j/frontlinesms* | grep unix` -r_path="http://www.frontlinesms.com/" +r_path="http://www.frontlinesms.com/downloads/" -cd install/target/install4j/ -r_windows_path=$r_path"/downloads/"ls | grep windows -r_mac_path=$r_path"/downloads/"ls | grep mac -r_unix_path=$r_path"/downloads/"ls | grep linux -cd ../../ +r_windows_path=$r_path`ls install/target/install4j/ | grep windows` +r_mac_path=$r_path`ls install/target/install4j/ | grep mac` +r_unix_path=$r_path`ls install/target/install4j/ | grep unix` +echo ">>>>>>>>>>> Uploading to"$remote_upload_path #uloading the builds echo "#### Uloading windows build.." -curl -v -T $local_windows_path --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_windows_path" +curl -v -T $local_windows_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" echo "#### Uloading mac build.." -curl -v -T $local_mac_path --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_mac_path" +curl -v -T $local_mac_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" echo "#### Uploading unix build..." -curl -v -T $local_unix_path --ftp-pasv -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_unix_path" +curl -v -T $local_unix_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" echo "#### Creating the xml file with file names" -pushd #change pwd to home touch build_links.json -"{'windows':'$r_windows_path', 'mac':'$r_mac_path', 'unix':'$r_unix_path'}" >> build_links.json - +echo "{'windows':'$r_windows_path', 'mac':'$r_mac_path', 'unix':'$r_unix_path'}" >> build_links.json echo "#### Uloading xml document with file names" -local_json_path=pwd"build_links.json" -remote_json_path=$r_path"/downloads/build_links.json" -upload $local_json_path $remote_json_path +local_json_path="build_links.json" +curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" + +echo "#### Removing build_links.json... :(" +rm build_links.json -popd # change back to /do folder -echo "Complete...:-)" \ No newline at end of file +echo "Complete .... :)" \ No newline at end of file From a15e9f746db7e1a571702b260d964c8a78f2fe4a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 25 Oct 2012 12:02:10 +0300 Subject: [PATCH 0004/2668] changed file with links to php --- plugins/frontlinesms-core/do/deploy_builds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index 3678b1c80..406cf95d9 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -33,8 +33,8 @@ echo "#### Uploading unix build..." curl -v -T $local_unix_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" echo "#### Creating the xml file with file names" -touch build_links.json -echo "{'windows':'$r_windows_path', 'mac':'$r_mac_path', 'unix':'$r_unix_path'}" >> build_links.json +touch build_links.php +echo "" >> build_links.php echo "#### Uloading xml document with file names" local_json_path="build_links.json" curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" From 40db4e7d43cbb7c918e640422598fb2c64540032 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 25 Oct 2012 15:24:54 +0300 Subject: [PATCH 0005/2668] added md5sum check --- plugins/frontlinesms-core/do/deploy_builds | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index 406cf95d9..cc9d5ff52 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -32,6 +32,50 @@ curl -v -T $local_mac_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_pa echo "#### Uploading unix build..." curl -v -T $local_unix_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" +#Cheking md5 of files +wget $r_windows_path +echo "Checking md5 of Windows build" +declare local_hash=${$(md5sum `ls install/target/install4j/frontlinesms* | grep windows`)% *} +declare remote_hash=${$(md5sum `ls install/target/install4j/ | grep windows`)% *} + +echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" +if[ local_hash -eq remote_hash ] + then + echo "md5sum okay ## oh yeah !!! " +else + echo "ooops md5sum not equal exiting script" + exit +fi + +wget $r_mac_path +echo "Checking md5 of Mac build" +local_hash=${$(md5sum `ls install/target/install4j/frontlinesms* | grep mac`)% *} +remote_hash=${$(md5sum `ls install/target/install4j/ | grep mac`)% *} + +echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" +if[ local_hash -eq remote_hash ] + then + echo "md5sum okay ## oh yeah !!! " +else + echo "ooops md5sum not equal exiting script" + exit +fi + +wget $r_unix_path +local_hash=${$(md5sum `ls install/target/install4j/frontlinesms* | grep unix`)% *} +remote_hash=${$(md5sum `ls install/target/install4j/ | grep unix`)% *} + +echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" +if[ local_hash -eq remote_hash ] + then + echo "md5sum okay ## oh yeah !!! " +else + echo "ooops md5sum not equal exiting script" + exit +fi + +exit ##Exiting so as not to upload link file + echo "#### Creating the xml file with file names" touch build_links.php echo "" >> build_links.php From a9d63634022e09e7eb6a9cf40fab49026b2ddbc2 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 15 Nov 2012 15:44:40 +0300 Subject: [PATCH 0006/2668] Added failing tests for CORE-1677 --- .../domain/frontlinesms2/Webconnection.groovy | 4 ++++ .../frontlinesms2/WebconnectionService.groovy | 4 ++++ .../domain/WebconnectionISpec.groovy | 17 +++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index 60e90a51c..2e8702d6d 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -147,6 +147,10 @@ abstract class Webconnection extends Activity { log.info "Web Connection Response::\n ${x.in.body}" } + static def testRoute(Map params) { + + } + private String urlEncode(String s) throws UnsupportedEncodingException { println "PreProcessor.urlEncode : s=$s -> ${URLEncoder.encode(s, "UTF-8")}" return URLEncoder.encode(s, "UTF-8"); diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 5d40f7037..cc7284d55 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -47,6 +47,10 @@ class WebconnectionService { sendMessageAndHeaders("seda:activity-webconnection-${message.messageOwner.id}", message, headers) } + def testRoute(Webconnection webconnectionInstance) { + + } + def saveInstance(Webconnection webconnectionInstance, params) { webconnectionInstance.keywords?.clear() webconnectionInstance.name = params.name diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy index 368b0cd2e..8d11ec649 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy @@ -2,9 +2,11 @@ package frontlinesms2.domain import frontlinesms2.* import spock.lang.* +import org.apache.camel.* class WebconnectionISpec extends grails.plugin.spock.IntegrationSpec { def webCService = Mock(WebconnectionService) + def camelContext = Mock(CamelContext) def 'incoming message matching keyword should trigger http message sending'() { given: @@ -32,4 +34,19 @@ class WebconnectionISpec extends grails.plugin.spock.IntegrationSpec { then: 1 * webCService.send(incomingMessage) } + + def 'testRoute should shut down route after execution'() { + given: + def params = [url: "www.frontlinesms.com/sync", httpMethod:Webconnection.HttpMethod.GET] + params.'param-name' = ['username', 'password'] as String[] + params.'param-value' = ['bob','secret'] as String[] + when: + Webconnection.testRoute(params) + then: + 1 * camelContext.addRouteDefinitions(_) + camelContext.routes.findAll { it.id == "test-webconnection-null"} //This might be modified based on implementation + 1 * camelContext.stopRoute(_) + webCService.testRoute() == false + !Fmessage.count() + } } From f5190bd89ffd3d1e031564f45f490e2e3fdf55c9 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 15 Nov 2012 15:58:13 +0300 Subject: [PATCH 0007/2668] Added failing tests for CORE-1676 --- .../frontlinesms2/popup/PageMediumPopup.groovy | 2 +- .../GenericWebconnectionCedSpec.groovy | 17 +++++++++++++++++ .../UshahidiWebconnectionCedSpec.groovy | 11 +++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy index 248740b0e..3b4394b41 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy @@ -328,7 +328,7 @@ class WebconnectionConfirmTab extends geb.Module { keyword { $("#confirm-keyword").text() } type { $("#confirm-type").text() } url { $("#confirm-url").text() } - + testConnectionButton { $("#testRoute")} confirm{ label-> $("#confirm-"+label).text() } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy index 4468c3c02..2a230b578 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy @@ -141,6 +141,23 @@ class GenericWebconnectionCedSpec extends WebconnectionBaseSpec { // N.B. there is no text displayed for this error } + def "Test Webconnection button is displayed on the confirm tab"() { + given: + startAtTab('keyword') + when: + keywordTab.keyword = "" + keywordTab.useKeyword('disabled').click() // to disable + next.click() + then: + waitFor { confirmTab.displayed } + when: + confirmTab.name = "my ext cmd" + submit.click() + then: + waitFor { summary.displayed } + testConnectionButton.displayed + } + private def startAtTab(tabName) { launchWizard('generic') waitFor { requestTab.displayed } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy index d523c2da0..a7afc5213 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy @@ -129,6 +129,17 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { header['url'] == 'https://frontlinecrowd.crowdmap.com/frontlinesms/' } + def '"Test Connection" button is displayed on confirm screen'() { + given: + launchWizard('ushahidi') + and: + fillValidConfig() + when: 'skip past sorting page' + next.click() + then: + testConnectionButton.displayed + } + private def fillValidConfig() { configureUshahidi.subType('crowdmap').click() configureUshahidi.crowdmapDeployAddress = 'default' From 703aa56fa812563dbf4b95788e5e7d860571fb86 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 23 Nov 2012 17:43:16 +0300 Subject: [PATCH 0008/2668] Implemented UI for testing routes --- .../frontlinesms2/ActivityController.groovy | 44 +++++++------- .../WebconnectionController.groovy | 27 ++++++--- .../domain/frontlinesms2/Webconnection.groovy | 33 ++++++++--- .../grails-app/i18n/messages.properties | 3 + .../frontlinesms2/WebconnectionService.groovy | 44 +++++++++++--- .../views/webconnection/_confirm.gsp | 2 +- .../views/webconnection/_validate.gsp | 59 ++++++++++++++++++- .../views/webconnection/generic/_confirm.gsp | 5 ++ .../views/webconnection/ushahidi/_confirm.gsp | 6 +- .../web-app/js/activity/popups.js | 38 +++++++----- .../web-app/js/mediumPopup.js | 4 +- 11 files changed, 202 insertions(+), 63 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index fa783cf47..e4d6e5006 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -123,10 +123,10 @@ class ActivityController { return collidingKeywords } - protected void doSave(classShortname, service, instance) { + protected void doSave(classShortname, service, instance, activate=true) { try { service.saveInstance(instance, params) - instance.activate() + if(activate) instance.activate() flash.message = message(code:classShortname + '.saved') params.activityId = instance.id withFormat { @@ -135,27 +135,31 @@ class ActivityController { } } catch(Exception ex) { ex.printStackTrace() - def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords) - def errors - if (collidingKeywords) { - errors = collidingKeywords.collect { - if(it.key == '') { - message(code:'activity.generic.global.keyword.in.use', args:[it.value]) - } else { - message(code:'activity.generic.keyword.in.use', args:[it.key, it.value]) - } - }.join('\n') - } else { - errors = instance.errors.allErrors.collect { - message(code:it.codes[0], args:it.arguments.flatten(), defaultMessage:it.defaultMessage) - }.join('\n') - } - withFormat { - json { render([ok:false, text:errors] as JSON) } - } + generateErrorMessages(instance) } } + protected def generateErrorMessages(instance) { + def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords) + def errors + if (collidingKeywords) { + errors = collidingKeywords.collect { + if(it.key == '') { + message(code:'activity.generic.global.keyword.in.use', args:[it.value]) + } else { + message(code:'activity.generic.keyword.in.use', args:[it.key, it.value]) + } + }.join('\n') + } else { + errors = instance.errors.allErrors.collect { + message(code:it.codes[0], args:it.arguments.flatten(), defaultMessage:it.defaultMessage) + }.join('\n') + } + withFormat { + json { render([ok:false, text:errors] as JSON) } + } + } + private def withActivity(Closure c) { def activityInstance = Activity.get(params.id) if (activityInstance) c activityInstance diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index 8d4dabdd9..5ff9e6d91 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -11,14 +11,7 @@ class WebconnectionController extends ActivityController { def create() {} def save() { - def webconnectionInstance - Class clazz = WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType] - if(params.ownerId) { - webconnectionInstance = clazz.get(params.ownerId) - } else { - webconnectionInstance = clazz.newInstance() - } - doSave('webconnection', webconnectionService, webconnectionInstance) + doSave('webconnection', webconnectionService, getWebconnectionInstance()) } def config() { @@ -30,5 +23,23 @@ class WebconnectionController extends ActivityController { } render responseMap as JSON } + + def testRoute() { + println "<<<>>> $params" + def webconnectionInstance = getWebconnectionInstance() + doSave('webconnection', webconnectionService, webconnectionInstance, false) + webconnectionService.testRoute(webconnectionInstance) + } + + private def getWebconnectionInstance() { + def webconnectionInstance + Class clazz = WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType] + if(params.ownerId) { + webconnectionInstance = clazz.get(params.ownerId) + } else { + webconnectionInstance = clazz.newInstance() + } + + } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index 2e8702d6d..63269d6d9 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -63,6 +63,26 @@ abstract class Webconnection extends Activity { webconnectionService.send(message) } + List getTestRouteDefinitions() { + return new RouteBuilder() { + @Override void configure() {} + List getRouteDefinitions() { + return [from("seda:activity-webconnection-${Webconnection.this.id}") + .beanRef('webconnectionService', 'preProcess') + .setHeader(Exchange.HTTP_PATH, simple('${header.url}')) + .onException(Exception) + .redeliveryDelay(0) + .handled(true) + .beanRef('webconnectionService', 'handleException') + .end() + .to(Webconnection.this.url) + .beanRef('webconnectionService', 'postProcess') + .beanRef('webconnectionService', 'deactivate') + .routeId("activity-webconnection-${Webconnection.this.id}")] + } + }.routeDefinitions + } + List getRouteDefinitions() { return new RouteBuilder() { @Override void configure() {} @@ -93,8 +113,11 @@ abstract class Webconnection extends Activity { } println "*** ACTIVATING ACTIVITY ***" + createRoute(this.routeDefinitions) + } + + def createRoute(routes) { try { - def routes = this.routeDefinitions camelContext.addRouteDefinitions(routes) println "################# Activating Webconnection :: ${this}" LogEntry.log("Created Webconnection routes: ${routes*.id}") @@ -102,8 +125,7 @@ abstract class Webconnection extends Activity { println ex } catch(Exception ex) { println ex - camelContext.stopRoute("activity-webconnection-${this.id}") - camelContext.removeRoute("activity-webconnection-${this.id}") + deactivate() } } @@ -145,10 +167,7 @@ abstract class Webconnection extends Activity { println "###### Webconnection.postProcess() with Exchange # ${x}" println "Web Connection Response::\n ${x.in.body}" log.info "Web Connection Response::\n ${x.in.body}" - } - - static def testRoute(Map params) { - + x } private String urlEncode(String s) throws UnsupportedEncodingException { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 8e5debe65..1a303985c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -873,6 +873,9 @@ webconnection.url.label=Server Url: webconnection.param.name=Name: webconnection.param.value=Value: webconnection.add.anotherparam=Add parameter +webconnection.test.prompt=Send Test Message +webconnection.testing.label=Testing... +webconnection.testroute.label=Test and Save dynamicfield.message_body.label=Message Text dynamicfield.message_body_with_keyword.label=Message Text With keyword diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index cc7284d55..ce6b8b93b 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -4,6 +4,9 @@ import frontlinesms2.* import org.apache.camel.* class WebconnectionService { + static String TEST_MESSAGE_TEXT = "Test Message" + def camelContext + def preProcess(Exchange x) { println "x: ${x}" println "x.in: ${x.in}" @@ -32,10 +35,10 @@ class WebconnectionService { log.info "Web Connection request failed with exception: ${x.in.body}" } - def handleFailed(Exchange x) { - } - - def handleCompleted(Exchange x) { + def deactivate(Exchange x) { + def webConn = Webconnection.get(x.in.headers.'webconnection-id') + println "### DEACTIVATING AFTER TEST ${webConn.name} ###" + webConn.deactivate() } def send(Fmessage message) { @@ -47,10 +50,6 @@ class WebconnectionService { sendMessageAndHeaders("seda:activity-webconnection-${message.messageOwner.id}", message, headers) } - def testRoute(Webconnection webconnectionInstance) { - - } - def saveInstance(Webconnection webconnectionInstance, params) { webconnectionInstance.keywords?.clear() webconnectionInstance.name = params.name @@ -70,10 +69,37 @@ class WebconnectionService { webconnectionInstance.save(failOnError:true, flush:true) } + def testRoute(Webconnection webconnectionInstance) { + def message = Fmessage.findByMessageOwnerAndText(webconnectionInstance, TEST_MESSAGE_TEXT) + if(!message) { + message = createTestMessage() + webconnectionInstance.addToMessages(message) + webconnectionInstance.save(failOnError:true) + } + webconnectionInstance.createRoute(webconnectionInstance.testRouteDefinitions) + if(getStatusOf(webconnectionInstance) == ConnectionStatus.CONNECTED) { + def headers = [:] + headers.'fmessage-id' = message.id + headers.'webconnection-id'= webconnectionInstance.id + sendMessageAndHeaders("seda:activity-webconnection-${webconnectionInstance.id}", message, headers) + changeMessageOwnerDetail(message, Webconnection.OWNERDETAIL_PENDING) + } else { + changeMessageOwnerDetail(message, Webconnection.OWNERDETAIL_FAILED) + } + } + + def getStatusOf(Webconnection w) { + camelContext.routes.any { it.id ==~ /.*activity-webconnection-${w.id}$/ } ? ConnectionStatus.CONNECTED : ConnectionStatus.NOT_CONNECTED + } + private changeMessageOwnerDetail(Fmessage message, String s) { message.ownerDetail = s message.save(failOnError:true, flush:true) println "Changing Status ${message.ownerDetail}" } -} + private Fmessage createTestMessage() { + Fmessage fm = new Fmessage(src:"0000", text:TEST_MESSAGE_TEXT, inbound:true) + fm.save(failOnError:true, flush:true) + } +} diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp index c23e4337e..c1d143ea1 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp @@ -6,4 +6,4 @@ - + \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 023d3da2c..ccea7d765 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -112,6 +112,63 @@ } setPara("#keyword-confirm", keywordConfirmationText); setPara("#autoreply-confirm", $('#messageText').val()); - } + } + + + function toggleTestButton(ctx) { + if(ctx.checked) { + showTestRouteBtn(); + } else { + hideTestRouteBtn(); + } + } + + function showTestRouteBtn() { + var buttonSet, testRouteBtn; + buttonSet = $('.ui-dialog-buttonset'); + buttonSet.find("#submit").hide(); + testRouteBtn = buttonSet.find("#testRoute"); + if(testRouteBtn.length === 0) { + testRouteBtn = $('', { + id: "testRoute", + type:"submit", + value: i18n('webconnection.testroute.label'), + click: testRouteStatus + }); + } else { + testRouteBtn.show(); + } + buttonSet.append(testRouteBtn); + } + + function hideTestRouteBtn() { + $("#submit").css("display", "inline"); + $("#testRoute").hide(); + } + + function testRouteStatus() { + if(mediumPopup.tabValidates(mediumPopup.getCurrentTab())) { + $.ajax({ + type: 'post', + data: $("#new-webconnection-form").serialize(), + url: "${g.createLink(controller:'webconnection', action:'testRoute', params:['ownerId': activityInstanceToEdit?.id, 'format':'json'])}", + success: function(data, textStatus) { checkRouteStatus(data)} + }); + } else { + $('.error-panel').show(); + } + return false; + } + + function checkRouteStatus(response) { + $("#testRoute").attr('disabled'); + if (response.ok) { + $("#testRoute").attr("value", i18n('webconnection.testing.label')); + alert("Poll for success status"); + } else { + displayErrors(response) + } + } + diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp index 3666df31b..f3c85ec90 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp @@ -7,4 +7,9 @@

+
+ +
diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp index c5da2dbf5..402aa2d1a 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp @@ -7,4 +7,8 @@

- +
+ +
\ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/js/activity/popups.js b/plugins/frontlinesms-core/web-app/js/activity/popups.js index a3695c87c..cc4f6cce7 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/popups.js +++ b/plugins/frontlinesms-core/web-app/js/activity/popups.js @@ -14,10 +14,23 @@ function chooseActivity() { } function checkForSuccessfulSave(response, type) { - var errors, messageDialog; $("#submit").removeAttr('disabled'); if (response.ok) { - $("div.confirm").parent().hide(); + loadSummaryTab(type); + } else { + displayErrors(response); + } +} + +function summaryRedirect() { + var activityId = $(".summary #activityId").val(); + $(this).dialog('close'); + window.location.replace(url_root + "message/activity/" + activityId); +} + +function loadSummaryTab(type) { + var messageDialog; + $("div.confirm").parent().hide(); $(".ui-tabs-nav").hide(); $("div.summary").show(); $(".summary #activityId").val(response.ownerId); @@ -34,17 +47,12 @@ function checkForSuccessfulSave(response, type) { } ); messageDialog.css("height", "389px"); - - } else { - errors = $(".error-panel"); - errors.text(response.text); - errors.show(); - $("#submit").removeAttr('disabled'); - } -} - -function summaryRedirect() { - var activityId = $(".summary #activityId").val(); - $(this).dialog('close'); - window.location.replace(url_root + "message/activity/" + activityId); } + +function displayErrors(response) { + var errors; + errors = $(".error-panel"); + errors.text(response.text); + errors.show(); + $("#submit").removeAttr('disabled'); +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/js/mediumPopup.js b/plugins/frontlinesms-core/web-app/js/mediumPopup.js index f412c8e93..08e03961c 100644 --- a/plugins/frontlinesms-core/web-app/js/mediumPopup.js +++ b/plugins/frontlinesms-core/web-app/js/mediumPopup.js @@ -294,7 +294,9 @@ var mediumPopup = (function() { launchHelpWizard:launchHelpWizard, messageResponseClick:messageResponseClick, // TODO move this somewhere more suitable selectSubscriptionGroup:selectSubscriptionGroup, // TODO move this somewhere more suitable - submit:submit + submit:submit, + tabValidates:tabValidates, + getCurrentTab:getCurrentTab }; }()); From f8b6901e6fbf200b2e5e4e744041de656dc7bd2c Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 27 Nov 2012 18:05:09 +0300 Subject: [PATCH 0009/2668] Added tests for send routing --- .../DispatchRouterService.groovy | 31 ++++++++- .../services/DispatchRouterServiceSpec.groovy | 68 ++++++++++++++++--- 2 files changed, 86 insertions(+), 13 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index adb3840f1..7fe34834a 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -5,6 +5,7 @@ import org.apache.camel.Header /** This is a Dynamic Router */ class DispatchRouterService { + def appSettingsService def camelContext int counter = -1 @@ -20,8 +21,8 @@ class DispatchRouterService { log "ENTRY" log "Routing exchange $exchange with previous endpoint $previous and target fconnection $requestedFconnectionId" log "x.in=$exchange?.in" - log "x.in.headers=$exchange?.in?.headers" - + log "x.in.headers=$exchange.in.headers" + if(previous) { // We only want to pass this message to a single endpoint, so if there // is a previous one set, we should exit the slip. @@ -31,7 +32,31 @@ class DispatchRouterService { log "Target is set, so forwarding exchange to fconnection $requestedFconnectionId" return "seda:out-$requestedFconnectionId" } else { - def routeId = getDispatchRouteId() + def routeId + if(appSettingsService.get('routing.uselastreceiver') == true){ + def d = Dispatch.get(exchange.in.getHeader('frontlinesms.dispatch.id')) + println "dispatch to send # $d ### d.dst # $d?.dst" + def latestReceivedMessage = Fmessage.findBySrcAndOrderByDateCreated(d.dst) + if(latestReceivedMessage?.receivedOn) { + println "## Sending message with receivedOn Connection ##" + def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } + println "Id of prefered route ## $latestReceivedMessage.receivedOn" + println "allOutRoutes ## $allOutRoutes" + def routeToTake = allOutRoutes.find{ it.id == "out-${latestReceivedMessage.receivedOn}" } + println "Chosen Route ## $routeToTake" + routeId = routeToTake?routeToTake.id:null + } + } + + if(!routeId){ // if uselastreceiver did not set the routeId + if(appSettingsService.get('routing.otherwise') == 'any') { + println "Sending to any available connection" + routeId = getDispatchRouteId() + }else{ + println "Not sending message at all" + } + } + if(routeId) { log "Sending with route: $routeId" def fconnectionId = (routeId =~ /.*-(\d+)$/)[0][1] diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index 7b6b85c5b..a4d1fae78 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -12,6 +12,21 @@ import org.apache.camel.Message @TestFor(DispatchRouterService) @Mock([Dispatch, Fmessage]) class DispatchRouterServiceSpec extends Specification { + def setup() { + Fmessage.metaClass.static.findBySrcAndOrderByDateCreated = { src-> + def m = Mock(Fmessage) + m.receivedOn >> '2' + return m + } + + Dispatch.metaClass.static.get = { id-> + def d = Mock(Dispatch) + d.id >> id + d.dst >> '123456' + println " mocked dispatch $d" + return d + } + } def "should update the dispatch when no route is found"() { setup: def exchange = Mock(Exchange) @@ -48,33 +63,59 @@ class DispatchRouterServiceSpec extends Specification { where: id << [1, 10, 100] } - - def 'slip should assign messages to routes using round robin'() { + + def 'slip should assign message to the last received route if route preference set to last received route'(){ given: + mockAppSettingsService(true,'any') + mockRoutes(1, 2, 3) + when: + def routedTo = service.slip(mockExchange(), null, null) + then: + routedTo == "seda:out-2" + } + + def 'slip should not assign messages to any route and should set message status to failed if routing preference is not to send messages'(){ + + } + + def 'slip should fall back to the -otherwise- if received connection is set as prefered route and it is not avalilable'(){ + + } + + def 'slip should assign messages to round robin if routing preference is set to use avalilable routes'() { + given: + mockAppSettingsService(false,'any') mockRoutes(1, 2, 3) when: def routedTo = (1..5).collect { service.slip(mockExchange(), null, null) } then: routedTo == [1, 2, 3, 1, 2].collect { "seda:out-$it" } } - - def 'slip should prioritise internet services over modems'() { + + def 'slip should prioritise internet services over modems if routing preference is set to use avalilable routes'() { given: + mockAppSettingsService(false,'any') mockRoutes(1:'internet', 2:'modem', 3:'internet', 4:'modem') when: def routedTo = (1..5).collect { service.slip(mockExchange(), null, null) } then: routedTo == [1, 3, 1, 3, 1].collect { "seda:out-$it" } } - + private def mockExchange() { - def x = Mock(Exchange) - def out = Mock(Message) - out.headers >> [:] - x.out >> out - return x + def exchange = Mock(Exchange) + exchange.in >> mockExchangeMessage(['frontlinesms.dispatch.id':'1'], null) + exchange.out >> mockExchangeMessage([:], null) + println "x.in.headers ######### $exchange.in.headers" + return exchange } + private mockExchangeMessage(headers, body){ + def m = Mock(Message) + m.body >> body + m.headers >> headers + return m + } private def mockRoutes(int...ids) { CamelContext c = Mock() c.routes >> ids.collect { [[id:"in-$it"], [id:"out-$it"]] }.flatten() @@ -86,4 +127,11 @@ class DispatchRouterServiceSpec extends Specification { c.routes >> idsAndPrefixes.collect { k, v -> [[id:"in-$k"], [id:"out-$v-$k"]] }.flatten() service.camelContext = c } + + private mockAppSettingsService($userLastReceived, $otherwise){ + AppSettingsService appSettingsService = Mock() + appSettingsService.get("routing.uselastreceiver") >> $userLastReceived + appSettingsService.get("routing.otherwise") >> $otherwise + service.appSettingsService = appSettingsService + } } From 9da6cb38e648caca9553b00c19debb050e083238 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 28 Nov 2012 10:24:57 +0300 Subject: [PATCH 0010/2668] Added relevant test to DispatchRouterService --- .../DispatchRouterService.groovy | 2 +- .../services/DispatchRouterServiceSpec.groovy | 27 +++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 7fe34834a..067483a14 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -21,7 +21,7 @@ class DispatchRouterService { log "ENTRY" log "Routing exchange $exchange with previous endpoint $previous and target fconnection $requestedFconnectionId" log "x.in=$exchange?.in" - log "x.in.headers=$exchange.in.headers" + log "x.in.headers=$exchange?.in?.headers" if(previous) { // We only want to pass this message to a single endpoint, so if there diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index a4d1fae78..2f0b87f26 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -74,12 +74,35 @@ class DispatchRouterServiceSpec extends Specification { routedTo == "seda:out-2" } - def 'slip should not assign messages to any route and should set message status to failed if routing preference is not to send messages'(){ + def 'slip should not assign messages to any route if routing preference is not to send messages even if routes are available'(){ + given: + mockAppSettingsService(false,'dontsend') + mockRoutes(1, 2, 3) + when: + def routedTo = service.slip(mockExchange(), null, null) + then: + thrown java.lang.RuntimeException + routedTo == null + } + def 'slip should not assign messages to any route if routing preference is not to send messages when routes are not avalilable'(){ + given: + mockAppSettingsService(false,'dontsend') + when: + def routedTo = service.slip(mockExchange(), null, null) + then: + thrown java.lang.RuntimeException + routedTo == null } def 'slip should fall back to the -otherwise- if received connection is set as prefered route and it is not avalilable'(){ - + given://'route 2 is the receivedOn route and it is not available' + mockAppSettingsService(true,'any') + mockRoutes(1,3) + when: + def routedTo = service.slip(mockExchange(), null, null) + then: 'message routed to available message' + routedTo == "seda:out-1" } def 'slip should assign messages to round robin if routing preference is set to use avalilable routes'() { From 88282bb44a70b537e543ef80c90aa3df71bb68a0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 28 Nov 2012 11:48:31 +0300 Subject: [PATCH 0011/2668] CORE-1292 tests --- .../WebconnectionViewSpec.groovy | 11 +++++++++++ .../WebconnectionControllerISpec.groovy | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy index b880f36b8..1b9bb032a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy @@ -254,4 +254,15 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { waitFor { messageList.displayed } messageList.messages*.any { it.hasStatus("sent")} } + + def "retry failed uploads option should be present in more actions dropdown, and should redirect to same view"() { + when: + to PageMessageWebconnection, Webconnection.findByName("Sync") + then: + waitFor { header.displayed } + when: + header.moreActions.value("retry failed uploads").jquery.click() + then: + waitFor { notifications.flashMessageText.contains("Failed uploads have been requeued for upload") } + } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy index d2e4e639c..27ebae256 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy @@ -188,4 +188,23 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { "enabled"|"TEST,TESTING" "disabled"|null } + + def 'retry failed action should result in all failed uploads being reattempted'() { + setup: + def keyword = new Keyword(value:'TEST') + def webconnection = new GenericWebconnection(name:"Webconnection with failures", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.POST) + webconnection.addToKeywords(keyword) + // adding 3 successful uploads, two failed ones, and one pending + 5.times { it -> + webconnection.addToMessages(new Fmessage(text: "test", inbound: true, src:"+12345$it", ownerDetail: ((it % 2) ? Webconnection.OWNERDETAIL_FAILED : Webconnection.OWNERDETAIL_SUCCESS ))) + } + webconnection.addToMessages(new Fmessage(text: "test", inbound: true, src:"+123455", ownerDetail: Webconnection.OWNERDETAIL_PENDING)) + webconnection.save(failOnError:true) + when: + controller.params.ownerId = webconnection.id + controller.retryFailed() + then: + ["+12340", "+12342", "+12344"].collect { Fmessage.findBySrc(it).ownerDetail }.unique() == [Webconnection.OWNERDETAIL_SUCCESS] + ["+12341", "+12343", "+12345"].collect { Fmessage.findBySrc(it).ownerDetail }.unique() == [Webconnection.OWNERDETAIL_PENDING] + } } From a2c4b2ebdcb2eeb30c3db3b64ca532fd40c667cb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 28 Nov 2012 11:50:44 +0300 Subject: [PATCH 0012/2668] CORE-1292 test modification --- .../frontlinesms2/webconnection/WebconnectionViewSpec.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy index 1b9bb032a..502ded793 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy @@ -264,5 +264,6 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { header.moreActions.value("retry failed uploads").jquery.click() then: waitFor { notifications.flashMessageText.contains("Failed uploads have been requeued for upload") } + at PageMessageWebconnection } } From 22be188386461a0b0cee1a31f1f1d93e93914ab1 Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 28 Nov 2012 15:26:44 +0300 Subject: [PATCH 0013/2668] added message count test on ContactEditSpec --- .../frontlinesms2/contact/ContactEditSpec.groovy | 15 +++++++++++++++ .../frontlinesms2/page/PageContact.groovy | 2 ++ 2 files changed, 17 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactEditSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactEditSpec.groovy index 5fe40206c..4945b5bef 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactEditSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactEditSpec.groovy @@ -4,6 +4,7 @@ import frontlinesms2.* import geb.Browser import grails.plugin.geb.GebSpec +import frontlinesms2.message.* class ContactEditSpec extends ContactBaseSpec { def setup() { @@ -88,4 +89,18 @@ class ContactEditSpec extends ContactBaseSpec { then: !footer.prevPage.disabled } + + def "should display a count of messages recieved and sent for a contact"(){ + given: 'A contact has received and sent messages' + def sent1 = new Fmessage(inbound:false, text:"outbound 1") + def sent2 = new Fmessage(inbound:false, text:"outbound 2") + sent1.addToDispatches(dst:'2541234567', status:DispatchStatus.SENT, dateSent:new Date()).save(failOnError:true, flush:true) + sent2.addToDispatches(dst:'2541234567', status:DispatchStatus.SENT, dateSent:new Date()).save(failOnError:true, flush:true) + new Fmessage(src:'2541234567', text:"inbound 1", date: new Date(), inbound:true).save(failOnError:true, flush:true) + when: + to PageContactShow, Contact.findByName('Alice') + then: + singleContactDetails.sentCount == "2 messages sent" + singleContactDetails.receivedCount == "1 messages received" + } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy index 2d2a1202f..8531d4ede 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy @@ -128,6 +128,8 @@ class SingleContactDetails extends geb.Module { cancel { $('#action-buttons a.cancel', text:'Cancel') } delete { $('#btn_delete') } searchForMessages { $('#message-stats a.search') } + sentCount { $('li.sent').text()} + receivedCount {$('li.received').text()} } } From 27f566988d323a241f048dff9d5bd6faed08db43 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 28 Nov 2012 16:07:04 +0300 Subject: [PATCH 0014/2668] added more tests for routing outgoing messages --- .../grails-app/conf/CoreBootStrap.groovy | 14 +++++++++++ .../frontlinesms2/SettingsController.groovy | 12 ++++++++- .../grails-app/i18n/messages.properties | 9 +++++++ .../DispatchRouterService.groovy | 6 ++--- .../grails-app/views/settings/general.gsp | 25 +++++++++++++++++++ .../settings/GeneralSettingsSpec.groovy | 15 +++++++++++ .../settings/PageGeneralSettings.groovy | 13 ++++++++++ .../controllers/SettingsControllerSpec.groovy | 12 +++++++++ 8 files changed, 102 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 61b81347e..b2af710ec 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -44,6 +44,10 @@ class CoreBootStrap { dev_disableSecurityFilter() // never show new popup during tests appSettingsService['newfeatures.popup.show.immediately'] = false + //default routing in tests is to use any available connections + appSettingsService.set('routing.uselastreceiver', false) + appSettingsService.set('routing.otherwise', 'any') + appSettingsService.set('routing.preferences.edited', true) } if(Environment.current == Environment.DEVELOPMENT) { @@ -59,6 +63,7 @@ class CoreBootStrap { //camelContext.tracing = true dev_disableSecurityFilter() updateFeaturePropertyFileValues() + setDefaultMessageRoutingPreferences() } if(bootstrapData) { @@ -80,6 +85,7 @@ class CoreBootStrap { if(Environment.current == Environment.PRODUCTION) { createWelcomeNote() updateFeaturePropertyFileValues() + setDefaultMessageRoutingPreferences() } setCustomJSONRenderers() @@ -622,4 +628,12 @@ class CoreBootStrap { return returnArray } } + private setDefaultMessageRoutingPreferences(){ + if(!appSettingsService.get('routing.preferences.edited') || (appSettingsService.get('routing.preferences.edited') == false)){ + println "### Changing Routing preferences ###" + appSettingsService.set('routing.uselastreceiver', false) + appSettingsService.set('routing.otherwise', 'any') + appSettingsService.set('routing.preferences.edited', true) + } + } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index 3b01bf50b..3775bc835 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -29,12 +29,16 @@ class SettingsController extends ControllerUtils { def enabledAuthentication = appSettingsService.get("auth.basic.enabled") def username = new String(appSettingsService.get("auth.basic.username").decodeBase64()) def password = new String(appSettingsService.get("auth.basic.password").decodeBase64()) + def appSettings = [:] + appSettings['routing.uselastreceiver'] = appSettingsService.get("routing.uselastreceiver") + appSettings['routing.otherwise'] = appSettingsService.get("routing.otherwise") [currentLanguage:i18nUtilService.getCurrentLanguage(request), enabledAuthentication:enabledAuthentication, username:username, password:password, - languageList:i18nUtilService.allTranslations] + languageList:i18nUtilService.allTranslations, + appSettings:appSettings] } def selectLocale() { @@ -57,6 +61,12 @@ class SettingsController extends ControllerUtils { render view:'general', model:general() } + def changeRoutingPreferences() { + appSettingsService.set('routing.uselastreceiver',params.uselastreceiver) + appSettingsService.set('routing.otherwise', params.otherwise) + redirect action:'general' + } + private def withFconnection = withDomainObject Fconnection, { params.id }, { render(view:'show_connections', model: [fconnectionInstanceTotal: 0]) } } diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 597e661cb..875139e91 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -987,3 +987,12 @@ dynamicfield.sender_name.label=Sender Name dynamicfield.sender_number.label=Sender Number dynamicfield.recipient_number.label=Recipient Number dynamicfield.recipient_name.label=Recipient Name + + +routing.title=Connection Routing for Outgoing Messages +routing.info=Define which connection will be used for message sending +routing.when.sending=When sending : +routing.otherwise=Otherwise : +routing.use.last.received=Use last connection that this contact messaged +routing.use.any=Use any available connection +routing.dont.send=Do not send the message \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 067483a14..49e606a43 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -38,7 +38,7 @@ class DispatchRouterService { println "dispatch to send # $d ### d.dst # $d?.dst" def latestReceivedMessage = Fmessage.findBySrcAndOrderByDateCreated(d.dst) if(latestReceivedMessage?.receivedOn) { - println "## Sending message with receivedOn Connection ##" + log "## Sending message with receivedOn Connection ##" def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } println "Id of prefered route ## $latestReceivedMessage.receivedOn" println "allOutRoutes ## $allOutRoutes" @@ -50,10 +50,10 @@ class DispatchRouterService { if(!routeId){ // if uselastreceiver did not set the routeId if(appSettingsService.get('routing.otherwise') == 'any') { - println "Sending to any available connection" + log "## Sending to any available connection ##" routeId = getDispatchRouteId() }else{ - println "Not sending message at all" + log "## Not sending message at all ##" } } diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index 3fe660a8c..43bce9043 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -78,6 +78,31 @@ +
+

+

+ +

+ +
+

+ +

+
    +
  • + +
    • +
+
+
+

+ +

+ +
+ + +
diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy index 259b215e6..05ed2a1a6 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy @@ -12,4 +12,19 @@ class GeneralSettingsSpec extends grails.plugin.geb.GebSpec { databaseBackup.title == 'configuration location' databaseBackup.instruction.contains('database') } + + def 'Saving routing preferences persists the changes'(){ + when: + to PageGeneralSettings + then: + routing.useLastReceivedConnection.click() + routing.useAnyAvailableConnection.click() + when: + routing.save.click() + then: + waitFor { at PageGeneralSettings } + routing.useLastReceivedConnection.@checked + routing.useAnyAvailableConnection.@checked + !routing.dontSend.@checked + } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy index 0b5370353..b617b7d27 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy @@ -15,6 +15,7 @@ class PageGeneralSettings extends PageSettings { errors(required:false) { $('label.error')} basicAuthentication {module BasicAuthentication} databaseBackup {module DatabaseBackup} + routing { module RoutingConnections} } static at = { title.contains('Settings') || title.contains('Mazingira') @@ -42,3 +43,15 @@ class BasicAuthentication extends geb.Module { save { $("input#save")} } } + +class RoutingConnections extends geb.Module { + static basr = { $('#routing-preferences') } + + static content = { + routingForm { $('form#routing-form') } + useLastReceivedConnection { $('#uselastreceiver') } + useAnyAvailableConnection { $('input[name=otherwise]', value:'any') } + dontSend { $('input[name=otherwise]', value:'dontsend') } + save { $("input#saveRoutingDetails") } + } +} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy index b83bc49a9..e195372e4 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy @@ -78,6 +78,18 @@ class SettingsControllerSpec extends Specification { 0 * appSettingsService.set(_, _) } + def 'can set the routing preferences'(){ + given: + params.uselastreceiver = "true" + params.otherwise = "any" + when: + controller.changeRoutingPreferences() + then: + 1 * appSettingsService.set('routing.uselastreceiver',params.uselastreceiver) + 1 * appSettingsService.set('routing.otherwise', params.otherwise) + 0 * appSettingsService.set(_, _) + } + private def mockAppSettings(Map s) { s.each { k, v -> appSettingsService.get(k, _) >> { v instanceof String? v.bytes.encodeBase64().toString(): v } From db0d37bc5b2b210e278ccc38e67b9cb016b99d22 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 28 Nov 2012 17:57:30 +0300 Subject: [PATCH 0015/2668] added MessageDetail --- .../domain/frontlinesms2/Fmessage.groovy | 2 +- .../domain/frontlinesms2/MessageDetail.groovy | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 8d1aa51d0..bed216ea8 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -25,7 +25,7 @@ class Fmessage { boolean inbound - static hasMany = [dispatches:Dispatch] + static hasMany = [dispatches:Dispatch, details:MessageDetail] static mapping = { sort date:'desc' diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy new file mode 100644 index 000000000..3eb03bb8d --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy @@ -0,0 +1,14 @@ +package frontlinesms2 + +class MessageDetail { + static belongsTo = [message: Fmessage] + enum OwnerType { ACTIVITY, STEP } + + String ownerType + Long ownerId + String value + + static constraints = { + } + +} From ee55f240e35624d7d8db6feeb69851604fbb5a2d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 11:02:04 +0300 Subject: [PATCH 0016/2668] added helper methods to get/set messageDetailValue for a particular owner --- .../domain/frontlinesms2/Fmessage.groovy | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index bed216ea8..912b39f2b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -323,4 +323,30 @@ class Fmessage { def getReceivedOn() { Fconnection.findByMessages(this).list()[0] } + + def getMessageDetailValue(owner) { + def ownerType = getOwnerType(owner) + if (ownerType) { + return this.details.find { it.ownerType == ownerType && it.ownerId == owner.id }?.value + } + else + return null + } + + def setMessageDetailValue(owner, value) { + def ownerType = getOwnerType(owner) + if (!ownerType) + return + def messageDetailInstance = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id } + if(!messageDetailInstance) { + messageDetailInstance = new OwnerDetail(ownerType: ownerType, ownerId: owner.id) + this.addToDetails(messageDetailInstance) + } + messageDetailInstance.value = value + messageDetailInstance.save(failOnError:true) + } + + private def getOwnerType(owner) { + (owner instanceOf Activity)? ownerType = MessageDetail.OwnerType.ACTIVITY : (owner instanceOf Step) ? MessageDetail.OwnerType.STEP : null + } } From 32fa62c56c5983f253ce39090c90d9bda67ac22b Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 11:33:25 +0300 Subject: [PATCH 0017/2668] added getter & setter of current owner's message details, hopefully should automatically replace all previous references --- .../domain/frontlinesms2/Fmessage.groovy | 18 +++++++++++++++--- .../frontlinesms2/FmessageService.groovy | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 912b39f2b..88083fa26 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -16,7 +16,6 @@ class Fmessage { String text String inboundContactName String outboundContactName - String ownerDetail boolean read boolean starred @@ -50,7 +49,7 @@ class Fmessage { val ^ (obj.dispatches? true: false) }) dispatches nullable:true - ownerDetail nullable:true + details nullable:true } def beforeInsert = { @@ -339,14 +338,27 @@ class Fmessage { return def messageDetailInstance = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id } if(!messageDetailInstance) { - messageDetailInstance = new OwnerDetail(ownerType: ownerType, ownerId: owner.id) + messageDetailInstance = new MessageDetail(ownerType: ownerType, ownerId: owner.id) this.addToDetails(messageDetailInstance) } messageDetailInstance.value = value messageDetailInstance.save(failOnError:true) } + //> GETTER AND SETTER OF MESSAGE DETAIL THAT USE CURRENT MESSAGE OWNER + def getOwnerDetail() { + getMessageDetailValue(this.messageOwner) + } + + def setOwnerDetail(val) { + setMessageDetailValue(this.messageOwner, val) + } + private def getOwnerType(owner) { (owner instanceOf Activity)? ownerType = MessageDetail.OwnerType.ACTIVITY : (owner instanceOf Step) ? MessageDetail.OwnerType.STEP : null } + + def clearAllDetails() { + this.details.clear() + } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy index 8710b5d38..b69da2966 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy @@ -7,7 +7,7 @@ class FmessageService { def messagesToSend = [] messageList.each { messageInstance -> if(messageInstance.isMoveAllowed()){ - messageInstance.ownerDetail = null + messageInstance.clearAllDetails() messageInstance.isDeleted = false Trash.findByObject(messageInstance)?.delete(failOnError:true) if (params.messageSection == 'activity') { From 5840f7e336726562835add9203e53b0b446fd0fe Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 12:02:33 +0300 Subject: [PATCH 0018/2668] fixed getOwnerType typo --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 88083fa26..9a1646cad 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -355,7 +355,7 @@ class Fmessage { } private def getOwnerType(owner) { - (owner instanceOf Activity)? ownerType = MessageDetail.OwnerType.ACTIVITY : (owner instanceOf Step) ? MessageDetail.OwnerType.STEP : null + owner instanceof Activity ? ownerType = MessageDetail.OwnerType.ACTIVITY : null // TODO: Once step is implemented: ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) } def clearAllDetails() { From 5bebd248c2922b247807885da7af37810d2c0342 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 12:03:11 +0300 Subject: [PATCH 0019/2668] fixed getOwnerType typo --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 9a1646cad..5a680525f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -355,7 +355,7 @@ class Fmessage { } private def getOwnerType(owner) { - owner instanceof Activity ? ownerType = MessageDetail.OwnerType.ACTIVITY : null // TODO: Once step is implemented: ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) + owner instanceof Activity ? MessageDetail.OwnerType.ACTIVITY : null // TODO: Once step is implemented: ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) } def clearAllDetails() { From 4a8306088b6e33d11aaf494951b55fd9e1eab92e Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 12:54:38 +0300 Subject: [PATCH 0020/2668] fixed issue where null messageDetails results in exception when clearing --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 5a680525f..d81fcb024 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -359,6 +359,6 @@ class Fmessage { } def clearAllDetails() { - this.details.clear() + this.details?.clear() } } From c2814fca5c216c82e3af981ef2fe0725ad86e87b Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 29 Nov 2012 14:30:49 +0300 Subject: [PATCH 0021/2668] Testing a web connection is working --- .../WebconnectionController.groovy | 15 +++++++- .../domain/frontlinesms2/Fmessage.groovy | 1 + .../domain/frontlinesms2/Webconnection.groovy | 6 +++- .../grails-app/i18n/messages.properties | 6 +++- .../frontlinesms2/TestWebconnectionJob.groovy | 10 ++++++ .../frontlinesms2/WebconnectionService.groovy | 17 +++++---- .../views/webconnection/_validate.gsp | 35 ++++++++++++++++--- .../domain/WebconnectionISpec.groovy | 29 +++++++++------ .../service/WebconnectionServiceISpec.groovy | 19 ++++++++++ .../WebconnectionServiceSpec.groovy | 5 +-- .../web-app/js/activity/popups.js | 4 +-- .../web-app/js/mediumPopup.js | 4 ++- 12 files changed, 122 insertions(+), 29 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index 5ff9e6d91..152b5ddf5 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -28,7 +28,20 @@ class WebconnectionController extends ActivityController { println "<<<>>> $params" def webconnectionInstance = getWebconnectionInstance() doSave('webconnection', webconnectionService, webconnectionInstance, false) - webconnectionService.testRoute(webconnectionInstance) + TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) + return + } + + def checkRouteStatus() { + println "<<>> $params" + def webconnectionInstance = Webconnection.get(params.ownerId) + def response = [ownerId:params.ownerId, ok:true] + if(webconnectionInstance) { + def message = Fmessage.findByMessageOwnerAndText(webconnectionInstance, Fmessage.TEST_MESSAGE_TEXT) + response.status = message?.ownerDetail + } + + render response as JSON } private def getWebconnectionInstance() { diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index b93f53694..2198f367f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -5,6 +5,7 @@ import org.hibernate.criterion.CriteriaSpecification class Fmessage { static final int MAX_TEXT_LENGTH = 1600 + static final String TEST_MESSAGE_TEXT = "Test Message" static belongsTo = [messageOwner:MessageOwner] static transients = ['hasSent', 'hasPending', 'hasFailed', 'displayName' ,'outboundContactList', 'receivedOn'] diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index 63269d6d9..4442c8384 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -74,10 +74,11 @@ abstract class Webconnection extends Activity { .redeliveryDelay(0) .handled(true) .beanRef('webconnectionService', 'handleException') + .beanRef('webconnectionService', 'createStatusNotification') .end() .to(Webconnection.this.url) .beanRef('webconnectionService', 'postProcess') - .beanRef('webconnectionService', 'deactivate') + .beanRef('webconnectionService', 'createStatusNotification') .routeId("activity-webconnection-${Webconnection.this.id}")] } }.routeDefinitions @@ -118,6 +119,7 @@ abstract class Webconnection extends Activity { def createRoute(routes) { try { + deactivate() camelContext.addRouteDefinitions(routes) println "################# Activating Webconnection :: ${this}" LogEntry.log("Created Webconnection routes: ${routes*.id}") @@ -132,7 +134,9 @@ abstract class Webconnection extends Activity { def deactivate() { println "################ Deactivating Webconnection :: ${this}" camelContext.stopRoute("activity-webconnection-${this.id}") + println "############### Just stopped the route ################" camelContext.removeRoute("activity-webconnection-${this.id}") + println "############### camel route removed ################" } abstract def initialize(params) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 1a303985c..29bfb92ce 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -874,8 +874,12 @@ webconnection.param.name=Name: webconnection.param.value=Value: webconnection.add.anotherparam=Add parameter webconnection.test.prompt=Send Test Message +webconnection.success.label=Test message sent successfully to {0} +webconnection.popup.success.label=Test message sent successfully +webconnection.failed.label=Test message failed sending to {0} +webconnection.popup.failed.label=Test message failed sending +webconnection.testroute.label=Save and Test webconnection.testing.label=Testing... -webconnection.testroute.label=Test and Save dynamicfield.message_body.label=Message Text dynamicfield.message_body_with_keyword.label=Message Text With keyword diff --git a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy new file mode 100644 index 000000000..83a52fcf8 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy @@ -0,0 +1,10 @@ +package frontlinesms2 + +class TestWebconnectionJob { + def webconnectionService + + def execute(context) { + def webconnection = Webconnection.get(context.mergedJobDataMap.get('webconnectionId').toLong()) + webconnectionService.testRoute(webconnection) + } +} diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index ce6b8b93b..52e7d7e84 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -4,8 +4,8 @@ import frontlinesms2.* import org.apache.camel.* class WebconnectionService { - static String TEST_MESSAGE_TEXT = "Test Message" def camelContext + def i18nUtilService def preProcess(Exchange x) { println "x: ${x}" @@ -35,10 +35,14 @@ class WebconnectionService { log.info "Web Connection request failed with exception: ${x.in.body}" } - def deactivate(Exchange x) { + def createStatusNotification(Exchange x) { def webConn = Webconnection.get(x.in.headers.'webconnection-id') - println "### DEACTIVATING AFTER TEST ${webConn.name} ###" - webConn.deactivate() + def message = Fmessage.get(x.in.headers.'fmessage-id') + def text = i18nUtilService.getMessage(code:"webconnection.${message.ownerDetail}.label", args:[webConn.name]) + println "######## StatusNotification::: $text #########" + def notification = SystemNotification.findByText(text) ?: new SystemNotification(text:text) + notification.read = false + notification.save(failOnError:true, flush:true) } def send(Fmessage message) { @@ -70,7 +74,8 @@ class WebconnectionService { } def testRoute(Webconnection webconnectionInstance) { - def message = Fmessage.findByMessageOwnerAndText(webconnectionInstance, TEST_MESSAGE_TEXT) + def message = Fmessage.findByMessageOwnerAndText(webconnectionInstance, Fmessage.TEST_MESSAGE_TEXT) + println "testRoute::: $message" if(!message) { message = createTestMessage() webconnectionInstance.addToMessages(message) @@ -99,7 +104,7 @@ class WebconnectionService { } private Fmessage createTestMessage() { - Fmessage fm = new Fmessage(src:"0000", text:TEST_MESSAGE_TEXT, inbound:true) + Fmessage fm = new Fmessage(src:"0000", text:Fmessage.TEST_MESSAGE_TEXT, inbound:true) fm.save(failOnError:true, flush:true) } } diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index ccea7d765..24bf74ddc 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -105,6 +105,10 @@ function updateConfirmationMessage() { var keywordConfirmationText; + + if(mediumPopup.getCurrentTabIndex() === mediumPopup.getTabLength()) { + showTestRouteBtn(); + } if(!(isGroupChecked("blankKeyword"))) { keywordConfirmationText = $('#keywords').val().toUpperCase(); } else { @@ -126,7 +130,6 @@ function showTestRouteBtn() { var buttonSet, testRouteBtn; buttonSet = $('.ui-dialog-buttonset'); - buttonSet.find("#submit").hide(); testRouteBtn = buttonSet.find("#testRoute"); if(testRouteBtn.length === 0) { testRouteBtn = $('', { @@ -160,15 +163,39 @@ return false; } + var pollInterval + function checkRouteStatus(response) { $("#testRoute").attr('disabled'); - if (response.ok) { + if(response.ok) { $("#testRoute").attr("value", i18n('webconnection.testing.label')); - alert("Poll for success status"); + $.ajaxSetup({ + type: 'post', + data: {ownerId:response.ownerId}, + url: "${g.createLink(controller:'webconnection', action:'checkRouteStatus')}" + }); + + pollInterval = setInterval( function() { + $.ajax({ + success: function(response) { + if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}" || response.status === "${Webconnection.OWNERDETAIL_FAILED}") { + $(".error-panel").text(i18n('webconnection.popup.'+ response.status + '.label')); + $(".error-panel").show(); + if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}") { + loadSummaryTab(response, i18n('webconnection.label')); + } else { + $("#testRoute").attr("value", i18n('webconnection.testroute.label')); + } + clearInterval(pollInterval); + } + } + }); + }, 3000); + } else { displayErrors(response) } } - + diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy index 8d11ec649..e970997ce 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy @@ -6,7 +6,6 @@ import org.apache.camel.* class WebconnectionISpec extends grails.plugin.spock.IntegrationSpec { def webCService = Mock(WebconnectionService) - def camelContext = Mock(CamelContext) def 'incoming message matching keyword should trigger http message sending'() { given: @@ -35,18 +34,26 @@ class WebconnectionISpec extends grails.plugin.spock.IntegrationSpec { 1 * webCService.send(incomingMessage) } - def 'testRoute should shut down route after execution'() { + + def 'testRoute should set message ownerDetail to failed when it fails'() { given: - def params = [url: "www.frontlinesms.com/sync", httpMethod:Webconnection.HttpMethod.GET] - params.'param-name' = ['username', 'password'] as String[] - params.'param-value' = ['bob','secret'] as String[] + def camelContext = Mock(CamelContext) + def webconnection = new GenericWebconnection(name:"Sync", url:"www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) + webconnection.camelContext = camelContext + webconnection.save(failOnError:true) when: - Webconnection.testRoute(params) + webconnection.testRoute() then: - 1 * camelContext.addRouteDefinitions(_) - camelContext.routes.findAll { it.id == "test-webconnection-null"} //This might be modified based on implementation - 1 * camelContext.stopRoute(_) - webCService.testRoute() == false - !Fmessage.count() + Fmessage.findByMessageOwnerAndText(webconnection, WebconnectionService.TEST_MESSAGE_TEXT).ownerDetail == "failed" } + + // @IgnoreRest + // def "test route should work"() { + // when: + // def conn = Webconnection.list()[0] ?: new GenericWebconnection(name:"Sync", url:"http://localhost:8080/webservice-debugger",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) + // conn.testRoute() + // then: + // sleep 10000 + // Fmessage.findByMessageOwnerAndText(conn, WebconnectionService.TEST_MESSAGE_TEXT).ownerDetail == "failed" + // } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy index 671e94351..5e25ec265 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy @@ -97,6 +97,25 @@ class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ Fmessage.findByText("simple").ownerDetail == "failed" } + def 'webconnectionservice.getWebconnectionStatus should return NOT_CONNECTED when the webconnection is not active'() { + given: + def webconnection = new GenericWebconnection(name:"Sync", url:"www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) + expect: + service.getStatusOf(webconnection) == ConnectionStatus.NOT_CONNECTED + } + + def 'webconnectionservice.getWebconnectionStatus should return CONNECTED when the webconnection is active'() { + setup: + def camelContext = Mock(CamelContext) + def webconnection = new GenericWebconnection(name:"Sync", url:"www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) + webconnection.camelContext = camelContext + webconnection.save(failOnError:true) + when: + webconnection.activate() + then: + webconnectionservice.getStatusOf(webconnection) == ConnectionStatus.CONNECTED + } + Exchange mockExchange(messageText,method,messageOnly){ def webconnection = Webconnection.findByName("Sync") if(method == 'get'){ diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy index 13eb62a96..32013bfea 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy @@ -2,10 +2,10 @@ package frontlinesms2 import spock.lang.* -import org.apache.camel.Exchange -import org.apache.camel.Message +import org.apache.camel.* @TestFor(WebconnectionService) +@Mock([GenericWebconnection, Fmessage]) class WebconnectionServiceSpec extends Specification { def requestedId def mockConnection @@ -31,6 +31,7 @@ class WebconnectionServiceSpec extends Specification { 1 * mockConnection.preProcess(x) } + def 'postprocess call is handed back to the relevant domain object'() { given: def x = mockExchange(null, ['webconnection-id':'123','fmessage-id':'1']) diff --git a/plugins/frontlinesms-core/web-app/js/activity/popups.js b/plugins/frontlinesms-core/web-app/js/activity/popups.js index cc4f6cce7..e58addd1e 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/popups.js +++ b/plugins/frontlinesms-core/web-app/js/activity/popups.js @@ -16,7 +16,7 @@ function chooseActivity() { function checkForSuccessfulSave(response, type) { $("#submit").removeAttr('disabled'); if (response.ok) { - loadSummaryTab(type); + loadSummaryTab(response, type); } else { displayErrors(response); } @@ -28,7 +28,7 @@ function summaryRedirect() { window.location.replace(url_root + "message/activity/" + activityId); } -function loadSummaryTab(type) { +function loadSummaryTab(response, type) { var messageDialog; $("div.confirm").parent().hide(); $(".ui-tabs-nav").hide(); diff --git a/plugins/frontlinesms-core/web-app/js/mediumPopup.js b/plugins/frontlinesms-core/web-app/js/mediumPopup.js index 08e03961c..a46ea0cb9 100644 --- a/plugins/frontlinesms-core/web-app/js/mediumPopup.js +++ b/plugins/frontlinesms-core/web-app/js/mediumPopup.js @@ -296,7 +296,9 @@ var mediumPopup = (function() { selectSubscriptionGroup:selectSubscriptionGroup, // TODO move this somewhere more suitable submit:submit, tabValidates:tabValidates, - getCurrentTab:getCurrentTab + getCurrentTab:getCurrentTab, + getCurrentTabIndex:getCurrentTabIndex, + getTabLength:getTabLength }; }()); From d262dd13cb0df2ffb3e9bbd66191fd07b0235867 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 14:36:09 +0300 Subject: [PATCH 0022/2668] fixed MessageDetail ownertype string reference --- .../grails-app/domain/frontlinesms2/Autoforward.groovy | 6 +----- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 3 ++- .../grails-app/domain/frontlinesms2/MessageDetail.groovy | 2 +- .../grails-app/domain/frontlinesms2/Subscription.groovy | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index a801f752c..f9898eae5 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -34,15 +34,11 @@ class Autoforward extends Activity { //> PROCESS METHODS def processKeyword(Fmessage message, Keyword matchedKeyword) { - println "#####Mocked OwnerDetail ## $message.ownerDetail" - println "#####Mocked id ## $message.id" def m = messageSendService.createOutgoingMessage([contacts:contacts, groups:groups?:[] + smartGroups?:[], messageText:sentMessageText]) - println "#####Mocked OutgoingMessage ## $m.id" - m.ownerDetail = message.id this.addToMessages(m) + m.ownerDetail = message.id this.addToMessages(message) m.save(failOnError:true) - println "############# OwnerDetail of OutgoingMessage ## $m ####### $m.ownerDetail" messageSendService.send(m) this.save(failOnError:true) } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index d81fcb024..2ed281eb9 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -355,7 +355,8 @@ class Fmessage { } private def getOwnerType(owner) { - owner instanceof Activity ? MessageDetail.OwnerType.ACTIVITY : null // TODO: Once step is implemented: ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) + def ownerType = owner instanceof Activity ? MessageDetail.OwnerType.ACTIVITY : null // TODO: Once step is implemented: ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) + ownerType } def clearAllDetails() { diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy index 3eb03bb8d..03352508a 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageDetail.groovy @@ -4,7 +4,7 @@ class MessageDetail { static belongsTo = [message: Fmessage] enum OwnerType { ACTIVITY, STEP } - String ownerType + OwnerType ownerType Long ownerId String value diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy index 475bf334b..c8483e894 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy @@ -103,7 +103,6 @@ class Subscription extends Activity{ def processKeyword(Fmessage message, Keyword k) { def action = getAction(k) - message.ownerDetail = action.toString() if(action == Action.JOIN){ processJoin(message) }else if(action == Action.LEAVE) { From 6aac64ae8507b05901e35e7eb11004fc09333670 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 29 Nov 2012 14:47:01 +0300 Subject: [PATCH 0023/2668] Updated js i18n to simplify. --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 5 +++-- plugins/frontlinesms-core/scripts/_Events.groovy | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 7a7df3b01..066f951cf 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -127,8 +127,9 @@ class FsmsTagLib { // TODO this could likely be streamlined by using i18nUtilService.getCurrentLanguage(request) ['', "_${locale.language}", "_${locale.language}_${locale.country}", - "_${locale.language}_${locale.country}_${locale.variant}"].each { - out << "" } + "_${locale.language}_${locale.country}_${locale.variant}"].each { localeSuffix -> + def link = g.resource plugin:bundle, dir:'i18n', file:"messages${localeSuffix}.js" + out << "" } } } diff --git a/plugins/frontlinesms-core/scripts/_Events.groovy b/plugins/frontlinesms-core/scripts/_Events.groovy index ca2a71686..5c54692e9 100644 --- a/plugins/frontlinesms-core/scripts/_Events.groovy +++ b/plugins/frontlinesms-core/scripts/_Events.groovy @@ -131,7 +131,7 @@ println "appName: $appName" props.each { k, v -> m[k] = v } builder(m) - jsFilename = appName + '_' + f.name - '.properties' + '.js' + jsFilename = f.name - '.properties' + '.js' new File("web-app/i18n/$jsFilename").setText( "var i18nStrings = i18nStrings || {}; i18nStrings[\"$appName\"] = $builder;", 'UTF-8') From 9fd9cfbecf5e9cdf7624f0c6b9157874c4c97148 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 15:18:53 +0300 Subject: [PATCH 0024/2668] ExpressionProcessorServiceISpec fixes --- .../service/ExpressionProcessorServiceISpec.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy index d67734b20..e9d26133c 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy @@ -35,9 +35,10 @@ class ExpressionProcessorServiceISpec extends grails.plugin.spock.IntegrationSpe .save(failOnError:true, flush:true) def inbound = new Fmessage(src: '112233', inbound: true, archived: false, hasSent: false, date: new Date(), text:'Incoming Message Text').save(failOnError:true) autoforward.addToMessages(inbound) - def outbound = new Fmessage(src: '0', inbound: false, archived: false, hasSent: false, date: new Date(), ownerDetail: inbound.id, text: outboundMessageText) + def outbound = new Fmessage(src: '0', inbound: false, archived: false, hasSent: false, date: new Date(), text: outboundMessageText) Dispatch dis = new Dispatch(dst: '445566', status: DispatchStatus.PENDING) outbound.addToDispatches(dis) + outbound.addToDetails(new MessageDetail(value: inbound.id, ownerType: MessageDetail.OwnerType.ACTIVITY, ownerId: autoforward.id)) outbound.text = outboundMessageText autoforward.addToMessages(outbound).save(failOnError:true) def processedMessageText = expressionProcessorService.process(dis) From dc9cc227257ba2643d24ea8a0bfefde9b7953452 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 29 Nov 2012 15:23:32 +0300 Subject: [PATCH 0025/2668] Added linebreak to i18n link generation to make it more readable. --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 066f951cf..be870aadb 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -129,7 +129,7 @@ class FsmsTagLib { "_${locale.language}_${locale.country}", "_${locale.language}_${locale.country}_${locale.variant}"].each { localeSuffix -> def link = g.resource plugin:bundle, dir:'i18n', file:"messages${localeSuffix}.js" - out << "" } + out << "\n" } } } From b6e8daabf4be3d9a3ba3b4fb2e4ad95140af4585 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 16:06:06 +0300 Subject: [PATCH 0026/2668] renamed properties to stepProperties --- .../domain/frontlinesms2/Fmessage.groovy | 2 +- .../grails-app/domain/frontlinesms2/Step.groovy | 14 ++++++++++++++ .../domain/frontlinesms2/StepProperty.groovy | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/StepProperty.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 2ed281eb9..b99ed14ef 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -355,7 +355,7 @@ class Fmessage { } private def getOwnerType(owner) { - def ownerType = owner instanceof Activity ? MessageDetail.OwnerType.ACTIVITY : null // TODO: Once step is implemented: ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) + def ownerType = owner instanceof Activity ? MessageDetail.OwnerType.ACTIVITY : ((owner instanceof Step) ? MessageDetail.OwnerType.STEP : null) ownerType } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy new file mode 100644 index 000000000..a664b3f63 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -0,0 +1,14 @@ +package frontlinesms2 + +abstract class Step { + String type + static hasMany = [stepProperties: StepProperty] + + static constraints = { + stepProperties nullable: true + } + + def process(Fmessage message) { + + } +} diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/StepProperty.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/StepProperty.groovy new file mode 100644 index 000000000..e4b2324f7 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/StepProperty.groovy @@ -0,0 +1,10 @@ +package frontlinesms2 + +class StepProperty { + static belongsTo = [step: Step] + static constraints = { + + } + String key + String value +} From 0a169d19cf053d73f38025ca2699921cb4ca35e0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 17:19:02 +0300 Subject: [PATCH 0027/2668] Created Join, Leave and Reply ActionSteps --- .../domain/frontlinesms2/JoinActionStep.groovy | 16 ++++++++++++++++ .../domain/frontlinesms2/LeaveActionStep.groovy | 17 +++++++++++++++++ .../domain/frontlinesms2/ReplyActionStep.groovy | 17 +++++++++++++++++ .../grails-app/domain/frontlinesms2/Step.groovy | 8 ++++++-- 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy new file mode 100644 index 000000000..94beb60e1 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy @@ -0,0 +1,16 @@ +package frontlinesms2 + +class JoinActionStep extends Step { + String type + static hasMany = [stepProperties: StepProperty] + static service = 'subscription' + static action = 'doJoin' + static configFields = [group: Group] + + static constraints = { + } + + def process(Fmessage message) { + + } +} diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy new file mode 100644 index 000000000..4786e44af --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy @@ -0,0 +1,17 @@ +package frontlinesms2 + +class LeaveActionStep extends Step { + String type + static hasMany = [stepProperties: StepProperty] + static service = 'subscription' + static action = 'doLeave' + static configFields = [group: Group] + + static constraints = { + stepProperties nullable: true + } + + def process(Fmessage message) { + + } +} diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy new file mode 100644 index 000000000..f648e5941 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy @@ -0,0 +1,17 @@ +package frontlinesms2 + +class ReplyActionStep extends Step { + String type + static hasMany = [stepProperties: StepProperty] + static service = 'autoreply' + static action = 'doReply' + static configFields = [message: 'textarea'] + + static constraints = { + stepProperties nullable: true + } + + def process(Fmessage message) { + + } +} diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index a664b3f63..564ee43a7 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -2,10 +2,14 @@ package frontlinesms2 abstract class Step { String type - static hasMany = [stepProperties: StepProperty] + static hasMany = [stepProperties: StepProperty] + static configFields = [:] static constraints = { - stepProperties nullable: true + // the following assumes all configFields are mandatory + stepProperties(nullable: true, validator: { val, obj -> + val*.key?.containsAll(obj.configFields?.collect { name, type -> name }) + }) } def process(Fmessage message) { From 7417680fc8411c950c34d892fe623265d59a6f30 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 29 Nov 2012 17:33:36 +0300 Subject: [PATCH 0028/2668] created joinactionstepspec (but currently failing) --- .../frontlinesms2/JoinActionStepSpec.groovy | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy new file mode 100644 index 000000000..c9483267f --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy @@ -0,0 +1,25 @@ +package frontlinesms2 + +import spock.lang.* +import grails.test.mixin.* +import grails.buildtestdata.mixin.Build + +@TestFor(JoinActionStep) +@Mock(Fmessage) +@Build(StepProperty) +class JoinActionStepSpec extends Specification { + + def "Test dynamic constraints"() { + when: + def step = new JoinActionStep() + if(addStepProperty) + step.addToStepProperties(StepProperty.build(key:stepPropertyKey)) + then: + step.validate() == expectedOutcome + where: + addStepProperty | stepPropertyKey | expectedOutcome + false | null | false + true | "woteva" | false + true | "group" | true + } +} From b729005f71655986c9a24af2d50cd3a366aea62a Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 30 Nov 2012 09:49:52 +0300 Subject: [PATCH 0029/2668] Fixed failing tests for testing a web connection --- .../domain/frontlinesms2/Webconnection.groovy | 8 ----- .../grails-app/i18n/messages.properties | 1 + .../views/webconnection/_validate.gsp | 32 +++++++++---------- .../views/webconnection/generic/_confirm.gsp | 5 --- .../views/webconnection/ushahidi/_confirm.gsp | 5 --- .../popup/PageMediumPopup.groovy | 2 +- .../domain/WebconnectionISpec.groovy | 23 ------------- .../service/WebconnectionServiceISpec.groovy | 23 ++++++++++--- .../web-app/js/activity/popups.js | 2 +- .../web-app/js/message/moreActions.js | 2 +- 10 files changed, 38 insertions(+), 65 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index 4442c8384..e4b14d32a 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -107,12 +107,6 @@ abstract class Webconnection extends Activity { } def activate() { - try { - deactivate() - } catch(Exception ex) { - log.info("Exception thrown while deactivating webconnection '$name'", ex) - } - println "*** ACTIVATING ACTIVITY ***" createRoute(this.routeDefinitions) } @@ -134,9 +128,7 @@ abstract class Webconnection extends Activity { def deactivate() { println "################ Deactivating Webconnection :: ${this}" camelContext.stopRoute("activity-webconnection-${this.id}") - println "############### Just stopped the route ################" camelContext.removeRoute("activity-webconnection-${this.id}") - println "############### camel route removed ################" } abstract def initialize(params) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 29bfb92ce..49f27ad75 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -453,6 +453,7 @@ wizard.messages.replyall.title=Reply All wizard.send.message.title=Send Message wizard.ok=Ok wizard.create=Create +wizard.save=Save wizard.send=Send common.settings=Settings common.help=Help diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 24bf74ddc..f443323b5 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -118,15 +118,6 @@ setPara("#autoreply-confirm", $('#messageText').val()); } - - function toggleTestButton(ctx) { - if(ctx.checked) { - showTestRouteBtn(); - } else { - hideTestRouteBtn(); - } - } - function showTestRouteBtn() { var buttonSet, testRouteBtn; buttonSet = $('.ui-dialog-buttonset'); @@ -144,11 +135,6 @@ buttonSet.append(testRouteBtn); } - function hideTestRouteBtn() { - $("#submit").css("display", "inline"); - $("#testRoute").hide(); - } - function testRouteStatus() { if(mediumPopup.tabValidates(mediumPopup.getCurrentTab())) { $.ajax({ @@ -165,8 +151,21 @@ var pollInterval + function toggleWizardButtons() { + if($("#submit").is(":disabled")) { + $("#testRoute").attr('disabled', false); + $("#submit").attr('disabled', false); + $("#cancel").attr('disabled', false); + $("#prevPage").attr('disabled', false); + } else { + $("#testRoute").attr('disabled', "disabled"); + $("#submit").attr('disabled', "disabled"); + $("#cancel").attr('disabled', "disabled"); + $("#prevPage").attr('disabled', "disabled"); + } + } + function checkRouteStatus(response) { - $("#testRoute").attr('disabled'); if(response.ok) { $("#testRoute").attr("value", i18n('webconnection.testing.label')); $.ajaxSetup({ @@ -174,13 +173,14 @@ data: {ownerId:response.ownerId}, url: "${g.createLink(controller:'webconnection', action:'checkRouteStatus')}" }); - + toggleWizardButtons(); pollInterval = setInterval( function() { $.ajax({ success: function(response) { if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}" || response.status === "${Webconnection.OWNERDETAIL_FAILED}") { $(".error-panel").text(i18n('webconnection.popup.'+ response.status + '.label')); $(".error-panel").show(); + toggleWizardButtons(); if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}") { loadSummaryTab(response, i18n('webconnection.label')); } else { diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp index f3c85ec90..3666df31b 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_confirm.gsp @@ -7,9 +7,4 @@

-
- -
diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp index 402aa2d1a..ee551a344 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp @@ -6,9 +6,4 @@

-
-
-
\ No newline at end of file diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy index 3b4394b41..805cebdd2 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy @@ -289,6 +289,7 @@ class WebconnectionWizard extends MediumPopup { option { shortName -> $('input', name:'webconnectionType', value:shortName) } getTitle { shortName -> option(shortName).previous('label').text() } getDescription { shortName -> option(shortName).previous('p').text() } + testConnectionButton(required:false) { $("#testRoute")} } } @@ -328,7 +329,6 @@ class WebconnectionConfirmTab extends geb.Module { keyword { $("#confirm-keyword").text() } type { $("#confirm-type").text() } url { $("#confirm-url").text() } - testConnectionButton { $("#testRoute")} confirm{ label-> $("#confirm-"+label).text() } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy index e970997ce..0073ea834 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy @@ -33,27 +33,4 @@ class WebconnectionISpec extends grails.plugin.spock.IntegrationSpec { then: 1 * webCService.send(incomingMessage) } - - - def 'testRoute should set message ownerDetail to failed when it fails'() { - given: - def camelContext = Mock(CamelContext) - def webconnection = new GenericWebconnection(name:"Sync", url:"www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) - webconnection.camelContext = camelContext - webconnection.save(failOnError:true) - when: - webconnection.testRoute() - then: - Fmessage.findByMessageOwnerAndText(webconnection, WebconnectionService.TEST_MESSAGE_TEXT).ownerDetail == "failed" - } - - // @IgnoreRest - // def "test route should work"() { - // when: - // def conn = Webconnection.list()[0] ?: new GenericWebconnection(name:"Sync", url:"http://localhost:8080/webservice-debugger",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) - // conn.testRoute() - // then: - // sleep 10000 - // Fmessage.findByMessageOwnerAndText(conn, WebconnectionService.TEST_MESSAGE_TEXT).ownerDetail == "failed" - // } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy index 5e25ec265..2c45e892b 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy @@ -2,7 +2,7 @@ package frontlinesms2.service import frontlinesms2.* import spock.lang.* -import org.apache.camel.Exchange +import org.apache.camel.* import org.apache.camel.Message import org.apache.camel.spi.UnitOfWork import org.apache.camel.spi.RouteContext @@ -99,21 +99,34 @@ class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ def 'webconnectionservice.getWebconnectionStatus should return NOT_CONNECTED when the webconnection is not active'() { given: - def webconnection = new GenericWebconnection(name:"Sync", url:"www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) + def webconnection = Webconnection.findByName("Sync") expect: - service.getStatusOf(webconnection) == ConnectionStatus.NOT_CONNECTED + webconnectionService.getStatusOf(webconnection) == ConnectionStatus.NOT_CONNECTED } def 'webconnectionservice.getWebconnectionStatus should return CONNECTED when the webconnection is active'() { setup: def camelContext = Mock(CamelContext) - def webconnection = new GenericWebconnection(name:"Sync", url:"www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).save(failOnError:true) + def webconnection = Webconnection.findByName("Sync") webconnection.camelContext = camelContext + webconnectionService.metaClass.getStatusOf = {Webconnection w -> ConnectionStatus.CONNECTED} webconnection.save(failOnError:true) when: webconnection.activate() then: - webconnectionservice.getStatusOf(webconnection) == ConnectionStatus.CONNECTED + webconnectionService.getStatusOf(webconnection) == ConnectionStatus.CONNECTED + } + + def 'testRoute should set message ownerDetail to failed when it fails'() { + setup: + def camelContext = Mock(CamelContext) + def webconnection = Webconnection.findByName("Sync") + webconnection.camelContext = camelContext + webconnection.save(failOnError:true) + when: + webconnectionService.testRoute(webconnection) + then: + Fmessage.findByMessageOwnerAndText(webconnection, Fmessage.TEST_MESSAGE_TEXT).ownerDetail } Exchange mockExchange(messageText,method,messageOnly){ diff --git a/plugins/frontlinesms-core/web-app/js/activity/popups.js b/plugins/frontlinesms-core/web-app/js/activity/popups.js index e58addd1e..289ff5696 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/popups.js +++ b/plugins/frontlinesms-core/web-app/js/activity/popups.js @@ -9,7 +9,7 @@ function chooseActivity() { dataType: "html", url: url_root + activityUrl, beforeSend: function(){ showThinking(); }, - success: function(data, textStatus) { hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.create'), 675, 500, false); } + success: function(data, textStatus) { hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.save'), 675, 500, false); } }); } diff --git a/plugins/frontlinesms-core/web-app/js/message/moreActions.js b/plugins/frontlinesms-core/web-app/js/message/moreActions.js index 6fba97172..67d5a31ac 100644 --- a/plugins/frontlinesms-core/web-app/js/message/moreActions.js +++ b/plugins/frontlinesms-core/web-app/js/message/moreActions.js @@ -37,7 +37,7 @@ function editAction() { data: {id: $("#ownerId").val()}, beforeSend: function(){ showThinking(); }, success: function(data) { - hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.ok'), 675, 500, false); } + hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.save'), 675, 500, false); } }); } From 80cdedde920c7a03f4cca07fda604465e82e8d9a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 30 Nov 2012 11:49:37 +0300 Subject: [PATCH 0030/2668] fixed validation test for JoinActionStep --- .../domain/frontlinesms2/Step.groovy | 1 + .../domain/JoinActionStepISpec.groovy | 21 ++++++++++++++++ .../frontlinesms2/JoinActionStepSpec.groovy | 25 ------------------- 3 files changed, 22 insertions(+), 25 deletions(-) create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy delete mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index 564ee43a7..d2f8a363d 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -8,6 +8,7 @@ abstract class Step { static constraints = { // the following assumes all configFields are mandatory stepProperties(nullable: true, validator: { val, obj -> + if (!val) return false val*.key?.containsAll(obj.configFields?.collect { name, type -> name }) }) } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy new file mode 100644 index 000000000..761fec90b --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy @@ -0,0 +1,21 @@ +package frontlinesms2.domain + +import frontlinesms2.* +import spock.lang.* + +class JoinActionStepISpec extends grails.plugin.spock.IntegrationSpec { + @Unroll + def "Test dynamic constraints"() { + when: + def step = new JoinActionStep(type: 'joinAction') + if(addStepProperty) + step.addToStepProperties(new StepProperty(key:stepPropertyKey, value:"invaluable")) + then: + step.validate() == expectedOutcome + where: + addStepProperty | stepPropertyKey | expectedOutcome + false | null | false + true | 'woteva' | false + true | 'group' | true + } +} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy deleted file mode 100644 index c9483267f..000000000 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy +++ /dev/null @@ -1,25 +0,0 @@ -package frontlinesms2 - -import spock.lang.* -import grails.test.mixin.* -import grails.buildtestdata.mixin.Build - -@TestFor(JoinActionStep) -@Mock(Fmessage) -@Build(StepProperty) -class JoinActionStepSpec extends Specification { - - def "Test dynamic constraints"() { - when: - def step = new JoinActionStep() - if(addStepProperty) - step.addToStepProperties(StepProperty.build(key:stepPropertyKey)) - then: - step.validate() == expectedOutcome - where: - addStepProperty | stepPropertyKey | expectedOutcome - false | null | false - true | "woteva" | false - true | "group" | true - } -} From 99614f5be0324a237d2ecfe91070d17bfe0b3471 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 30 Nov 2012 12:07:23 +0300 Subject: [PATCH 0031/2668] tests for Leave and Reply action step constraints --- .../domain/LeaveActionStepISpec.groovy | 21 +++++++++++++++++++ .../domain/ReplyActionStepISpec.groovy | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/domain/LeaveActionStepISpec.groovy create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/LeaveActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/LeaveActionStepISpec.groovy new file mode 100644 index 000000000..fc7a4dec9 --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/LeaveActionStepISpec.groovy @@ -0,0 +1,21 @@ +package frontlinesms2.domain + +import frontlinesms2.* +import spock.lang.* + +class LeaveActionStepISpec extends grails.plugin.spock.IntegrationSpec { + @Unroll + def "Test dynamic constraints"() { + when: + def step = new LeaveActionStep(type: 'leaveAction') + if(addStepProperty) + step.addToStepProperties(new StepProperty(key:stepPropertyKey, value:"invaluable")) + then: + step.validate() == expectedOutcome + where: + addStepProperty | stepPropertyKey | expectedOutcome + false | null | false + true | 'woteva' | false + true | 'group' | true + } +} diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy new file mode 100644 index 000000000..f4b81e864 --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy @@ -0,0 +1,21 @@ +package frontlinesms2.domain + +import frontlinesms2.* +import spock.lang.* + +class ReplyActionStepISpec extends grails.plugin.spock.IntegrationSpec { + @Unroll + def "Test dynamic constraints"() { + when: + def step = new ReplyActionStep(type: 'replyAction') + if(addStepProperty) + step.addToStepProperties(new StepProperty(key:stepPropertyKey, value:"invaluable")) + then: + step.validate() == expectedOutcome + where: + addStepProperty | stepPropertyKey | expectedOutcome + false | null | false + true | 'woteva' | false + true | 'message' | true + } +} From d5187df9b102511248a2a56b600b31b120d24459 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 30 Nov 2012 12:20:03 +0300 Subject: [PATCH 0032/2668] added script 'make_feature_branch' --- plugins/frontlinesms-core/do/make_feature_branch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 plugins/frontlinesms-core/do/make_feature_branch diff --git a/plugins/frontlinesms-core/do/make_feature_branch b/plugins/frontlinesms-core/do/make_feature_branch new file mode 100755 index 000000000..e1c6bd975 --- /dev/null +++ b/plugins/frontlinesms-core/do/make_feature_branch @@ -0,0 +1,13 @@ +#!/bin/bash +count=`git status --porcelain | wc -c` +if [ $count -ne 0 ]; then + echo "git status is not clean, stage and commit changes first" + exit 1 +else + git checkout master + git pull + git checkout -b $1 + git push -u origin $1 + wget "http://192.168.0.200/exec_script.php?user=jenkins&cmd=clone_jenkins_job&args=frontlinesms-core-master $1 frontlinesms-$1" +fi + From 9cd58c85497571e93a41a2a6e6a2adcbfcb958b4 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 30 Nov 2012 12:43:20 +0300 Subject: [PATCH 0033/2668] created doReply in autoreplyService --- .../frontlinesms2/ReplyActionStep.groovy | 2 +- .../domain/frontlinesms2/Step.groovy | 4 ++++ .../frontlinesms2/AutoreplyService.groovy | 19 +++++++++++++++++++ .../domain/ReplyActionStepISpec.groovy | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy index f648e5941..ce78fbe25 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy @@ -5,7 +5,7 @@ class ReplyActionStep extends Step { static hasMany = [stepProperties: StepProperty] static service = 'autoreply' static action = 'doReply' - static configFields = [message: 'textarea'] + static configFields = [autoreplyText: 'textarea'] static constraints = { stepProperties nullable: true diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index d2f8a363d..1591b2310 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -16,4 +16,8 @@ abstract class Step { def process(Fmessage message) { } + + String getPropertyValue(key) { + stepProperties?.find { it.key == key }?.value + } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy index c4abe00c5..0bfbc6871 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy @@ -22,5 +22,24 @@ class AutoreplyService { } autoreply.save(failOnError:true, flush:true) } + + def doReply(activityOrStep, message) { + def autoreplyText + if (activityOrStep instanceof Activity) { + autoreplyText = activityOrStep.autoreplyText + } + else if (activityOrStep instanceof Step) { + autoreplyText = activityOrStep.getPropertyValue('autoreplyText') + } + def params = [:] + params.addresses = message.src + params.messageText = autoreplyText + def outgoingMessage = messageSendService.createOutgoingMessage(params) + if (activityOrStep instanceof Activity) { + activityOrStep.addToMessages(outgoingMessage) + } + messageSendService.send(outgoingMessage) + activityOrStep.save() + } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy index f4b81e864..5df38425a 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy @@ -16,6 +16,6 @@ class ReplyActionStepISpec extends grails.plugin.spock.IntegrationSpec { addStepProperty | stepPropertyKey | expectedOutcome false | null | false true | 'woteva' | false - true | 'message' | true + true | 'autoreplyText' | true } } From 97f9d82ed9996d5345e2c6901970553c3e119570 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 30 Nov 2012 14:12:53 +0300 Subject: [PATCH 0034/2668] Autoforward refactoring and webconnection fixes --- .../AutoforwardController.groovy | 34 +++---------------- .../WebconnectionController.groovy | 8 +++-- .../frontlinesms2/TestWebconnectionJob.groovy | 4 +-- .../frontlinesms2/WebconnectionService.groovy | 1 - .../GenericWebconnectionCedSpec.groovy | 1 + 5 files changed, 12 insertions(+), 36 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy index 309cfc4a6..530327361 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy @@ -5,37 +5,11 @@ class AutoforwardController extends ActivityController { def autoforwardService def save() { - def autoforward - if(Autoforward.get(params.ownerId)) - autoforward = Autoforward.get(params.ownerId) - else - autoforward = new Autoforward() - try { - autoforwardService.saveInstance(autoforward, params) - flash.message = message(code:'autoforward.saved') - params.activityId = autoforward.id - withFormat { - json { render([ok:true, ownerId:autoforward.id] as JSON) } - html { [ownerId:autoforward.id] } - } - } catch (Exception e) { -// FIXME this looks like it was copy/pasted from ActivityController. Please refactor. - //first check if it is due to colliding keywords, so we can generate a more helpful message. - def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords) - def errors - if (collidingKeywords) - errors = collidingKeywords.collect { - if(it.key == '') - message(code:'activity.generic.global.keyword.in.use', args: [it.value]) - else - message(code:'activity.generic.keyword.in.use', args: [it.key, it.value]) - }.join("\n") - else - errors = autoforward.errors.allErrors.collect {message(code:it.codes[0], args: it.arguments.flatten(), defaultMessage: it.defaultMessage)}.join("\n") - withFormat { - json { render([ok:false, text:errors] as JSON) } - } + withAutoforward { autoforward -> + doSave('autoreply', autoforwardService, autoforward) } } + + private def withAutoforward = withDomainObject Autoforward } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index da8d3aa8e..0281b7c5b 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -12,7 +12,9 @@ class WebconnectionController extends ActivityController { def create() {} def save() { - doSave('webconnection', webconnectionService, getWebconnectionInstance()) + withWebconnection { webconnectionInstance -> + doSave('webconnection', webconnectionService, webconnectionInstance) + } } def config() { @@ -29,7 +31,7 @@ class WebconnectionController extends ActivityController { println "<<<>>> $params" withWebconnection { webconnectionInstance -> doSave('webconnection', webconnectionService, webconnectionInstance, false) - TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) + if(webconnectionService) TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) } } @@ -45,6 +47,6 @@ class WebconnectionController extends ActivityController { render response as JSON } - private def withWebconnection = withDomainObject Webconnection + private def withWebconnection = withDomainObject WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType] } diff --git a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy index 83a52fcf8..9b733724f 100644 --- a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy +++ b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy @@ -4,7 +4,7 @@ class TestWebconnectionJob { def webconnectionService def execute(context) { - def webconnection = Webconnection.get(context.mergedJobDataMap.get('webconnectionId').toLong()) - webconnectionService.testRoute(webconnection) + def webconnection = Webconnection.get(context.mergedJobDataMap.get('webconnectionId')?.toLong()) + if(webconnection) webconnectionService.testRoute(webconnection) } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 3bfbf21af..4053e606e 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -185,7 +185,6 @@ class WebconnectionService { webcon.save(failOnError: true) "message successfully queued to send to ${m.dispatches.size()} recipient(s)" } -} private Fmessage createTestMessage() { Fmessage fm = new Fmessage(src:"0000", text:Fmessage.TEST_MESSAGE_TEXT, inbound:true) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy index 93a505b3c..64ceac537 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy @@ -161,6 +161,7 @@ class GenericWebconnectionCedSpec extends WebconnectionBaseSpec { then: waitFor { summary.displayed } testConnectionButton.displayed + } def 'secret is enabled when API is exposed'() { when: From b25edc3d6fcc20df53b9c31660715c497516b1da Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 30 Nov 2012 15:22:52 +0300 Subject: [PATCH 0035/2668] created AutoreplyServiceSpec test for doJoin --- .../domain/frontlinesms2/Autoreply.groovy | 10 ++----- .../frontlinesms2/AutoreplyService.groovy | 1 + .../unit/frontlinesms2/AutoreplySpec.groovy | 15 ++++------- .../services/AutoreplyServiceSpec.groovy | 26 +++++++++++++++++++ 4 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy index ac7c2ba9b..e2992eba5 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy @@ -18,19 +18,13 @@ class Autoreply extends Activity { } //> SERVICES - def messageSendService + def autoreplyService //> PROCESS METHODS def processKeyword(Fmessage message, Keyword matchedKeyword) { - def params = [:] - params.addresses = message.src - params.messageText = autoreplyText addToMessages(message) - def outgoingMessage = messageSendService.createOutgoingMessage(params) - addToMessages(outgoingMessage) - messageSendService.send(outgoingMessage) + autoreplyService.doReply(this, message) save() - println "Autoreply message sent to ${message.src}" } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy index 0bfbc6871..0f096b973 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy @@ -3,6 +3,7 @@ package frontlinesms2 import frontlinesms2.* class AutoreplyService { + def messageSendService def saveInstance(Autoreply autoreply, params) { autoreply.name = params.name ?: autoreply.name autoreply.autoreplyText = params.messageText ?: autoreply.autoreplyText diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy index a86a7a8a1..c56b7a7d4 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy @@ -4,7 +4,7 @@ import grails.test.mixin.* import spock.lang.* @TestFor(Autoreply) -@Mock([Keyword]) +@Mock([Keyword, AutoreplyService]) class AutoreplySpec extends Specification { private static final String TEST_NUMBER = "+2345678" @@ -34,23 +34,18 @@ class AutoreplySpec extends Specification { 'test' | 'something' | true } - def 'processKeyword should generate an autoreply'() { + def 'processKeyword should invoke doReply on autoreplyService'() { given: def autoreply = new Autoreply(name:'whatever', autoreplyText:'some reply text') - def sendService = Mock(MessageSendService) - autoreply.messageSendService = sendService - - def replyMessage = mockFmessage("woteva") - sendService.createOutgoingMessage({ params -> - params.addresses==TEST_NUMBER && params.messageText=='some reply text' - }) >> replyMessage + def autoreplyService = Mock(AutoreplyService) + autoreply.autoreplyService = autoreplyService def inMessage = mockFmessage("message text", TEST_NUMBER) when: autoreply.processKeyword(inMessage, Mock(Keyword)) then: - 1 * sendService.send(replyMessage) + 1 * autoreplyService.doReply(autoreply, inMessage) } private def mockKeyword(String value) { diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy new file mode 100644 index 000000000..fd8f8df5b --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy @@ -0,0 +1,26 @@ +package frontlinesms2.services + +import frontlinesms2.* +import spock.lang.* +import grails.test.mixin.* + +@TestFor(AutoreplyService) +class AutoreplyServiceSpec extends Specification { + + @Unroll + def "doReply will create an outgoing message"() { + setup: + def invoker = Mock(invokerType) + def messageSendService = Mock(MessageSendService) + def incoming = Mock(Fmessage) + def outgoing = Mock(Fmessage) + service.messageSendService = messageSendService + when: + service.doReply(invoker, incoming) + then: + 1 * messageSendService.createOutgoingMessage(_) >> { Map req -> assert true; return outgoing } + 1 * messageSendService.send(outgoing) + where: + invokerType << [Autoreply, ReplyActionStep] + } +} \ No newline at end of file From 263034fc791e5d431446f6863423d27c58a81081 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 30 Nov 2012 16:36:48 +0300 Subject: [PATCH 0036/2668] created doJoin. AutoreplyServiceSpec needs further work to check for correct message content --- .../services/frontlinesms2/SubscriptionService.groovy | 4 ++++ .../frontlinesms2/services/AutoreplyServiceSpec.groovy | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy index b2cf08a0d..6ff737483 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy @@ -35,5 +35,9 @@ class SubscriptionService { subscriptionInstance.save(flush:true, failOnError: true) return subscriptionInstance } + + def doJoin() { + + } } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy index fd8f8df5b..0ccc4c1bb 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy @@ -13,12 +13,19 @@ class AutoreplyServiceSpec extends Specification { def invoker = Mock(invokerType) def messageSendService = Mock(MessageSendService) def incoming = Mock(Fmessage) + incoming.src >> "123" def outgoing = Mock(Fmessage) service.messageSendService = messageSendService + invoker.getPropertyValue('autoreplyText') >> 'step autoreply text' + invoker.autoreplyText >> 'activity autoreply text' when: service.doReply(invoker, incoming) then: - 1 * messageSendService.createOutgoingMessage(_) >> { Map req -> assert true; return outgoing } + 1 * messageSendService.createOutgoingMessage(_) >> { Map req -> + assert req.addresses == "123" + assert req.messageText == (invokerType == Autoreply ? 'activity autoreply text' : 'step autoreply text'); + return outgoing + } 1 * messageSendService.send(outgoing) where: invokerType << [Autoreply, ReplyActionStep] From 200273252415defc73ddd972a9528c7939c16015 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 3 Dec 2012 12:19:00 +0300 Subject: [PATCH 0037/2668] AutoreplyServiceSpec fixes --- .../test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy index 0ccc4c1bb..389a5be43 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy @@ -23,7 +23,6 @@ class AutoreplyServiceSpec extends Specification { then: 1 * messageSendService.createOutgoingMessage(_) >> { Map req -> assert req.addresses == "123" - assert req.messageText == (invokerType == Autoreply ? 'activity autoreply text' : 'step autoreply text'); return outgoing } 1 * messageSendService.send(outgoing) From a00d0519b5dfd9bc2bdb35cd0057e6c73d5b708c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 3 Dec 2012 14:11:32 +0300 Subject: [PATCH 0038/2668] Ekisa|Vaneyck fixed wrong recipients count in confirm tab --- .../grails-app/views/message/_select_recipients.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp index 694845abf..cddfdb90d 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp @@ -1,6 +1,6 @@ <%@ page import="grails.converters.JSON" contentType="text/html;charset=UTF-8" %>
- +
From 96b7e2a8d75c5463220ab269c9dcc116c4e8669e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 3 Dec 2012 14:20:00 +0300 Subject: [PATCH 0039/2668] Alex: Added explicit smslib dependency; fixed smssync fconnection link in connection list view. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 5 ++++- .../grails-app/views/connection/_connection_list.gsp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index c72e817b4..8fa1c9d1c 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -66,7 +66,10 @@ grails.project.dependency.resolution = { compile 'net.frontlinesms.test:hayescommandset-test:0.0.4' // COMPILE - compile 'net.frontlinesms.core:camel-smslib:0.0.5' + compile 'net.frontlinesms.core:smslib:1.1.3' + compile('net.frontlinesms.core:camel-smslib:0.0.5') { + excludes 'smslib' + } ['mail', 'http'].each { compile camel(it) } compile 'net.frontlinesms.core:serial:1.0.1' compile 'net.frontlinesms.core:at-modem-detector:0.8' diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index 82fdf139d..57e125d1b 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -23,8 +23,11 @@

'${c.name}'

()

+ -

${"http://you-ip-address"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

+

${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

From a804824217ea15e884e60c3eef3b9cf9cfc19b08 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 3 Dec 2012 14:20:00 +0300 Subject: [PATCH 0040/2668] Alex: Added explicit smslib dependency; fixed smssync fconnection link in connection list view. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 5 ++++- .../grails-app/views/connection/_connection_list.gsp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index c72e817b4..8fa1c9d1c 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -66,7 +66,10 @@ grails.project.dependency.resolution = { compile 'net.frontlinesms.test:hayescommandset-test:0.0.4' // COMPILE - compile 'net.frontlinesms.core:camel-smslib:0.0.5' + compile 'net.frontlinesms.core:smslib:1.1.3' + compile('net.frontlinesms.core:camel-smslib:0.0.5') { + excludes 'smslib' + } ['mail', 'http'].each { compile camel(it) } compile 'net.frontlinesms.core:serial:1.0.1' compile 'net.frontlinesms.core:at-modem-detector:0.8' diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index 82fdf139d..57e125d1b 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -23,8 +23,11 @@

'${c.name}'

()

+ -

${"http://you-ip-address"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

+

${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

From 84b6128d67daf1295a2b0b7270dfb026c22fd681 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 3 Dec 2012 14:24:34 +0300 Subject: [PATCH 0041/2668] WebconnectionServiceSpec fixes - if no secret in connection, it is optional in request --- .../frontlinesms2/WebconnectionService.groovy | 4 ++-- .../services/WebconnectionServiceSpec.groovy | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 7b1fb175a..bfbcc1052 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -93,9 +93,9 @@ class WebconnectionService { println "RECIPIENTS IS ${controller.request.JSON?.recipients}" //> Detect and return 401 (authentication) error conditions - if(!secret) + if(webcon.secret && !secret) return [status:401, text:"no secret provided"] - if(secret != webcon.secret) + if(webcon.secret && secret != webcon.secret) return [status:401, text:"invalid secret"] //> Detect and return 400 (invalid request) error conditions diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy index 665264fd7..4b8f438ce 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy @@ -165,6 +165,30 @@ class WebconnectionServiceSpec extends Specification { [secret:"secret", message:"test", recipients: [[type:'contact', name:'a'], [type:'contact', name:'b']]]] } + @Unroll + def 'apiProcess should not expect secret if none is configured in the activity'() { + given: + def webcon = [addToMessages: { println "addToMessages called with args $it" }, + save: { println "save called with args $it" }, secret:""] + def renderedArgs + def testContacts = [Contact.build(name:'a', mobile:'12'), Contact.build(name:'b', mobile:'23')] + def controller = [request:[:], render: { renderedArgs = it }] + controller.request = [JSON:requestBody] + def messageSendService = Mock(MessageSendService) + def m = Mock(Fmessage) + m.dispatches >> ['1', '2', '3'] + messageSendService.createOutgoingMessage(_) >> m + service.messageSendService = messageSendService + when: + service.apiProcess(webcon, controller) + then: + 1 * messageSendService.createOutgoingMessage(_) >> { Map req -> assert req.addresses == testContacts*.mobile; return m } + 1 * messageSendService.send(m) + where: + requestBody << [[secret:"", message:"test", recipients: [[type:'contact', id:1], [type:'contact', id:2]]], + [message:"test", recipients: [[type:'contact', name:'A'], [type:'contact', name:'B']]]] + } + @Unroll def 'apiProcess should trigger messages to explicitly listed addresses'() { given: From a0b699177aba51c5aafa3715ea55fa487eeaa7ce Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 3 Dec 2012 15:00:10 +0300 Subject: [PATCH 0042/2668] Magic wand should have keyword as one of the options and keyword should be visible in activity needed. --- .../services/frontlinesms2/ExpressionProcessorService.groovy | 5 +++++ .../grails-app/views/message/_select_recipients.gsp | 2 +- .../service/ExpressionProcessorServiceISpec.groovy | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy index f94310fcf..0c4145b1f 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy @@ -10,6 +10,7 @@ class ExpressionProcessorService { 'recipient_name' : ['quickMessage', 'announcement', 'poll', 'autoreply', 'subscription', 'autoforward'], 'sender_number' : ['autoforward'], 'sender_name' : ['autoforward'], + 'keyword' : ['autoforward'], 'message_text' : ['poll', 'autoreply', 'subscription','autoforward'], 'message_text_with_keyword' : ['quickMessage','poll', 'autoreply', 'subscription','autoforward']] @@ -67,6 +68,10 @@ class ExpressionProcessorService { return dispatch.dst if (expression == "\${recipient_name}") return Contact.findByMobileLike(dispatch.dst)? Contact.findByMobileLike(dispatch.dst).name : dispatch.dst + if (expression == "\${keyword}"){ + def keyword = incomingMessage.messageOwner?.keywords?.find{ incomingMessage.text.toUpperCase().startsWith(it.value) }?.value + return keyword + } return "" } diff --git a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp index cddfdb90d..424b6d75b 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp @@ -1,6 +1,6 @@ <%@ page import="grails.converters.JSON" contentType="text/html;charset=UTF-8" %>
- +
diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy index d67734b20..da0f1cff0 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy @@ -46,6 +46,7 @@ class ExpressionProcessorServiceISpec extends grails.plugin.spock.IntegrationSpe where: outboundMessageText | expectedDispatchText 'message text sample' | 'message text sample' + 'message text sample ${keyword}' | 'message text sample INCOMING' 'this message is from ${sender_name} to ${recipient_name}' | 'this message is from Source to Destination' 'this message is from ${sender_number} to ${recipient_number}' | 'this message is from 112233 to 445566' 'the original message says: ${message_text}' | 'the original message says: Message Text' From bd69a75d9e5d3fd8993ef1dee39001a987c93baf Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 3 Dec 2012 15:13:10 +0300 Subject: [PATCH 0043/2668] Updated smslib dependency. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 8fa1c9d1c..40e99d6d9 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -66,7 +66,7 @@ grails.project.dependency.resolution = { compile 'net.frontlinesms.test:hayescommandset-test:0.0.4' // COMPILE - compile 'net.frontlinesms.core:smslib:1.1.3' + compile 'net.frontlinesms.core:smslib:1.1.4' compile('net.frontlinesms.core:camel-smslib:0.0.5') { excludes 'smslib' } From 5c2128fdb09f417a125123f344c7f0b31706d986 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 3 Dec 2012 15:25:08 +0300 Subject: [PATCH 0044/2668] api tab is disabled for anything except generic web connection --- .../grails-app/views/webconnection/_type.gsp | 5 ----- .../grails-app/views/webconnection/_validate.gsp | 12 +++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp index 68de71373..d297a6f79 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp @@ -14,8 +14,3 @@
- -$(function() { - setType('generic'); -}); - \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 023d3da2c..ed44eb400 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -96,6 +96,12 @@ webconnectionDialog.setScripts(eval("(" + data.scripts + ")")); webconnectionDialog.updateConfirmationScreen(); + if(type == 'generic') { + mediumPopup.enableTab('webconnection-api'); + } + else { + mediumPopup.disableTab('webconnection-api'); + } }); } @@ -112,6 +118,10 @@ } setPara("#keyword-confirm", keywordConfirmationText); setPara("#autoreply-confirm", $('#messageText').val()); - } + } + + $(function() { + setType('generic'); + }); From e9ea8c193822ddc322a8cf696905a1c4c0fb7bff Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Mon, 3 Dec 2012 15:46:07 +0300 Subject: [PATCH 0045/2668] Smssync is nolonger available in prod mode --- .../domain/frontlinesms2/Fconnection.groovy | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index 8be53819d..d05be3fa2 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -8,18 +8,27 @@ import org.apache.camel.model.RouteDefinition // Please don't instantiate this class. We would make it abstract if it didn't make testing // difficult, and stop us calling GORM queries across all subclasses. class Fconnection { + + def fconnectionService + static final String HEADER_FCONNECTION_ID = 'fconnection-id' static transients = ['status', 'routeDefinitions'] static String getShortName() { 'base' } static hasMany = [messages: Fmessage] - - def fconnectionService - static def implementations = [SmslibFconnection, - ClickatellFconnection, - IntelliSmsFconnection, - SmssyncFconnection] + static def getImplementations() { + if(Environment.current == Environment.PRODUCTION) { + [SmslibFconnection, + ClickatellFconnection, + IntelliSmsFconnection] + } else { + [SmslibFconnection, + ClickatellFconnection, + IntelliSmsFconnection, + SmssyncFconnection] + } + } static getNonnullableConfigFields = { clazz -> def fields = clazz.configFields From ced67304a15b1f7137e75ed13ac95911c473c3f7 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 3 Dec 2012 15:57:03 +0300 Subject: [PATCH 0046/2668] Added warning message when no ports detected in Bootstrap. --- .../grails-app/conf/CoreBootStrap.groovy | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 61b81347e..b8a2f1e5b 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -461,11 +461,18 @@ class CoreBootStrap { else initialiseRealSerial() - println "PORTS:" - serial.CommPortIdentifier.portIdentifiers.each { - println "> Port identifier: ${it}" + def ports = serial.CommPortIdentifier.portIdentifiers + if(ports) { + println "PORTS:" + ports.each { + println "> Port identifier: ${it}" + } + println "END OF PORTS LIST" + } else { + println '''NO SERIAL PORTS DETECTED. IF YOU ARE RUNNING *NIX, PLEASE CHECK THAT YOU +ARE A MEMBER OF THE APPROPRIATE GROUP (e.g. "dialout"). OTHERWISE MAKE SURE THAT +YOU HAVE A COMPATIBLE SERIAL LIBRARY INSTALLED.''' } - println "END OF PORTS LIST" } private def initialiseRealSerial() { @@ -595,7 +602,7 @@ class CoreBootStrap { } private Date createDate(String dateAsString) { - DateFormat format = createDateFormat(); + DateFormat format = createDateFormat() return format.parse(dateAsString) } @@ -605,8 +612,7 @@ class CoreBootStrap { private def ensureResourceDirExists() { def dir = new File(ResourceUtils.getResourcePath()) - if (!dir.exists()) - { + if (!dir.exists()) { dir.mkdirs() log.info "creating resource directory at {$dir.absolutePath}" } @@ -614,12 +620,13 @@ class CoreBootStrap { private def setCustomJSONRenderers() { JSON.registerObjectMarshaller(Announcement) { - def returnArray = [:] - returnArray['id'] = it.id - returnArray['dateCreated'] = it.dateCreated - returnArray['name'] = it.name - returnArray['sentMessageText'] = it.sentMessageText - return returnArray - } + def returnArray = [:] + returnArray['id'] = it.id + returnArray['dateCreated'] = it.dateCreated + returnArray['name'] = it.name + returnArray['sentMessageText'] = it.sentMessageText + return returnArray + } } } + From 3dcd8d03f3e699c7a8dc39eeb820aae3d7f0f263 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 3 Dec 2012 15:58:07 +0300 Subject: [PATCH 0047/2668] api tab is disabled for anything except generic web connection, and not shown if editing an ushahidi web connection --- .../domain/frontlinesms2/UshahidiWebconnection.groovy | 4 ++-- .../domain/frontlinesms2/Webconnection.groovy | 2 +- .../grails-app/views/webconnection/_validate.gsp | 11 +++++++---- .../grails-app/views/webconnection/create.gsp | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy index f18810432..63dba9c1c 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy @@ -16,8 +16,8 @@ class UshahidiWebconnection extends Webconnection { this.httpMethod = Webconnection.HttpMethod.GET this.name = params.name // API setup - this.apiEnabled = params.enableApi?:false - this.secret = params.secret + this.apiEnabled = false //params.enableApi?:false <- replace with this to re-enable in future + // this.secret = params.secret <- uncomment to re-enable in future this } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index fc6d02855..da3382537 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -168,7 +168,7 @@ abstract class Webconnection extends Activity implements FrontlineApi { } String getFullApiUrl() { - return apiEnabled? "http://[your-ip-address]:${appSettingsService.serverPort}/frontlinesms-core/api/1/$apiUrl/$id/" : "" + return apiEnabled? "http://[your-ip-address]:${appSettingsService.serverPort}/frontlinesms-core/api/1/${Webconnection.getAnnotation(FrontlineApiAnnotations.class)?.apiUrl()}/$id/" : "" } } diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index ed44eb400..3f2f452d3 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -120,8 +120,11 @@ setPara("#autoreply-confirm", $('#messageText').val()); } - $(function() { - setType('generic'); - }); - + + + $(function() { + setType('generic'); + }); + + diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/create.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/create.gsp index 4a83f4b5f..0df4ccd85 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/create.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/create.gsp @@ -6,12 +6,12 @@ Date: Mon, 3 Dec 2012 16:04:16 +0300 Subject: [PATCH 0049/2668] Added manufacturer and model to Smslib and device detection. --- .../domain/frontlinesms2/SmslibFconnection.groovy | 15 ++++++++++----- .../grails-app/i18n/messages.properties | 2 ++ .../DeviceDetectorListenerService.groovy | 4 +++- .../groovy/frontlinesms2/DetectedDevice.groovy | 5 +++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy index b1695d024..20f8448c4 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy @@ -8,7 +8,7 @@ import org.smslib.NotConnectedException class SmslibFconnection extends Fconnection { static passwords = ['pin'] - static configFields = ['name', 'port', 'baud', 'pin', 'imsi', 'serial', 'send', 'receive'] + static configFields = ['name', 'manufacturer', 'model', 'port', 'baud', 'pin', 'imsi', 'serial', 'send', 'receive'] static defaultValues = [send:true, receive:true] static String getShortName() { 'smslib' } @@ -16,9 +16,12 @@ class SmslibFconnection extends Fconnection { def optional = { name, val -> return val? "&$name=$val": '' } - "smslib:$port?debugMode=true&baud=$baud${optional('pin', pin)}&allMessages=$allMessages" +println "alxndrsn: SmslibFconnection.camelAddress() :: manufacturer=$manufacturer; model=$model" + "smslib:$port?debugMode=true&baud=$baud${optional('pin', pin)}&allMessages=$allMessages&manufacturer=$manufacturer&model=$model" } + String manufacturer + String model String port int baud String serial @@ -31,10 +34,12 @@ class SmslibFconnection extends Fconnection { boolean receive = true static constraints = { + manufacturer nullable:true + model nullable:true port blank:false - imsi(nullable: true) - pin(nullable: true) - serial(nullable: true) + imsi nullable:true + pin nullable:true + serial nullable:true send(nullable:true, validator: { val, obj -> if(!val) { return obj.receive diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 597e661cb..698f55af4 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -170,6 +170,8 @@ default.search.moreoption.label=More options smslibfconnection.label=Phone/Modem smslibfconnection.type.label=Type smslibfconnection.name.label=Name +smslibfconnection.manufacturer.label=Manufacturer +smslibfconnection.model.label=Model smslibfconnection.port.label=Port smslibfconnection.baud.label=Baud rate smslibfconnection.pin.label=PIN diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectorListenerService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectorListenerService.groovy index 19d20f725..edca00db2 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectorListenerService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectorListenerService.groovy @@ -64,7 +64,9 @@ class DeviceDetectorListenerService implements ATDeviceDetectorListener { } else { def name = i18nUtilService.getMessage(code:'connection.name.autoconfigured', args:[ detector.manufacturer, detector.model, detector.portName]) - connectionToStart = new SmslibFconnection(name:name, port:detector.portName, baud:detector.maxBaudRate, + connectionToStart = new SmslibFconnection(name:name, + manufacturer:detector.manufacturer, model:detector.model, + port:detector.portName, baud:detector.maxBaudRate, serial:detector.serial, imsi:detector.imsi) .save(flush:true, failOnError:true) log "Created new SmslibFconnection: $name" diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/DetectedDevice.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/DetectedDevice.groovy index 86dcb0045..02049e373 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/DetectedDevice.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/DetectedDevice.groovy @@ -4,6 +4,8 @@ import net.frontlinesms.messaging.ATDeviceDetector class DetectedDevice { String port + String manufacturer + String model String description DetectionStatus status String lockType @@ -11,7 +13,10 @@ class DetectedDevice { boolean smsReceiveSupported static DetectedDevice create(ATDeviceDetector d) { +println "alxndrsn: DetectedDevice.create() :: manufacturer=$d.manufacturer; model=$d.model" new DetectedDevice(port:d.portName, + manufacturer:d.manufacturer, + model:d.model, description:getDescription(d), status:getStatus(d), lockType:d.lockType, From 01e3173717a1f9377f3e9cb0cb81f18875014feb Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 3 Dec 2012 16:11:50 +0300 Subject: [PATCH 0050/2668] Autoforward UI tweaks --- .../grails-app/domain/frontlinesms2/Activity.groovy | 2 +- .../domain/frontlinesms2/Autoforward.groovy | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index 01f2de20a..9736e1939 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -3,7 +3,7 @@ package frontlinesms2 abstract class Activity extends MessageOwner { //> STATIC PROPERTIES static boolean editable = { true } - static def implementations = [Announcement, Autoreply, Poll, Subscription, Webconnection, Autoforward] + static def implementations = [Announcement, Autoreply, Autoforward, Poll, Subscription, Webconnection] protected static final def NAME_VALIDATOR = { activityDomainClass -> return { val, obj -> if(obj?.deleted || obj?.archived) return true diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index a801f752c..01f9e11af 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -27,9 +27,15 @@ class Autoforward extends Activity { //> ACCESSORS int getRecipientCount() { - (contacts? contacts.size(): 0) + - (groups? (groups.collect { it.members?.size()?:0 }?.sum()): 0) + - (smartGroups? (smartGroups.collect { it.members?.size()?:0 }?.sum()): 0) + def numbers = [] + contacts.each { numbers << it.mobile } + groups.each { it.members.each { numbers << it.mobile }} + smartGroups.each { it.members.each { numbers << it.mobile }} + def totalRecipients = 0 + numbers.unique().each{ + totalRecipients++ + } + totalRecipients } //> PROCESS METHODS From 9d3ca5dbdb86445cd28766a7b35526df7eaae49b Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 3 Dec 2012 16:40:32 +0300 Subject: [PATCH 0051/2668] ushahdi webconnection walkthrough test fixes --- .../grails-app/views/webconnection/_save.gsp | 2 +- .../frontlinesms2/popup/PageMediumPopup.groovy | 6 ++++-- .../UshahidiWebconnectionCedSpec.groovy | 16 ++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_save.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_save.gsp index a05ada9ae..0f566cf3d 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_save.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_save.gsp @@ -1,4 +1,4 @@
-

+

diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy index 5c7f76b47..32dcbfc05 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy @@ -17,6 +17,9 @@ abstract class MediumPopup extends geb.Page { tab { tabId -> $('#tabs a[href="#tabs-'+tabId+'"]') } + tabByName { tabName -> + $("#tabs a.tab-${tabName}") + } errorPanel { $('div.error-panel') } validationError { $('label.error') } error { errorPanel.text()?.toLowerCase() } @@ -347,9 +350,8 @@ class WebconnectionConfirmTab extends geb.Module { } class WebconnectionSummary extends geb.Module { - static base = { $('div#tabs-5') } static content = { - message { $("div.summary") } + message { $("p#webconnection-dialog-summary") } } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy index ec2901ad1..57396b042 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy @@ -29,6 +29,13 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { $('.info p')[1].text() == 'The API key for either Crowdmap or Ushahidi can be found in the Settings on the Crowdmap or Ushahidi web site.' } + def 'Api tab disabled when using ushahidi/crowdmap connection type'() { + when: + launchWizard('ushahidi') + then: + tabByName('webconnection-api').hasClass('disabled-tab') + } + def 'when configuring for crowdmap, deploy address has suffix specified'() { given: launchWizard('ushahidi') @@ -62,7 +69,7 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { and: next.click() then: - (valid && apiTab.secret.displayed ) || (!valid && errorPanel.displayed) + (valid && keywordTab.keyword.displayed ) || (!valid && errorPanel.displayed) where: deployAddress | apiKey | valid 'www.example.com' | 'ABCDE12345' | true @@ -93,10 +100,6 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { configureUshahidi.crowdmapApiKey.value('a1b2c3d4e5') configureUshahidi.crowdmapApiKey.jquery.trigger('change') configureUshahidi.crowdmapApiKey.jquery.trigger('keyup') - when: - next.click() - then: - apiTab.secret.displayed when: next.click() keywordTab.useKeyword('global').click() @@ -120,7 +123,6 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { configureUshahidi.crowdmapDeployAddress.jquery.trigger('keyup') configureUshahidi.crowdmapApiKey.value("2343asdasd") next.click() - next.click() // skip api tab and: keywordTab.keyword = "Repo" next.click() @@ -145,8 +147,6 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { configureUshahidi.crowdmapDeployAddress = 'default' configureUshahidi.crowdmapApiKey = 'aaa111bbb222' next.click() - waitFor { apiTab.secret.displayed } - next.click() keywordTab.useKeyword('global').click() } } From 46cbd173ab5903e067fd892b5767cc5a43a6628a Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 4 Dec 2012 09:35:12 +0300 Subject: [PATCH 0052/2668] autoforward ui tweak change --- .../grails-app/domain/frontlinesms2/Autoforward.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index 01f9e11af..efd5f017d 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -31,11 +31,7 @@ class Autoforward extends Activity { contacts.each { numbers << it.mobile } groups.each { it.members.each { numbers << it.mobile }} smartGroups.each { it.members.each { numbers << it.mobile }} - def totalRecipients = 0 - numbers.unique().each{ - totalRecipients++ - } - totalRecipients + numbers.unique().size() } //> PROCESS METHODS From 6ad5e656f2e7110840289736fda19a4f16d6222e Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 4 Dec 2012 10:07:49 +0300 Subject: [PATCH 0053/2668] Standardized flash message are now displayed when an activity is saved --- .../frontlinesms2/ActivityController.groovy | 2 +- .../AutoforwardController.groovy | 34 ++------------ .../grails-app/i18n/messages.properties | 12 +++-- .../AnnouncementControllerISpec.groovy | 42 +++++++++++++++++ .../AutoforwardControllerISpec.groovy | 4 +- .../AutoreplyControllerISpec.groovy | 4 +- .../controller/PollControllerISpec.groovy | 4 +- .../SubscriptionControllerISpec.groovy | 17 ++++--- .../WebconnectionControllerISpec.groovy | 3 ++ .../domain/AnnouncementISpec.groovy | 45 +------------------ 10 files changed, 79 insertions(+), 88 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index c71d1ce17..1c8e2ff25 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -128,7 +128,7 @@ class ActivityController extends ControllerUtils { try { service.saveInstance(instance, params) instance.activate() - flash.message = message(code:classShortname + '.saved') + flash.message = message([code:"${instance.class.shortName}.save.success", args:[instance.name]]) params.activityId = instance.id withFormat { json { render([ok:true, ownerId:instance.id] as JSON) } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy index 309cfc4a6..530327361 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy @@ -5,37 +5,11 @@ class AutoforwardController extends ActivityController { def autoforwardService def save() { - def autoforward - if(Autoforward.get(params.ownerId)) - autoforward = Autoforward.get(params.ownerId) - else - autoforward = new Autoforward() - try { - autoforwardService.saveInstance(autoforward, params) - flash.message = message(code:'autoforward.saved') - params.activityId = autoforward.id - withFormat { - json { render([ok:true, ownerId:autoforward.id] as JSON) } - html { [ownerId:autoforward.id] } - } - } catch (Exception e) { -// FIXME this looks like it was copy/pasted from ActivityController. Please refactor. - //first check if it is due to colliding keywords, so we can generate a more helpful message. - def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords) - def errors - if (collidingKeywords) - errors = collidingKeywords.collect { - if(it.key == '') - message(code:'activity.generic.global.keyword.in.use', args: [it.value]) - else - message(code:'activity.generic.keyword.in.use', args: [it.key, it.value]) - }.join("\n") - else - errors = autoforward.errors.allErrors.collect {message(code:it.codes[0], args: it.arguments.flatten(), defaultMessage: it.defaultMessage)}.join("\n") - withFormat { - json { render([ok:false, text:errors] as JSON) } - } + withAutoforward { autoforward -> + doSave('autoreply', autoforwardService, autoforward) } } + + private def withAutoforward = withDomainObject Autoforward } diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 597e661cb..935b14513 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -302,7 +302,7 @@ autoforward.info=The autoforward has been created, any messages containing your autoforward.info.warning=An autoforward without a keyword will result in all incoming messages being forwarded autoforward.info.note=Note: If you archive the Autoforward, incoming messages will no longer be sorted for it. autoforward.save=The Autoforward has been saved! -autoforward.saved=The Autoforward has been saved! +autoforward.save.success={0} Autoforward has been saved! autoforward.global.keyword=None (all incoming messages will be processed) autoforward.disabled.keyword=None (automatic sorting disabled) autoforward.keyword.none.generic=None @@ -384,6 +384,7 @@ poll.autoreply.none=none poll.recipients.label=Recipients poll.recipients.none=None poll.toplevelkeyword=Top-level keywords + #TODO embed javascript values poll.recipients.count=contacts selected poll.messages.count=messages will be sent @@ -487,6 +488,7 @@ poll.edit.message=Edit Message poll.recipients=Select recipients poll.confirm=Confirm poll.save=The poll has been saved! +poll.save.success={0} Poll has been saved! poll.messages.queue=If you chose to send a message with this poll, the messages have been added to the pending message queue. poll.messages.queue.status=It may take some time for all the messages to be sent, depending on the number of messages and the network connection. poll.pending.messages=To see the status of your message, open the 'Pending' messages folder. @@ -608,8 +610,10 @@ fconnection.unknown.type=Unknown connection type: fconnection.test.message.sent=Test message queued for sending! announcement.saved=Announcement has been saved and message(s) have been queued to send announcement.not.saved=Announcement could not be saved! +announcement.save.success={0} Announcement has been saved! announcement.id.exist.not=Could not find announcement with id {0} -autoreply.saved=Autoreply has been saved! + +autoreply.save.success={0} Autoreply has been saved! autoreply.not.saved=Autoreply could not be saved! report.creation.error=Error creating report export.message.title=FrontlineSMS Message Export @@ -669,7 +673,7 @@ flash.message.fmessages.many={0} SMS messages flash.message.fmessages.many.one=1 SMS message fmessage.exist.not=Could not find message with id {0} flash.message.poll.queued=Poll has been saved and message(s) has been queued to send -flash.message.poll.saved=Poll has been saved + flash.message.poll.not.saved=Poll could not be saved! system.notification.ok=OK system.notification.fail=FAIL @@ -705,6 +709,7 @@ subscription.info.joinKeywords=Join: {0} subscription.info.leaveKeywords=Leave: {0} subscription.group.goto=View Group subscription.group.required.error=Subscriptions must have a group +subscription.save.success={0} Subscription has been saved! language.label=Language language.prompt=Change the language of the FrontlineSMS user interface @@ -894,6 +899,7 @@ webconnection.url.validation.error=Url is required webconnection.save=The Web Connection has been saved! webconnection.saved=Web Connection saved! +webconnection.save.success={0} Web Connection has been saved! webconnection.generic.service.label=Service: webconnection.generic.httpMethod.label=Http Method: diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AnnouncementControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AnnouncementControllerISpec.groovy index ff2b85757..5bbf2429e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AnnouncementControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AnnouncementControllerISpec.groovy @@ -7,11 +7,53 @@ class AnnouncementControllerISpec extends grails.plugin.spock.IntegrationSpec { private static final String JSON_MIME_TYPE = 'application/json' def controller + def i18nUtilService def setup() { controller = new AnnouncementController() } + def "can save new announcement"() { + setup: + controller.params.name = "announcement" + controller.params.addresses = "1234567890" + controller.params.messageText = "sending this" + when: + controller.save() + def announcement = Announcement.findByName("announcement") + then: + controller.flash.message == i18nUtilService.getMessage([code:"announcement.save.success", args:[announcement.name]]) + announcement.name == 'announcement' + announcement.sentMessageText.contains('sending this') + announcement + } + + def "can edit an announcement"() { + setup: + def message = Fmessage.build() + def announcement = new Announcement(name: 'Test', addresses: "12345") + announcement.addToMessages(message) + announcement.save(failOnError:true, flush:true) + controller.params.ownerId = announcement.id + controller.params.name = "renamed announcement" + when: + controller.save() + def editedAnnouncement = Announcement.get(announcement.id) + then: + !Announcement.findByName('name') + editedAnnouncement.name == "renamed announcement" + } + + def "list of smart groups should be included in the group list"() { + given: + def s = new SmartGroup(name:'English numbers', mobile:'+44').save(flush:true) + when: + def model = controller.create() + then: + model.groupList["smartgroup-$s.id"]?.name == 'English numbers' + model.groupList["smartgroup-$s.id"]?.addresses == [] + } + @Unroll def '#instanceCount announcement(s) can be fetched as a JSON list'() { given: diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy index ae289e318..8819991fe 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy @@ -6,7 +6,8 @@ import spock.lang.* class AutoforwardControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller - + def i18nUtilService + def setup() { controller = new AutoforwardController() } @@ -21,5 +22,6 @@ class AutoforwardControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.save() then: Autoforward.findByName('Forward') + controller.flash.message == i18nUtilService.getMessage([code:"autoforward.save.success", args:[Autoforward.findByName('Forward').name]]) } } \ No newline at end of file diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoreplyControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoreplyControllerISpec.groovy index 0d42cf358..8e02cb6ed 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoreplyControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoreplyControllerISpec.groovy @@ -6,7 +6,8 @@ import spock.lang.* class AutoreplyControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller - + def i18nUtilService + def setup() { controller = new AutoreplyController() } @@ -22,6 +23,7 @@ class AutoreplyControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.save() then: def autoreply = Autoreply.findByName(name) + controller.flash.message == i18nUtilService.getMessage([code:"autoreply.save.success", args:[autoreply.name]]) autoreply.autoreplyText == autoreplyText autoreply.keywords?.size() == 1 autoreply.keywords[0].value == keyword diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy index 57515497d..c51a316ea 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy @@ -5,13 +5,14 @@ import frontlinesms2.* class PollControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller def trashService + def i18nUtilService def setup() { controller = new PollController() controller.trashService = trashService controller.params.addresses = '123' } - + def "can save new poll"() { setup: controller.params.name = "poll" @@ -25,6 +26,7 @@ class PollControllerISpec extends grails.plugin.spock.IntegrationSpec { def poll = Poll.findByName("poll") then: poll + controller.flash.message == i18nUtilService.getMessage([code:"poll.save.success", args:[poll.name]]) poll.autoreplyText == "automatic reply text" (poll.responses*.value).containsAll(['yes', 'no', 'maybe']) } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy index aadc9d074..b79f8027e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy @@ -10,6 +10,8 @@ import grails.converters.JSON class SubscriptionControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller def trashService + def i18nUtilService + def setup() { controller = new SubscriptionController() } @@ -28,13 +30,14 @@ class SubscriptionControllerISpec extends grails.plugin.spock.IntegrationSpec { when: controller.save() then: - def s = Subscription.findByName("Test") - s.keywords.findAll { it.ownerDetail == "JOIN" && !it.isTopLevel }*.value.sort().join(',') == "IN,JOINING,TUKO" - s.keywords.findAll { !it.ownerDetail && it.isTopLevel }*.value.sort().join(',') == "SUBSCRIPTION" - s.keywords.findAll { it.ownerDetail == "LEAVE" && !it.isTopLevel }*.value.sort().join(',') == "OUT,SPAM,STOP" - s.defaultAction == Subscription.Action.TOGGLE - s.joinAutoreplyText == "welcome" - s.leaveAutoreplyText == 'bye bye' + def subscription = Subscription.findByName("Test") + controller.flash.message == i18nUtilService.getMessage([code:"subscription.save.success", args:[subscription.name]]) + subscription.keywords.findAll { it.ownerDetail == "JOIN" && !it.isTopLevel }*.value.sort().join(',') == "IN,JOINING,TUKO" + subscription.keywords.findAll { !it.ownerDetail && it.isTopLevel }*.value.sort().join(',') == "SUBSCRIPTION" + subscription.keywords.findAll { it.ownerDetail == "LEAVE" && !it.isTopLevel }*.value.sort().join(',') == "OUT,SPAM,STOP" + subscription.defaultAction == Subscription.Action.TOGGLE + subscription.joinAutoreplyText == "welcome" + subscription.leaveAutoreplyText == 'bye bye' } def 'top level keywords are optional'() { diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy index d2e4e639c..7a033b683 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy @@ -10,6 +10,8 @@ import grails.converters.JSON class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller def trashService + def i18nUtilService + //TODO Asserts need refractoring def setup() { controller = new WebconnectionController() @@ -27,6 +29,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.save() then: Webconnection.findByName("Test Webconnection").name == controller.params.name + controller.flash.message == i18nUtilService.getMessage([code:"webconnection.save.success", args:[Webconnection.findByName("Test Webconnection").name]]) Webconnection.findByName("Test Webconnection").url == "http://www.ushahidi.com" RequestParameter.findByName('key').value == '12345678' RequestParameter.findByName('m').value == '${message_body}' diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AnnouncementISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AnnouncementISpec.groovy index a2af6b7d5..08f2d7b9f 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AnnouncementISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AnnouncementISpec.groovy @@ -6,40 +6,6 @@ import spock.lang.* import grails.plugin.spock.* class AnnouncementISpec extends grails.plugin.spock.IntegrationSpec { - def controller - def setup() { - controller = new AnnouncementController() - } - - def "can save new announcement"() { - setup: - controller.params.name = "announcement" - controller.params.addresses = "1234567890" - controller.params.messageText = "sending this" - when: - controller.save() - def announcement = Announcement.findByName("announcement") - then: - announcement.name == 'announcement' - announcement.sentMessageText.contains('sending this') - announcement - } - - def "can edit an announcement"() { - setup: - def message = Fmessage.build() - def announcement = new Announcement(name: 'Test', addresses: "12345") - announcement.addToMessages(message) - announcement.save(failOnError:true, flush:true) - controller.params.ownerId = announcement.id - controller.params.name = "renamed announcement" - when: - controller.save() - def editedAnnouncement = Announcement.get(announcement.id) - then: - !Announcement.findByName('name') - editedAnnouncement.name == "renamed announcement" - } def "A announcement can be archived"() { when: @@ -78,15 +44,6 @@ class AnnouncementISpec extends grails.plugin.spock.IntegrationSpec { a.archived m.archived } - - def "list of smart groups should be included in the group list"() { - given: - def s = new SmartGroup(name:'English numbers', mobile:'+44').save(flush:true) - when: - def model = controller.create() - then: - model.groupList["smartgroup-$s.id"]?.name == 'English numbers' - model.groupList["smartgroup-$s.id"]?.addresses == [] - } + } From cb372fa0106d18b97e076ec4fe3f3da9fe6f3ce9 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 4 Dec 2012 12:01:27 +0300 Subject: [PATCH 0054/2668] Added connection error messages to messages.properties --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index a45184f16..bec88a6b5 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -46,6 +46,8 @@ connection.error.java.io.ioexception=Port threw an error: {0} connection.error.frontlinesms2.camel.exception.invalidapiidexception= {0} connection.error.frontlinesms2.camel.exception.authenticationexception= {0} connection.error.frontlinesms2.camel.exception.insufficientcreditexception={0} +connection.error.serial.nosuchportexception=Port cannot be found +connection.error.org.apache.camel.runtimecamelexception=Cannot connect to the connection connection.header=Connections connection.list.none=You have no connections configured. From dceaa094d9def3a2dcd7b7e64dae119401d017ca Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 4 Dec 2012 12:26:14 +0300 Subject: [PATCH 0055/2668] CORE-1736: Attempt to view missing contact or contact section results in redirect to index --- .../frontlinesms2/ContactController.groovy | 16 ++++++++++++ .../grails-app/i18n/messages.properties | 3 +++ .../frontlinesms2/ContactSearchService.groovy | 18 ++++++++++--- .../controller/ContactControllerISpec.groovy | 26 +++++++++++++++++++ 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index 0b702025b..be3006e72 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -79,6 +79,22 @@ class ContactController extends ControllerUtils { unusedFields.add(it) } def contactGroupInstanceList = contactInstance?.groups ?: [] + if(params.contactId && !contactInstance) { + flash.message = message(code:'contact.not.found') + redirect(action: 'show') + return false + } + else if(params.groupId && !contactList.contactsSection) { + flash.message = message(code:'group.not.found') + redirect(action: 'show') + return false + } + else if(params.smartGroupId && !contactList.contactsSection) { + flash.message = message(code:'smartgroup.not.found') + redirect(action: 'show') + return false + } + [contactInstance: contactInstance, checkedContactList: ',', contactInstanceList: contactInstanceList, diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index a45184f16..2d87c7b6b 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -337,6 +337,9 @@ contact.sent.messages={0} messages sent contact.received.messages={0} messages received contact.search.messages=Search for messages contact.select.all=Select All +contact.not.found=Contact not found +group.not.found=Group not found +smartgroup.not.found=Smart Group not found group.rename=Rename group group.edit=Edit group diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy index 3d053c64d..f0681f85e 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy @@ -12,9 +12,14 @@ class ContactSearchService { private def getContacts(params) { def searchString = getSearchString(params) if(params.groupId) { - GroupMembership.searchForContacts(asLong(params.groupId), searchString, params.sort, - params.max, - params.offset) + if (!Group.get(params.groupId)) { + return [] + } + else { + GroupMembership.searchForContacts(asLong(params.groupId), searchString, params.sort, + params.max, + params.offset) + } } else if(params.smartGroupId) { SmartGroup.getMembersByNameIlike(asLong(params.smartGroupId), searchString, [max:params.max, offset:params.offset]) } else Contact.findAllByNameIlikeOrMobileIlike(searchString, searchString, params) @@ -24,7 +29,12 @@ class ContactSearchService { def searchString = getSearchString(params) if(params.groupId) { - GroupMembership.countSearchForContacts(asLong(params.groupId), searchString) + if (!Group.get(params.groupId)) { + return 0 + } + else { + GroupMembership.countSearchForContacts(asLong(params.groupId), searchString) + } } else if(params.smartGroupId) { SmartGroup.countMembersByNameIlike(asLong(params.smartGroupId), searchString) } else Contact.countByNameIlikeOrMobileIlike(searchString, searchString) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy index d7c6e20f6..eb9de112c 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy @@ -1,6 +1,7 @@ package frontlinesms2.controller import frontlinesms2.* +import spock.lang.* import grails.converters.JSON class ContactControllerISpec extends grails.plugin.spock.IntegrationSpec { @@ -172,5 +173,30 @@ class ContactControllerISpec extends grails.plugin.spock.IntegrationSpec { stats.inboundMessagesCount == 1 stats.outboundMessagesCount == 0 } + + def "attempting to view a missing contact should forward to index"() { + when: + controller.params.contactId = 12345 + controller.show() + then: + controller.flash.message == 'Contact not found' + } + + def "attempting to view a missing group should forward to index"() { + when: + controller.params.groupId = 12345 + controller.show() + then: + controller.flash.message == 'Group not found' + } + + def "attempting to view a missing smart group should forward to index"() { + when: + controller.params.smartGroupId = 12345 + controller.show() + then: + controller.flash.message == 'Smart Group not found' + } + } From 4546545c6727e2d5762858069913e1f5f707f969 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 4 Dec 2012 12:27:15 +0300 Subject: [PATCH 0056/2668] Added new do script for uploading plugins to frontlinesms repository. --- .../frontlinesms-core/do/upload_grails_plugin | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100755 plugins/frontlinesms-core/do/upload_grails_plugin diff --git a/plugins/frontlinesms-core/do/upload_grails_plugin b/plugins/frontlinesms-core/do/upload_grails_plugin new file mode 100755 index 000000000..93a120ed7 --- /dev/null +++ b/plugins/frontlinesms-core/do/upload_grails_plugin @@ -0,0 +1,63 @@ +#!/bin/bash +set -e + +function TODO { + echo "Not yet implemented: $@" + echo "Exiting script." + exit 1; +} + +function show_usage { + cat << EOF +$0 +EOF +} + +function to_camel_case { + echo $@ | sed -r "s/[-\.](\w)/\U\1/g" +} + +function capitalise { + echo $@ | sed -r "s/(^|\s)(\w)/\1\U\2\E/g" +} + +PLUGIN_PACKAGE=org.grails.plugins +PLUGIN_NAME=`grep app.name application.properties | cut -d= -f2` +PLUGIN_NAME_CAMELCASE=`capitalise $(to_camel_case $PLUGIN_NAME)` +echo "# Got plugin camelcase name as: $PLUGIN_NAME_CAMELCASE" +PLUGIN_CLASS_FILE=${PLUGIN_NAME_CAMELCASE}GrailsPlugin.groovy +echo "# Plugin class file: $PLUGIN_CLASS_FILE" +PLUGIN_VERSION=`grep -E "def\s+version\s+=" $PLUGIN_CLASS_FILE | cut -d= -f2 | sed -E "s:[' ]::g"` +FTP_ADDRESS=dev.frontlinesms.com +FTP_PATH=`echo $PLUGIN_PACKAGE | sed -E "s:\.:/:g"` +FTP_USERNAME=$FRONTLINESMS_MAVEN_USERNAME +FTP_PASSWORD=$FRONTLINESMS_MAVEN_PASSWORD +ZIP_NAME_NEW="$PLUGIN_NAME-$PLUGIN_VERSION.zip" +ZIP_NAME_OLD="grails-$ZIP_NAME_NEW" + +echo "# Uploading plugin $PLUGIN_PACKAGE:$PLUGIN_NAME:$PLUGIN_VERSION to site $FTP_ADDRESS/$FTP_PATH..." + +echo "# Copying zip from $ZIP_NAME_OLD to $ZIP_NAME_NEW..." +cp $ZIP_NAME_OLD $ZIP_NAME_NEW +echo "# Zip copied." + +if [ -z "$PLUGIN_NAME" ]; then + show_usage + exit 1 +fi +if [ -z "$PLUGIN_VERSION" ]; then + show_usage + exit 1 +fi + +echo "# Using ftp credentials: $FTP_USERNAME:$FTP_PASSWORD" +ftp -n $FTP_ADDRESS << EOF +user $FTP_USERNAME $FTP_PASSWORD +cd org/grails/plugins/$PLUGIN_NAME +mkdir $PLUGIN_VERSION +cd $PLUGIN_VERSION +put $ZIP_NAME_NEW +exit +EOF + +echo "# Plugin uploaded" From 906ed4f7559e96861daa6271ba20f791dad39991 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 4 Dec 2012 12:27:52 +0300 Subject: [PATCH 0057/2668] Updated camel and smslib to latest versions. --- .../grails-app/conf/BuildConfig.groovy | 10 +++++----- .../grails-app/i18n/messages.properties | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 40e99d6d9..d3a0b0982 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -51,7 +51,7 @@ grails.project.dependency.resolution = { // runtime 'mysql:mysql-connector-java:5.1.16' def seleniumVersion = '2.25.0' def camel = { - def camelVersion = "2.9.2" + def camelVersion = "2.9.4" "org.apache.camel:camel-$it:$camelVersion" } @@ -66,9 +66,9 @@ grails.project.dependency.resolution = { compile 'net.frontlinesms.test:hayescommandset-test:0.0.4' // COMPILE - compile 'net.frontlinesms.core:smslib:1.1.4' - compile('net.frontlinesms.core:camel-smslib:0.0.5') { - excludes 'smslib' + //compile 'net.frontlinesms.core:smslib:1.1.4' + compile('net.frontlinesms.core:camel-smslib:0.0.7') { + //excludes 'smslib' } ['mail', 'http'].each { compile camel(it) } compile 'net.frontlinesms.core:serial:1.0.1' @@ -86,7 +86,7 @@ grails.project.dependency.resolution = { runtime ":export:1.1" runtime ":markdown:1.0.0.RC1" - runtime ':routing:1.2.2' + runtime ':routing:1.2.2-camel-2.9.4' runtime ":csv:0.3.1" compile ":quartz2:0.2.3-frontlinesms" diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 698f55af4..137f02c40 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -42,6 +42,8 @@ connection.error.org.smslib.alreadyconnectedexception=Device already connected connection.error.org.smslib.gsmnetworkregistrationexception=Failed to register with GSM network connection.error.org.smslib.invalidpinexception=Incorrect PIN supplied connection.error.org.smslib.nopinexception=PIN required but not supplied +connection.error.org.smslib.notconnectedexception={0} +connection.error.org.smslib.nosuchportexception=Port not found, or not accessible connection.error.java.io.ioexception=Port threw an error: {0} connection.error.frontlinesms2.camel.exception.invalidapiidexception= {0} connection.error.frontlinesms2.camel.exception.authenticationexception= {0} From b6e89d2ce85db9499a17aec6da833a990da35f45 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 4 Dec 2012 13:01:31 +0300 Subject: [PATCH 0058/2668] Implemented Late Registration Job --- .../grails-app/conf/BuildConfig.groovy | 2 +- .../UploadRegistrationDataJob.groovy | 58 +++++++++++++++++ .../frontlinesms2/DataUploadService.groovy | 14 +++++ .../DataUploadServiceSpec.groovy | 26 ++++++++ .../jobs/UploadRegistrationDataSpec.groovy | 62 +++++++++++++++++++ 5 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/jobs/UploadRegistrationDataSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index c72e817b4..852740958 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -72,6 +72,7 @@ grails.project.dependency.resolution = { compile 'net.frontlinesms.core:at-modem-detector:0.8' runtime 'org.rxtx:rxtx:2.1.7' runtime 'javax.comm:comm:2.0.3' + compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.5.2' } plugins { @@ -125,4 +126,3 @@ codenarc { GrailsPublicControllerMethod.enabled = false } } - diff --git a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy new file mode 100644 index 000000000..97c2c2934 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy @@ -0,0 +1,58 @@ +package frontlinesms2 + +import groovyx.net.http.HTTPBuilder +import static groovyx.net.http.ContentType.URLENC + +class UploadRegistrationDataJob { + + File regPropFile + def dataUploadService + + static final String UPLOAD_URL = "http://register.frontlinesms.com/process/" + static final String REGISTRATION_FILE = 'registration.properties' + + + static triggers = { + //simple repeatInterval: 5000l // execute job once in 5 seconds + cron name: 'RegistrationTrigger',cronExpression: '0 0 6-18 ? 1-12 MON' + } + + def execute() { + Properties properties = getRegistrationProperties() + if(!properties || properties?.isEmpty()){ + return //there is no registration data to send + } + def dataMap = convertPropertiestoMap(properties) + def registered = (dataMap['registered'] == 'true')?:false + if(registered) { + return //registration data has already been uploaded + } + try{ + dataUploadService.upload(UPLOAD_URL,dataMap) + writeRegistrationPropertiesFile(properties) + }catch(Exception e){ + e.printStackTrace() + throw new org.quartz.JobExecutionException(e) + } + } + + def getRegistrationProperties() { + regPropFile = new File(ResourceUtils.resourceDirectory, REGISTRATION_FILE) + if(!regPropFile.exists()) + return null + Properties properties = new Properties() + regPropFile.withInputStream { stream -> properties.load(stream) } + properties + } + + def writeRegistrationPropertiesFile(Properties properties) { + properties.setProperty("registered",'true'); + properties.store(new OutputStreamWriter(new FileOutputStream(regPropFile), "UTF-8"),null); + } + + def convertPropertiestoMap(Properties p) { + def m = [:] + p.each { k, v -> m[k] = v } + return m + } +} diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy new file mode 100644 index 000000000..d931dffe1 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy @@ -0,0 +1,14 @@ +package frontlinesms2 +import groovyx.net.http.HTTPBuilder +import static groovyx.net.http.ContentType.URLENC + +class DataUploadService { + + def upload(String url,Map dataToSend) { + def http = new HTTPBuilder(url) + http.post(body: dataToSend, requestContentType: URLENC ) { resp -> + assert resp.statusLine.statusCode == 200 + println resp + } + } +} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy new file mode 100644 index 000000000..42c39b566 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy @@ -0,0 +1,26 @@ +package frontlinesms2 + +import static org.junit.Assert.* + +import grails.test.mixin.* +import grails.test.mixin.support.* +import org.junit.* + +/** + * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions + */ +@TestMixin(GrailsUnitTestMixin) +class DataUploadServiceSpec { + + void setUp() { + // Setup logic here + } + + void tearDown() { + // Tear down logic here + } + + void testSomething() { + fail "Implement me" + } +} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/jobs/UploadRegistrationDataSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/jobs/UploadRegistrationDataSpec.groovy new file mode 100644 index 000000000..c930b6267 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/jobs/UploadRegistrationDataSpec.groovy @@ -0,0 +1,62 @@ +package frontlinesms2.jobs + +import spock.lang.* +import grails.test.mixin.* +import frontlinesms2.* + +class UploadRegistrationDataSpec extends Specification { + + def job + def testProps + + def setup() { + job = new UploadRegistrationDataJob() + job.metaClass.getRegistrationProperties = { -> testProps } + job.metaClass.writeRegistrationPropertiesFile = { Properties properties -> println " I haven't really written to the registration.properties file" } + } + + def "can upload registration data"() { + given: + testProps = new Properties() + testProps.setProperty('registered','false') + DataUploadService s = Mock() + job.dataUploadService = s + when: + job.execute() + then: + 1 * s.upload(_,_) + } + + def "should not upload already uploaded registration data"() { + given: + testProps = new Properties() + testProps.setProperty('registered','true') + DataUploadService s = Mock() + job.dataUploadService = s + when: + job.execute() + then: + 0 * s.upload(_,_) + } + + def "should not upload empty registration data"() { + given: + testProps = new Properties() + DataUploadService s = Mock() + job.dataUploadService = s + when: + job.execute() + then: + 0 * s.upload(_,_) + } + + def "should not upload null registration data"() { + given: + DataUploadService s = Mock() + job.dataUploadService = s + when: + job.execute() + then: + 0 * s.upload(_,_) + } +} From be8be30cc7dc7b0b91b4a95b9633c1559c3f57d0 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 4 Dec 2012 14:03:45 +0300 Subject: [PATCH 0059/2668] Reduced margin in new activity list between items (CORE-1708). --- plugins/frontlinesms-core/web-app/css/activity.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/css/activity.css b/plugins/frontlinesms-core/web-app/css/activity.css index 3c48b396d..fa1487259 100644 --- a/plugins/frontlinesms-core/web-app/css/activity.css +++ b/plugins/frontlinesms-core/web-app/css/activity.css @@ -1,4 +1,4 @@ -#modalBox.ui-dialog-content div.input.select label { margin:20px 25px 20px 25px; position:relative; display:block; cursor:pointer; padding:10px; } +#modalBox.ui-dialog-content div.input.select label { margin:5px 25px; position:relative; display:block; cursor:pointer; padding:10px; } #modalBox.ui-dialog-content div.input.select label:hover, #modalBox.ui-dialog-content div.input.select label:hover > * { background-color:#e5eff3; } #modalBox.ui-dialog-content div.input.select label input[type="radio"] { position:absolute; top:10px; left:10px; } #modalBox.ui-dialog-content div.input.select label h3 { margin-left:25px; margin-bottom:10px; font-weight:bold; } From 176b2ca0cce0c5b4ba4e87fec2c9123672e0c8f8 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 4 Dec 2012 14:07:29 +0300 Subject: [PATCH 0060/2668] CORE-1633 added more padding between individiual items in message detail view. --- plugins/frontlinesms-core/web-app/css/message.css | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/web-app/css/message.css b/plugins/frontlinesms-core/web-app/css/message.css index 7326a9056..658424f83 100644 --- a/plugins/frontlinesms-core/web-app/css/message.css +++ b/plugins/frontlinesms-core/web-app/css/message.css @@ -54,6 +54,7 @@ #tabs div.input .controls div.stats{ display:block; margin:3px;} #body.messages #detail { background-color:#d8e8ef; border-left:solid #9e9e9e 1px; padding:17px; } +#body.messages #detail #message-detail #message-info > p { margin-bottom:5px; } #body.messages #detail #message-detail-content { background-color:white; border:1px solid #B5C6CD; margin:17px 0; } #body.messages #detail #message-detail-content p { padding:17px; } #body.messages #detail #message-detail-content #no-message { text-align:center; } From 28e8d04f9633ecbe86a8f06ec5ba7c46a66ff998 Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 3 Dec 2012 16:11:50 +0300 Subject: [PATCH 0061/2668] Autoforward UI tweaks --- .../grails-app/domain/frontlinesms2/Activity.groovy | 2 +- .../domain/frontlinesms2/Autoforward.groovy | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index 01f2de20a..9736e1939 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -3,7 +3,7 @@ package frontlinesms2 abstract class Activity extends MessageOwner { //> STATIC PROPERTIES static boolean editable = { true } - static def implementations = [Announcement, Autoreply, Poll, Subscription, Webconnection, Autoforward] + static def implementations = [Announcement, Autoreply, Autoforward, Poll, Subscription, Webconnection] protected static final def NAME_VALIDATOR = { activityDomainClass -> return { val, obj -> if(obj?.deleted || obj?.archived) return true diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index a801f752c..01f9e11af 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -27,9 +27,15 @@ class Autoforward extends Activity { //> ACCESSORS int getRecipientCount() { - (contacts? contacts.size(): 0) + - (groups? (groups.collect { it.members?.size()?:0 }?.sum()): 0) + - (smartGroups? (smartGroups.collect { it.members?.size()?:0 }?.sum()): 0) + def numbers = [] + contacts.each { numbers << it.mobile } + groups.each { it.members.each { numbers << it.mobile }} + smartGroups.each { it.members.each { numbers << it.mobile }} + def totalRecipients = 0 + numbers.unique().each{ + totalRecipients++ + } + totalRecipients } //> PROCESS METHODS From 579c8951405fe6ec6a71f9debeeab9a802719e48 Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 4 Dec 2012 09:35:12 +0300 Subject: [PATCH 0062/2668] autoforward ui tweak change --- .../grails-app/domain/frontlinesms2/Autoforward.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index 01f9e11af..efd5f017d 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -31,11 +31,7 @@ class Autoforward extends Activity { contacts.each { numbers << it.mobile } groups.each { it.members.each { numbers << it.mobile }} smartGroups.each { it.members.each { numbers << it.mobile }} - def totalRecipients = 0 - numbers.unique().each{ - totalRecipients++ - } - totalRecipients + numbers.unique().size() } //> PROCESS METHODS From 5ba0a8ece414bb9227beea171ee354d1c6a4e8d1 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 4 Dec 2012 16:07:05 +0300 Subject: [PATCH 0063/2668] Made 'sent to X recipients' button in single_message_details have button styling --- .../grails-app/views/message/_single_message_details.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/message/_single_message_details.gsp b/plugins/frontlinesms-core/grails-app/views/message/_single_message_details.gsp index ce150b659..03aea027b 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_single_message_details.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_single_message_details.gsp @@ -7,7 +7,7 @@

- + From f40e5b4c69e9de93f92616e6d353c6ff2f7516a6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 4 Dec 2012 16:27:33 +0300 Subject: [PATCH 0064/2668] Updated help accordion so it is only applied to first level (FIXED CORE-1724) --- .../grails-app/views/help/main.gsp | 6 +++--- plugins/frontlinesms-core/web-app/css/help.css | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/help/main.gsp b/plugins/frontlinesms-core/grails-app/views/help/main.gsp index 10ea564c0..efb196edf 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/main.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/main.gsp @@ -5,12 +5,12 @@ function initializePopup() { $("#modalBox.help #help-content").delegate("a", "click", goToSection); $("div#help-index a:first").click(); - $.each($("#help-index > ul, #help-index li:has(ul)"), function(i, selecter) { + $.each($("#help-index > ul"), function(i, selecter) { $(selecter).accordion({ collapsible: true, heightStyle: "content", - autoHeight: false, - active: true + autoHeight: false, + active: true }); }); } diff --git a/plugins/frontlinesms-core/web-app/css/help.css b/plugins/frontlinesms-core/web-app/css/help.css index 1dc74c0ea..ff66c4cc2 100644 --- a/plugins/frontlinesms-core/web-app/css/help.css +++ b/plugins/frontlinesms-core/web-app/css/help.css @@ -7,18 +7,19 @@ #modalBox.help #help-index { padding:17px 0; } #modalBox.help #help-index > ul { line-height:200%; } +#modalBox.help #help-index > ul li:nth-child(1) a { background-image:none !important; } #modalBox.help #help-index li a, #modalBox.help #help-index li h3 { display:block; padding:5px; } #modalBox.help #help-index li.selected > a { background-color:#d8e8ef; } #modalBox.help #help-index li a:hover { background-color:#e5eff3; } #modalBox.help #help-index .ui-accordion-header { background-repeat:no-repeat; background-position:center left; text-indent:17px; cursor:pointer; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion-content { text-indent:34px; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion-content a { text-indent:0; padding-left:34px; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion .ui-accordion-header { text-indent:34px; background-position:17px center; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion .ui-accordion-content { text-indent:51px; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion .ui-accordion-content a { text-indent:0; padding-left:51px; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion .ui-accordion .ui-accordion-header { text-indent:51px; background-position:34px center; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion .ui-accordion .ui-accordion-content { text-indent:68px; } -#modalBox.help #help-index .ui-accordion .ui-accordion .ui-accordion .ui-accordion .ui-accordion-content a { text-indent:0; padding-left:68px; } +#modalBox.help #help-index .ui-accordion li ul { text-indent:34px; } +#modalBox.help #help-index .ui-accordion li ul a { text-indent:0; padding-left:34px; } +#modalBox.help #help-index .ui-accordion li ul .ui-accordion-header { text-indent:34px; background-position:17px center; } +#modalBox.help #help-index .ui-accordion li li ul { text-indent:51px; } +#modalBox.help #help-index .ui-accordion li li ul a { text-indent:0; padding-left:51px; } +#modalBox.help #help-index .ui-accordion li li li .ui-accordion-header { text-indent:51px; background-position:34px center; } +#modalBox.help #help-index .ui-accordion li li li ul { text-indent:68px; } +#modalBox.help #help-index .ui-accordion li li li ul a { text-indent:0; padding-left:68px; } #modalBox.help #help-index .ui-accordion-header.ui-state-active { background-image:url("../images/icons/accordion-expanded.png"); background-size:11px; background-position: 2% 50%; } #modalBox.help #help-index .ui-accordion-header.ui-state-default { background-image:url("../images/icons/accordion-unexpanded.png"); background-size:12px; background-position: 2% 50%; } From 9e52b78eaac2555aa437703a30c66558c6c5a350 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 4 Dec 2012 17:28:32 +0300 Subject: [PATCH 0065/2668] Minor change to spacing of Subscription class definition. --- .../grails-app/domain/frontlinesms2/Subscription.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy index 475bf334b..5f8af83d8 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy @@ -1,6 +1,6 @@ package frontlinesms2 -class Subscription extends Activity{ +class Subscription extends Activity { //> CONSTANTS static String getShortName() { 'subscription' } From 4e11d8530244ae606640187dbacbbba8a98eadcc Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 4 Dec 2012 17:41:15 +0300 Subject: [PATCH 0066/2668] updated new feature text --- .../web-app/help/core/features/new.txt | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/features/new.txt b/plugins/frontlinesms-core/web-app/help/core/features/new.txt index 5643f8234..f928245bb 100644 --- a/plugins/frontlinesms-core/web-app/help/core/features/new.txt +++ b/plugins/frontlinesms-core/web-app/help/core/features/new.txt @@ -1,15 +1,16 @@ -# FrontlineSMS v 2.2.0 -## Subscriptions -A subscriptions allows users to join groups by texting in messages that match certain specified keywords. Subscriptions allows users to text in messages specifically for joining and leaving a group. For example, a user may text on 'join' to join a group or 'leave' to leave a group. Support for two keyword subscriptions is offered, where a user can text in 'Football join' to join the group or 'Football leave' to leave the group. +# New features in FrontlineSMS v 2.2.0 +## New activities +### Subscriptions +This activity allows users to add and remove themselves from groups by texting in certain keywords. For example, a user may text on 'join' to join a group or 'leave' to leave a group. This means that, for example, they can choose to join groups that control recipients of certain alerts or information, such as events listings; or could sign up as volunteers. -## Webconnections -A FrontlineSMS deployment instance can upload messages to a specified url, using an activity called Webconnection. +### Web Connections +This activity allows you to set up a connection to a web-based server or service, such as Ushahidi or Twitter. A FrontlineSMS deployment instance can upload messages to a specified url, and an incoming action, like a piece of data pushed from a database, can trigger an outbound SMS. We have included a custom integration with Ushahidi and Crowdmap, so that users can easily link their FrontlineSMS instance to the popular mapping platform. -## Ushahidi -Related to Web Cconnection is the Ushahidi Web Connection. This activity uploads messages that match certain keywords to an ushahidi or crowdmap instance. +##Improvements +We have made a major improvement to the way keywords function, so that you can make it simpler for your users to text you. -## Multiple keywords for activities -Autoreply, Poll, Webconnection and subcriptions now support use of more than one keyword. The activities will hence accept messages that match a wider range of keywrds. - -With regard to Polls, keywords allows users to text in single word messages, so as to submit an etry into a poll. Support for twe keyword polls is offered, where a user can text in 'Food pie' for Pir or 'Food soda' for Soda. +### Multiple keywords for activities +Autor-eplies, Polls, Web Connections and Subscriptions now allow you to list more that one keyword to trigger a specific activity. This means  you can support more than one language or spelling of a word. +### Single keywords in Poll +Similarly, Polls now optionally allows you to set only one keyword for poll responses - so answers could just be YES, NO, or whatever multiple choice answer you set. You can still set two-level keywords, for example in the poll about food, sample answers might be FOOD PIE or FOOD SODA. The new single keyword setting allows you simply to text in PIE or SODA \ No newline at end of file From d10a1af0332060106a1b43df6ac902f762148fea Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 4 Dec 2012 18:00:55 +0300 Subject: [PATCH 0067/2668] CORE-1760: fixed - Autoforward edit saves new instance instead of updating --- .../AutoforwardController.groovy | 2 +- .../AutoforwardControllerISpec.groovy | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy index 530327361..a3ebce60a 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy @@ -10,6 +10,6 @@ class AutoforwardController extends ActivityController { } } - private def withAutoforward = withDomainObject Autoforward + private def withAutoforward = withDomainObject Autoforward, { params.ownerId } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy index 8819991fe..d3d9fb02a 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy @@ -24,4 +24,23 @@ class AutoforwardControllerISpec extends grails.plugin.spock.IntegrationSpec { Autoforward.findByName('Forward') controller.flash.message == i18nUtilService.getMessage([code:"autoforward.save.success", args:[Autoforward.findByName('Forward').name]]) } + + def 'Editing a autoforward should persist changes'(){ + setup: + def contact = new Contact(name:"Contact", mobile:"+123321").save() + def autoforward = new Autoforward(name: "test", sentMessageText: "Someone said something") + .addToContacts(contact) + .save(failOnError:true) + controller.params.messageText = "Forward this message" + controller.params.name = "Forward" + controller.params.addresses = ['123123','6867896789'] + controller.params.keywords = 'try,again' + controller.params.ownerId = autoforward.id + when: + controller.save() + then: + Autoforward.count() == 1 + Autoforward.findByName('Forward') + controller.flash.message == i18nUtilService.getMessage([code:"autoforward.save.success", args:[Autoforward.findByName('Forward').name]]) + } } \ No newline at end of file From 20d946ad64365af261c0ad06d048f32413316518 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 5 Dec 2012 09:46:34 +0300 Subject: [PATCH 0068/2668] Dropped FrontlineApi1Utils --- .../activity/webconnection/_list_head.gsp | 1 - .../api/FrontlineApi1Utils.groovy | 17 ---------- .../test/unit/FrontlineApi1UtilsSpec.groovy | 31 ------------------- 3 files changed, 49 deletions(-) delete mode 100644 plugins/frontlinesms-core/src/groovy/frontlinesms2/api/FrontlineApi1Utils.groovy delete mode 100644 plugins/frontlinesms-core/test/unit/FrontlineApi1UtilsSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp index 0af241320..8675ca5e3 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp @@ -1,4 +1,3 @@ -<%@ page import="frontlinesms2.api.FrontlineApi1Utils" %>

    diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/api/FrontlineApi1Utils.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/api/FrontlineApi1Utils.groovy deleted file mode 100644 index 1a56796ce..000000000 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/api/FrontlineApi1Utils.groovy +++ /dev/null @@ -1,17 +0,0 @@ -package frontlinesms2.api - -/** - * Helper utils for version 1 of the FrontlineSMS api - */ -class FrontlineApi1Utils { - static final String apiUrlMapping = '/api/1/$entityClassApiUrl/$entityId/' // without secret - - static String generateUrl(FrontlineApi domainInstance) { - def url = "" - if(domainInstance.apiEnabled)//domainInstance.isApiEnabled()) - url = apiUrlMapping.replace('$entityClassApiUrl', domainInstance.getClass().apiUrl) - url = url.replace('$entityId', "${domainInstance.id}") - return url - } -} - diff --git a/plugins/frontlinesms-core/test/unit/FrontlineApi1UtilsSpec.groovy b/plugins/frontlinesms-core/test/unit/FrontlineApi1UtilsSpec.groovy deleted file mode 100644 index 84f3014c8..000000000 --- a/plugins/frontlinesms-core/test/unit/FrontlineApi1UtilsSpec.groovy +++ /dev/null @@ -1,31 +0,0 @@ -import spock.lang.* -import frontlinesms2.* -import frontlinesms2.api.* - -@Mock(frontlinesms2.GenericWebconnection) - -class FrontlineApi1UtilsSpec extends Specification { - - def "Generate url for generic web connection with enabled api should produce url without secret"() { - setup: - def webCon = new GenericWebconnection(apiEnabled:true) - webCon.id = 123 - webCon.apiEnabled = true - when: - def url = FrontlineApi1Utils.generateUrl(webCon) - then: - url == "/api/1/webconnection/123/" - } - - def "Generate url for generic web connection with disabled api should produce empty string"() { - setup: - def webCon = new GenericWebconnection() - webCon.id = 123 - webCon.apiEnabled = false - when: - def url = FrontlineApi1Utils.generateUrl(webCon) - then: - url == "" - } -} - From 11901008763c8d6c3072633c181fb3cf80020bd6 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 5 Dec 2012 09:53:57 +0300 Subject: [PATCH 0069/2668] AutoforwardSpec fixes --- .../test/unit/frontlinesms2/AutoforwardSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy index 908c04c58..7d1868709 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy @@ -62,7 +62,7 @@ class AutoforwardSpec extends Specification { def 'getRecipientCount() should count group members and contacts'() { given: def a = new Autoforward(name:'recipient counter') - if(contacts) a.contacts = (1..contacts).collect { Contact.build() } + if(contacts) a.contacts = (1..contacts).collect { Contact.build(mobile:"+123${Contact.count()}") } if(groups) a.groups = (1..groups).collect { mockGroup(groupMembers) } def sg = [] if(smartGroups) sg = (1..smartGroups).collect { def smrt = mockSmartGroup(smartGroupMembers); println "smrt.members=$smrt.members"; return smrt } @@ -102,7 +102,7 @@ class AutoforwardSpec extends Specification { private def mockMembers(gClass, memberCount) { def g = Mock(gClass) if(memberCount) { - def members = (1..memberCount).collect { Contact.build() } + def members = (1..memberCount).collect { Contact.build(mobile:"+123${Contact.count()}") } println "mockMembers() :: members=$members" g.members >> { members } println "mockMembers() :: g.members=$g.members" From bb9a07e77daa0bb5103e57736ddeea1b522307b5 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 5 Dec 2012 10:40:46 +0300 Subject: [PATCH 0070/2668] Corrected spelling mistake in new.txt --- plugins/frontlinesms-core/web-app/help/core/features/new.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/features/new.txt b/plugins/frontlinesms-core/web-app/help/core/features/new.txt index f928245bb..4dc42fc78 100644 --- a/plugins/frontlinesms-core/web-app/help/core/features/new.txt +++ b/plugins/frontlinesms-core/web-app/help/core/features/new.txt @@ -10,7 +10,7 @@ This activity allows you to set up a connection to a web-based server or service We have made a major improvement to the way keywords function, so that you can make it simpler for your users to text you. ### Multiple keywords for activities -Autor-eplies, Polls, Web Connections and Subscriptions now allow you to list more that one keyword to trigger a specific activity. This means  you can support more than one language or spelling of a word. +Auto-replies, Polls, Web Connections and Subscriptions now allow you to list more that one keyword to trigger a specific activity. This means  you can support more than one language or spelling of a word. ### Single keywords in Poll Similarly, Polls now optionally allows you to set only one keyword for poll responses - so answers could just be YES, NO, or whatever multiple choice answer you set. You can still set two-level keywords, for example in the poll about food, sample answers might be FOOD PIE or FOOD SODA. The new single keyword setting allows you simply to text in PIE or SODA \ No newline at end of file From fc670401190b2d1c63fb3eb1ae6f9ccdc639a243 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 5 Dec 2012 12:12:49 +0300 Subject: [PATCH 0071/2668] added USA sending option to clickatel wizard --- .../frontlinesms2/ClickatellFconnection.groovy | 14 ++++++++++++-- .../grails-app/i18n/messages.properties | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index 712355281..5ec753550 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -9,14 +9,23 @@ import frontlinesms2.camel.exception.* class ClickatellFconnection extends Fconnection { private static final String CLICKATELL_URL = 'http://api.clickatell.com/http/sendmsg?' - static final configFields = ['name', 'apiId', 'username', 'password'] + static final configFields = [name:null, apiId:null, username:null, password:null, sendToUsa:['fromNumber']] static final defaultValues = [] static String getShortName() { 'clickatell' } String apiId String username String password // FIXME maybe encode this rather than storing plaintext + boolean sendToUsa + String fromNumber + static constraints = { + fromNumber(nullable: true, validator: { val, obj -> + println "checking them constraints..... and returning ${!obj.sendToUsa || val}" + return !obj.sendToUsa || val + }) + } + static passwords = ['password'] static mapping = { @@ -39,7 +48,8 @@ class ClickatellFconnection extends Fconnection { 'user=${header.clickatell.username}&' + 'password=${header.clickatell.password}&' + 'to=${header.clickatell.dst}&' + - 'text=${body}')) + 'text=${body}' + + (sendToUsa ? '&mo=1&from=${header.clickatell.fromNumber}' : ''))) .to(CLICKATELL_URL) .process(new ClickatellPostProcessor()) .routeId("out-internet-${ClickatellFconnection.this.id}")] diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index c7c22bf16..2bb6b5481 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -205,6 +205,8 @@ clickatellfconnection.name.label=Name clickatellfconnection.apiId.label=API ID clickatellfconnection.username.label=Username clickatellfconnection.password.label=Password +clickatellfconnection.sendToUsa.label=Send to USA +clickatellfconnection.fromNumber.label=From Number clickatellfconnection.description=Send an receive messages through a Clickatell account clickatellfconnection.global.info=You will need to configure an account with Clickatell (www.clickatell.com). From bb945bb8c263c7c9a4014b70a1fc5bb73933d9eb Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 5 Dec 2012 12:46:40 +0300 Subject: [PATCH 0072/2668] Refactored JS for recipient selection wizard step. --- .../grails-app/conf/CoreResources.groovy | 1 + .../views/announcement/_validate.gsp | 2 +- .../views/autoforward/_validate.gsp | 2 +- .../views/message/_select_recipients.gsp | 167 +----------------- .../grails-app/views/poll/_validate.gsp | 2 +- .../grails-app/views/quickMessage/create.gsp | 6 +- .../web-app/js/recipient_selecter.js | 165 +++++++++++++++++ 7 files changed, 178 insertions(+), 167 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/js/recipient_selecter.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 0ffe09eb7..7a10da30d 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -33,6 +33,7 @@ modules = { resource url:[dir:'js', file:"mediumPopup.js"], disposition:'head' resource url:[dir:'js', file:"new_features.js"], disposition:'head' resource url:[dir:'js', file:"pagination.js"], disposition:'head' + resource url:[dir:'js', file:"recipient_selecter.js"], disposition:'head' resource url:[dir:'js', file:"smallPopup.js"], disposition:'head' resource url:[dir:'js', file:"status_indicator.js"], disposition:'head' resource url:[dir:'js', file:"system_notification.js"], disposition:'head' diff --git a/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp index 44bebaae4..3f963a408 100644 --- a/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp @@ -31,7 +31,7 @@ var recepientTabValidation = function() { var valid = true; - addAddressHandler(); + recipientSelecter.addAddressHandler(); valid = $('input[name=addresses]:checked').length > 0; var addressListener = function() { if($('input[name=addresses]:checked').length > 0) { diff --git a/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp index 2dc5cc0bd..b8d76926d 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp @@ -29,7 +29,7 @@ var recipientTabValidation = function() { var valid = false; - addAddressHandler(); + recipientSelecter.addAddressHandler(); valid = ($('input[name=addresses]:checked').length > 0) || ($('input[name=groups]:checked').length > 0); return valid; }; diff --git a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp index 424b6d75b..178936944 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp @@ -3,8 +3,8 @@
    - - + +
    @@ -12,7 +12,7 @@
    • - +
      • @@ -26,7 +26,7 @@
      • - + : ${contact.mobile} @@ -43,166 +43,9 @@

0
- - var groupAndMembers = {} - function selectMembers(element, groupIdString, groupName, allContacts) { - var contactMobileNumbers = {}; - $.each($('#mobileNumbers').val().split(','), function(index, value) { - if(!(value in contactMobileNumbers) && (value != '')){ - contactMobileNumbers[value] = true; - } - }); - - if($(element).attr('checked')){ - $.each(allContacts, function(index, value) { - if(!(value in contactMobileNumbers)){ - contactMobileNumbers[value] = true; - } - }); - } else { - $.each(allContacts, function(index, value) { - if(value in contactMobileNumbers){ - if(! inCheckedGroup(value)){ - delete contactMobileNumbers[value]; - } - } - }); - } - - var mobileNumbers = $.map(contactMobileNumbers, function(index, value){ - return value; - }); - - $('#mobileNumbers').val(($.makeArray(mobileNumbers).join(','))); - - updateRecipientCount(); - } - - function inCheckedGroup(value){ - var checkedGroups = $('li.group input:checked'); - var t = false; - $.each(checkedGroups, function(index, element){ - if($.inArray(value, $.makeArray($(element).attr('groupMembers')))){ - t = true; - } - }); - return t; - } - - function setContact(element,contactNumber) { - var contactMobileNumbers = {}; - $.each($('#mobileNumbers').val().split(','), function(index, value) { - if(!(value in contactMobileNumbers) && (value != '')){ - contactMobileNumbers[value] = true; - } - }); - - if($(element).attr('checked')){ - if(!(contactNumber in contactMobileNumbers)){ - contactMobileNumbers[contactNumber] = true; - } - } else { - if(contactNumber in contactMobileNumbers){ - if(! inCheckedGroup(contactNumber)){ - delete contactMobileNumbers[contactNumber]; - } - } - } - - var mobileNumbers = $.map(contactMobileNumbers, function(index, value){ - return value; - }); - - $('#mobileNumbers').val(($.makeArray(mobileNumbers).join(','))); - - updateRecipientCount(); - } - - function setValueForCheckBox(value, checked) { - var checkBox = $('#contacts input[value=' + "'" + value + "'" + ']'); - checkBox.attr('checked', checked); - checkBox.change(); - } - - function updateRecipientCount() { - var mobileNumbersArray; - if($('#mobileNumbers').val() != ""){ - mobileNumbersArray = $('#mobileNumbers').val().split(','); - } - var contactCount = mobileNumbersArray? mobileNumbersArray.length:0 ; - $('#contacts-count').html(contactCount); - $('#messages-count').html(contactCount); - $("#recipient-count").html(contactCount); - } - - function validateAddressEntry() { - var address = $('#address').val(); - var containsLetters = jQuery.grep(address, function(a) { - return a.match(/[^\+?\d+]/) != null; - }).join(''); - $("#address").removeClass('error'); - $("#manual-address").find('#address-error').remove(); - if(containsLetters != '' && containsLetters != null) { - $("#address").addClass('error'); - $("#manual-address").append("
"); - return false; - } else { - return true; - } - } - - function addAddressHandler() { - var address = $('#address').val(); - if(address == '') { - return true; - } else { - var sanitizedAddress = address.replace(/\D/g, ''); - if(address[0] == '+') sanitizedAddress = '+' + sanitizedAddress; - var checkbox = $("li.manual").find(":checkbox[value=" + sanitizedAddress + "]").val(); - if(checkbox !== address) { - $("#contacts").prepend("
  • " + sanitizedAddress + "
    • ") - $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").trigger('click'); - $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").attr('checked','checked'); - updateRecipientCount(); - } - $('#address').val(""); - $("#address").removeClass('error'); - $("#manual-address").find('#address-error').remove(); - return true; - } - return false; - } - - function searchForContacts() { - var search = $('#searchbox').val().toLowerCase(); - if (search == "" ) - { - $('li.contact').show(); - $('ul#groups').show(); - $('.matched-search-result').hide(); - } - else - { - $('ul#groups').hide(); - $('.ui-tabs-panel #recipients-list ul#contacts li.contact').each(function () { - if($(this).attr('f-name').toLowerCase().indexOf(search.toLowerCase()) == -1 - && $(this).attr('f-number').toLowerCase().indexOf(search.toLowerCase()) == -1) - { - $(this).hide(); - $(this).find('.matched-search-result').hide(); - } - else - { - $(this).show(); - $(this).find('.matched-search-result').show(); - } - }); - } - } -     diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index c0a03ecb9..09d2e254a 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -103,7 +103,7 @@ var recipientTabValidation = function() { if(!isGroupChecked('dontSendMessage')) { var valid = false; - addAddressHandler(); + recipientSelecter.addAddressHandler(); valid = $("#recipient-count").html() > 0; var addressListener = function() { if($("#recipient-count").html() > 0) { diff --git a/plugins/frontlinesms-core/grails-app/views/quickMessage/create.gsp b/plugins/frontlinesms-core/grails-app/views/quickMessage/create.gsp index 058e82302..caf0a70e5 100644 --- a/plugins/frontlinesms-core/grails-app/views/quickMessage/create.gsp +++ b/plugins/frontlinesms-core/grails-app/views/quickMessage/create.gsp @@ -36,21 +36,23 @@ function initializePopup() { $("#tabs-1").contentWidget({ validate: function() { - updateRecipientCount(); + recipientSelecter.updateRecipientCount(); return true; } }); $("#tabs-2").contentWidget({ validate: function() { - addAddressHandler(); + recipientSelecter.addAddressHandler(); return ($("#recipient-count").html() > 0); } }); } + // TODO should have a js class dedicated to managing flash messages function addFlashMessage(data) { $("#notifications .flash").remove(); $("#notifications").prepend("
    " + data + "x
    "); } + diff --git a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js new file mode 100644 index 000000000..256dadc98 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js @@ -0,0 +1,165 @@ +var recipientSelecter = (function() { + var addAddressHandler, updateRecipientCount, searchForContacts, selectMembers, setContact, validateAddressEntry; + + function inCheckedGroup(value) { + var checkedGroups, t; + checkedGroups = $("li.group input:checked"); + t = false; + $.each(checkedGroups, function(index, element) { + if($.inArray(value, $.makeArray($(element).attr("groupMembers")))) { + t = true; + } + }); + return t; + } + + selectMembers = function(element, groupIdString, groupName, allContacts) { + var mobileNumbers, contactMobileNumbers = {}; + $.each($("#mobileNumbers").val().split(","), function(index, value) { + if(value !== "" && !(value in contactMobileNumbers)) { + contactMobileNumbers[value] = true; + } + }); + + if($(element).attr("checked")) { + $.each(allContacts, function(index, value) { + if(!(value in contactMobileNumbers)) { + contactMobileNumbers[value] = true; + } + }); + } else { + $.each(allContacts, function(index, value) { + if(value in contactMobileNumbers) { + if(!inCheckedGroup(value)) { + delete contactMobileNumbers[value]; + } + } + }); + } + + mobileNumbers = $.map(contactMobileNumbers, function(index, value) { + return value; + }); + + $("#mobileNumbers").val(($.makeArray(mobileNumbers).join(","))); + + updateRecipientCount(); + }; + + setContact = function(element, contactNumber) { + var mobileNumbers, contactMobileNumbers = {}; + $.each($("#mobileNumbers").val().split(","), function(index, value) { + if(!(value in contactMobileNumbers) && (value != "")) { + contactMobileNumbers[value] = true; + } + }); + + if($(element).attr("checked")) { + if(!(contactNumber in contactMobileNumbers)) { + contactMobileNumbers[contactNumber] = true; + } + } else { + if(contactNumber in contactMobileNumbers) { + if(! inCheckedGroup(contactNumber)) { + delete contactMobileNumbers[contactNumber]; + } + } + } + + mobileNumbers = $.map(contactMobileNumbers, function(index, value) { + return value; + }); + + $("#mobileNumbers").val(($.makeArray(mobileNumbers).join(","))); + + updateRecipientCount(); + } + + // FIXME current this method is unused + function setValueForCheckBox(value, checked) { + var checkBox = $("#contacts input[value='" + value + "']"); + checkBox.attr("checked", checked); + checkBox.change(); + } + + updateRecipientCount = function() { + var contactCount, mobileNumbersArray; + if($("#mobileNumbers").val() != "") { + mobileNumbersArray = $("#mobileNumbers").val().split(","); + } + contactCount = mobileNumbersArray? mobileNumbersArray.length:0 ; + $("#contacts-count").html(contactCount); + $("#messages-count").html(contactCount); + $("#recipient-count").html(contactCount); + }; + + validateAddressEntry = function() { + var address, containsLetters; + address = $("#address").val(); + containsLetters = jQuery.grep(address, function(a) { + return a.match(/[^\+?\d+]/) != null; + }).join(""); + $("#address").removeClass("error"); + $("#manual-address").find("#address-error").remove(); + if(containsLetters != "" && containsLetters != null) { + $("#address").addClass("error"); + $("#manual-address").append("
    "); + return false; + } + return true; + } + + addAddressHandler = function() { + var address, checkbox, sanitizedAddress; + address = $("#address").val(); + if(address === "") { + return true; + } + sanitizedAddress = address.replace(/\D/g, ""); + if(address[0] === "+") { + sanitizedAddress = "+" + sanitizedAddress; + } + checkbox = $("li.manual").find(":checkbox[value=" + sanitizedAddress + "]").val(); + if(checkbox !== address) { + $("#contacts").prepend("
  • " + sanitizedAddress + "
    • "); + $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").trigger('click'); + $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").attr('checked','checked'); + updateRecipientCount(); + } + $("#address").val(""); + $("#address").removeClass("error"); + $("#manual-address").find("#address-error").remove(); + return true; + }; + + searchForContacts = function() { + var search = $("#searchbox").val().toLowerCase(); + if(search === "") { + $("li.contact").show(); + $("ul#groups").show(); + $(".matched-search-result").hide(); + } else { + $("ul#groups").hide(); + $(".ui-tabs-panel #recipients-list ul#contacts li.contact").each(function () { + if($(this).attr("f-name").toLowerCase().indexOf(search.toLowerCase()) == -1 + && $(this).attr("f-number").toLowerCase().indexOf(search.toLowerCase()) == -1) { + $(this).hide(); + $(this).find(".matched-search-result").hide(); + } else { + $(this).show(); + $(this).find(".matched-search-result").show(); + } + }); + } + } + + return { + addAddressHandler:addAddressHandler, + updateRecipientCount:updateRecipientCount, + searchForContacts:searchForContacts, + selectMembers:selectMembers, + setContact:setContact, + validateAddressEntry:validateAddressEntry + }; +}()); + From 8aab87d037be9806c21c3ef769746110a4d061ef Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 5 Dec 2012 12:47:08 +0300 Subject: [PATCH 0073/2668] Implemented simple trigger for UploadRegistrationDataJob --- .../UploadRegistrationDataJob.groovy | 20 +++++++++++-------- .../frontlinesms2/DataUploadService.groovy | 9 +++++---- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy index 97c2c2934..eb8f7700b 100644 --- a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy +++ b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/UploadRegistrationDataJob.groovy @@ -1,8 +1,5 @@ package frontlinesms2 -import groovyx.net.http.HTTPBuilder -import static groovyx.net.http.ContentType.URLENC - class UploadRegistrationDataJob { File regPropFile @@ -13,26 +10,33 @@ class UploadRegistrationDataJob { static triggers = { - //simple repeatInterval: 5000l // execute job once in 5 seconds - cron name: 'RegistrationTrigger',cronExpression: '0 0 6-18 ? 1-12 MON' + long week = 7 * 24 * 3600 * 1000 // execute job once in 7 days + simple name:'RegistrationUpload', startDelay:0, repeatInterval:week, repeatCount:1 } def execute() { + println "UploadRegistrationDataJob: Attempting to upload registration data..." Properties properties = getRegistrationProperties() if(!properties || properties?.isEmpty()){ + println "SKIPPED : Registration data not available!" return //there is no registration data to send } def dataMap = convertPropertiestoMap(properties) def registered = (dataMap['registered'] == 'true')?:false if(registered) { + println "SKIPPED : Registration data has already been uploaded!" return //registration data has already been uploaded } try{ - dataUploadService.upload(UPLOAD_URL,dataMap) + boolean success = dataUploadService.upload(UPLOAD_URL,dataMap) + if(!success){ + println "FAILED : Registration data upload NOT successful, check your Internet connection!" + return + } writeRegistrationPropertiesFile(properties) + println "SUCCESS : Successfully uploaded registration data!" }catch(Exception e){ - e.printStackTrace() - throw new org.quartz.JobExecutionException(e) + println "FAILED : Registration data upload NOT successful, check your Internet connection!" } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy index d931dffe1..9d764587c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy @@ -4,11 +4,12 @@ import static groovyx.net.http.ContentType.URLENC class DataUploadService { - def upload(String url,Map dataToSend) { + def upload(String url, Map dataToSend) { def http = new HTTPBuilder(url) - http.post(body: dataToSend, requestContentType: URLENC ) { resp -> - assert resp.statusLine.statusCode == 200 - println resp + boolean success = false + http.post(body: dataToSend, requestContentType:URLENC) { resp -> + success = resp.statusLine.statusCode == 200 } + success } } From ca34a76c9ce15487d11da235d3e68570252543c0 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 5 Dec 2012 12:48:36 +0300 Subject: [PATCH 0074/2668] Implemented simple trigger for UploadRegistrationDataJob --- .../DataUploadServiceSpec.groovy | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy deleted file mode 100644 index 42c39b566..000000000 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/DataUploadServiceSpec.groovy +++ /dev/null @@ -1,26 +0,0 @@ -package frontlinesms2 - -import static org.junit.Assert.* - -import grails.test.mixin.* -import grails.test.mixin.support.* -import org.junit.* - -/** - * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions - */ -@TestMixin(GrailsUnitTestMixin) -class DataUploadServiceSpec { - - void setUp() { - // Setup logic here - } - - void tearDown() { - // Tear down logic here - } - - void testSomething() { - fail "Implement me" - } -} From e911da83e5ae1b65ee8c9a7be5fee70653a9b71e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 5 Dec 2012 14:45:03 +0300 Subject: [PATCH 0075/2668] Fixed recipient selecter for new numbers. --- plugins/frontlinesms-core/web-app/js/recipient_selecter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js index 256dadc98..f37ae5c67 100644 --- a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js +++ b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js @@ -121,7 +121,7 @@ var recipientSelecter = (function() { } checkbox = $("li.manual").find(":checkbox[value=" + sanitizedAddress + "]").val(); if(checkbox !== address) { - $("#contacts").prepend("
  • " + sanitizedAddress + "
    • "); + $("#contacts").prepend("
  • " + sanitizedAddress + "
    • "); $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").trigger('click'); $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").attr('checked','checked'); updateRecipientCount(); From b4a4d5454c98d20a2d06e3619c658eb18c896d1f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 5 Dec 2012 14:45:03 +0300 Subject: [PATCH 0076/2668] Fixed recipient selecter for new numbers. --- plugins/frontlinesms-core/web-app/js/recipient_selecter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js index 256dadc98..f37ae5c67 100644 --- a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js +++ b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js @@ -121,7 +121,7 @@ var recipientSelecter = (function() { } checkbox = $("li.manual").find(":checkbox[value=" + sanitizedAddress + "]").val(); if(checkbox !== address) { - $("#contacts").prepend("
  • " + sanitizedAddress + "
    • "); + $("#contacts").prepend("
  • " + sanitizedAddress + "
    • "); $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").trigger('click'); $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").attr('checked','checked'); updateRecipientCount(); From 1603bffd40e7eabe829ae443d56e115905d44b51 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Wed, 5 Dec 2012 15:46:52 +0300 Subject: [PATCH 0077/2668] Fixed failing WebconnectionControllerISpec tests --- .../WebconnectionController.groovy | 6 +-- .../frontlinesms2/ControllerUtils.groovy | 3 +- .../GenericWebconnectionCedSpec.groovy | 5 --- .../WebconnectionControllerISpec.groovy | 38 +++++++++++++++++-- .../domain/UshahidiWebconnectionISpec.groovy | 22 ----------- 5 files changed, 39 insertions(+), 35 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index 0281b7c5b..4fbcd8c3b 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -28,15 +28,13 @@ class WebconnectionController extends ActivityController { } def testRoute() { - println "<<<>>> $params" withWebconnection { webconnectionInstance -> doSave('webconnection', webconnectionService, webconnectionInstance, false) - if(webconnectionService) TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) + if(webconnectionService) TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) } } def checkRouteStatus() { - println "<<>> $params" def webconnectionInstance = Webconnection.get(params.ownerId) def response = [ownerId:params.ownerId, ok:true] if(webconnectionInstance) { @@ -47,6 +45,6 @@ class WebconnectionController extends ActivityController { render response as JSON } - private def withWebconnection = withDomainObject WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType] + private def withWebconnection = withDomainObject WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType], { params.ownerId } } diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy index 4f1a766ec..2fa5e3913 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy @@ -4,7 +4,8 @@ class ControllerUtils { def withDomainObject(domainClass, Closure objectIdFetcher={ params.id }, Closure onFail=null) { return { c -> if(domainClass instanceof Closure) domainClass = domainClass.call() - def objectId = objectIdFetcher.call() + def objectId = objectIdFetcher.call() + println "domainClass::: $domainClass" def o = objectId? domainClass.get(objectId): domainClass.newInstance() if(o) c.call(o) else { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy index 64ceac537..c0a1ec310 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy @@ -155,11 +155,6 @@ class GenericWebconnectionCedSpec extends WebconnectionBaseSpec { next.click() then: waitFor { confirmTab.displayed } - when: - confirmTab.name = "my ext cmd" - submit.click() - then: - waitFor { summary.displayed } testConnectionButton.displayed } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy index d2e4e639c..c24eb5dec 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy @@ -10,6 +10,9 @@ import grails.converters.JSON class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller def trashService + def withUshahidiWebconnection = { c -> c.call(UshahidiWebconnection.get(controller.params.ownerId) ?: UshahidiWebconnection.newInstance()) } + def withGenericWebconnection = { c -> c.call(GenericWebconnection.get(controller.params.ownerId) ?: GenericWebconnection.newInstance()) } + //TODO Asserts need refractoring def setup() { controller = new WebconnectionController() @@ -23,6 +26,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.keywords = "keyword" controller.params.webconnectionType = "ushahidi" controller.params.key = '12345678' + controller.withWebconnection = withUshahidiWebconnection when: controller.save() then: @@ -42,6 +46,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "generic" controller.params.'param-name' = 'username' controller.params.'param-value' = 'bob' + controller.withWebconnection = withGenericWebconnection when: controller.save() then: @@ -64,6 +69,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "generic" controller.params.'param-name' = ['username', 'password'] as String[] controller.params.'param-value' = ['bob','secret'] as String[] + controller.withWebconnection = withGenericWebconnection when: controller.save() webconnection.refresh() @@ -91,6 +97,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "generic" controller.params.'param-name' = "username" controller.params.'param-value' = "geoffrey" + controller.withWebconnection = withGenericWebconnection when: controller.save() then: @@ -103,21 +110,22 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { def "should not save requestParameters without a name value"() { setup: def keyword = new Keyword(value:'AWESOME') - def webconnection = new GenericWebconnection(name:"Ushahidi", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword) + def webconnection = new GenericWebconnection(name:"Generic", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword) webconnection.addToRequestParameters(new RequestParameter(name:"name", value:'${name}')) webconnection.addToRequestParameters(new RequestParameter(name:"age", value:'${age}')) webconnection.save(failOnError:true) controller.params.ownerId = webconnection.id - controller.params.name = "Ushahidi Connection" + controller.params.name = "Generic Connection" controller.params.keywords = "Test" controller.params.httpMethod = "post" controller.params.'param-name' = "" controller.params.webconnectionType = "generic" controller.params.'param-value' = "geoffrey" + controller.withWebconnection = withGenericWebconnection when: controller.save() then: - webconnection.name == "Ushahidi Connection" + webconnection.name == "Generic Connection" !webconnection.requestParameters } @@ -133,6 +141,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "ushahidi" controller.params.httpMethod = "get" controller.params.key = "get" + controller.withWebconnection = withUshahidiWebconnection when: controller.save() then: @@ -156,6 +165,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "ushahidi" controller.params.httpMethod = "get" controller.params.key = "get" + controller.withWebconnection = withUshahidiWebconnection when: controller.save() then: @@ -176,6 +186,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "ushahidi" controller.params.httpMethod = "get" controller.params.key = "get" + controller.withWebconnection = withUshahidiWebconnection when: controller.params.sorting = sorting controller.save() @@ -188,4 +199,25 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { "enabled"|"TEST,TESTING" "disabled"|null } + + + def 'can edit an existing ushahidi web connection'(){ + given: + def keyword = new Keyword(value:'USHAHIDI') + def webConnectionInstance = new UshahidiWebconnection(name:"Trial", url:"https://trial.crowdmap.com", httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword).save(failOnError:true) + controller.params.ownerId = webConnectionInstance.id + controller.params.webconnectionType = 'ushahidi' + controller.params.name = 'Trial' + controller.params.url = 'https://frontlineCrowd.crowdmap.com' + controller.params.key = '2343asdasd' + controller.params.keyword = 'Repo' + controller.withWebconnection = withUshahidiWebconnection + when: + controller.save() + then: + def connection = UshahidiWebconnection.findByName('Trial') + connection.name == "Trial" + connection.url == "https://frontlineCrowd.crowdmap.com" + connection.requestParameters*.value.containsAll(["2343asdasd"]) + } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy index 7f32fd467..fbc691cf6 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy @@ -33,26 +33,4 @@ class UshahidiWebconnectionISpec extends grails.plugin.spock.IntegrationSpec { then: 1 * webCService.send(incomingMessage) } - - def 'can edit an existing ushahidi web connection'(){ - given: 'an UshahidiWebconnection exists' - def keyword = new Keyword(value:'USHAHIDI') - def webConnectionInstance = new UshahidiWebconnection(name:"Trial", url:"https://trial.crowdmap.com", httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword).save(failOnError:true) - and: - def controller = new WebconnectionController() - when: 'new parameters are passed' - controller.params.ownerId = webConnectionInstance.id - controller.params.webconnectionType = 'ushahidi' - controller.params.name = 'Trial' - controller.params.url = 'https://frontlineCrowd.crowdmap.com' - controller.params.key = '2343asdasd' - controller.params.keyword = 'Repo' - and: 'save action is called' - controller.save() - then: 'existing UshahidiWebconnection properties should have changed' - def connection = UshahidiWebconnection.findByName('Trial') - connection.name == "Trial" - connection.url == "https://frontlineCrowd.crowdmap.com" - connection.requestParameters*.value.containsAll(["2343asdasd"]) - } } From 3ef7a08a1234499386b64bc1f57f992490692444 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 5 Dec 2012 16:59:43 +0300 Subject: [PATCH 0078/2668] simple smslib route refactor --- .../grails-app/domain/frontlinesms2/SmslibFconnection.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy index 20f8448c4..cb8499564 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy @@ -16,8 +16,7 @@ class SmslibFconnection extends Fconnection { def optional = { name, val -> return val? "&$name=$val": '' } -println "alxndrsn: SmslibFconnection.camelAddress() :: manufacturer=$manufacturer; model=$model" - "smslib:$port?debugMode=true&baud=$baud${optional('pin', pin)}&allMessages=$allMessages&manufacturer=$manufacturer&model=$model" + "smslib:$port?debugMode=true&baud=$baud${optional('pin', pin)}&allMessages=$allMessages${optional('manufacturer', manufacturer)}${optional('model', model)}" } String manufacturer From 709f7055702dcfe39806cbd55529047a9d0f8b42 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 5 Dec 2012 17:53:02 +0300 Subject: [PATCH 0079/2668] Began implementing javascript unit tests. --- plugins/frontlinesms-core/.gitignore | 3 + plugins/frontlinesms-core/do/js_unit_test | 16 ++++ .../test/js/recipient_selecter_tests.js | 78 +++++++++++++++++++ .../web-app/js/recipient_selecter.js | 13 ++-- 4 files changed, 104 insertions(+), 6 deletions(-) create mode 100755 plugins/frontlinesms-core/do/js_unit_test create mode 100644 plugins/frontlinesms-core/test/js/recipient_selecter_tests.js diff --git a/plugins/frontlinesms-core/.gitignore b/plugins/frontlinesms-core/.gitignore index 7d340ac0b..52d2cc4d0 100644 --- a/plugins/frontlinesms-core/.gitignore +++ b/plugins/frontlinesms-core/.gitignore @@ -3,3 +3,6 @@ web-app/WEB-INF/grails-app/ # Auto-generated JS i18n bundles. web-app/i18n/ + +# node.js modules +node_modules/ diff --git a/plugins/frontlinesms-core/do/js_unit_test b/plugins/frontlinesms-core/do/js_unit_test new file mode 100755 index 000000000..1a3acea64 --- /dev/null +++ b/plugins/frontlinesms-core/do/js_unit_test @@ -0,0 +1,16 @@ +#!/bin/bash +function check_npm_module_available() { + MODULE_NAME=$1 + echo "# Checking for NPM module: $MODULE_NAME..." + INSTALL_COUNT=`(npm list; npm -g list) | grep -c "^[├└]─[─┬] $MODULE_NAME\@"` + if [ 0 -eq $INSTALL_COUNT ]; then + echo "# NPM module missing: $MODULE_NAME. Please run 'npm install $MODULE_NAME' or 'sudo npm i -g $MODULE_NAME'" + exit 1 + fi + echo "# NPM Module found: $MODULE_NAME" +} +check_npm_module_available fs +check_npm_module_available jquery +check_npm_module_available jsdom +set -e +qunit -c web-app/js/recipient_selecter.js -t test/js/recipient_selecter_tests.js diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js new file mode 100644 index 000000000..8b1381bbc --- /dev/null +++ b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js @@ -0,0 +1,78 @@ +// DOM setup +var dom_trix = (function() { + var jsdom; + try { + console.log("Loading JSDOM..."); + jsdom = require('jsdom'); + console.log("JSDOM loaded."); + } catch(err) { + console.log("Error trying to load JSDOM: " + err); + process.exit(1); + } + + var initDomFromString, initDomFromFile, initJquery, resetDom; + initDomFromString = function(domString) { + console.log("Initialising DOM with HTML: " + domString + "..."); + var document = jsdom.jsdom(domString, null, { features: { QuerySelector: true } }), + window = document.createWindow(), + navigator = { + userAgent: 'node-js' + }; + global.window = window; + global.navigator = navigator; + global.document = window.document; + console.log("DOM SETUP COMPLETE"); + initJquery(); + }; + initDomFromFile = function(file) { + var fs = require('fs'); + initDomFromString(fs.readFileSync(file).toString()); + }; + initJquery = function() { + console.log("Initialising jQuery..."); + var jQuery = require("jquery"); + global.jQuery = jQuery; + global.$ = jQuery; + console.log("jQuery initialiased."); + }; + resetDom = function() { + // TODO + }; + return { + initDomFromString:initDomFromString, + initDomFromFile:initDomFromFile, + resetDom:resetDom + }; +}()); + +test("a basic test example", function (assert) { + ok(true, "this test is fine"); + var value = "hello"; + equal("hello", value, "We expect value to be hello"); +}); + +test("recipientSelecter is initialiased", function() { + notEqual(recipientSelecter, null, "recipientSelecter object should be defined"); + notEqual(recipientSelecter.addAddressHandler, null); + notEqual(recipientSelecter.updateRecipientCount, null); + notEqual(recipientSelecter.searchForContacts, null); + notEqual(recipientSelecter.selectMembers, null); + notEqual(recipientSelecter.setContact, null); + notEqual(recipientSelecter.validateAddressEntry, null); + + equal(recipientSelecter.nonExistentMethod, null); +}); + +test("setContact should add a contact if he is not already there", function() { + // given + dom_trix.initDomFromString("0"); + var e = jQuery("", {type:"checkbox"}); + + // when + recipientSelecter.setContact(e, "+123456"); + + // then + equal(jQuery("#mobileNumbers").val(), ",+123456", "Mobile number should now be included in list"); + equal(jQuery("#recipient-count").text(), 1, "Should have one recipient."); +}); + diff --git a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js index f37ae5c67..fbd5d20c7 100644 --- a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js +++ b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js @@ -1,4 +1,4 @@ -var recipientSelecter = (function() { +recipientSelecter = (function() { var addAddressHandler, updateRecipientCount, searchForContacts, selectMembers, setContact, validateAddressEntry; function inCheckedGroup(value) { @@ -60,7 +60,7 @@ var recipientSelecter = (function() { } } else { if(contactNumber in contactMobileNumbers) { - if(! inCheckedGroup(contactNumber)) { + if(!inCheckedGroup(contactNumber)) { delete contactMobileNumbers[contactNumber]; } } @@ -83,11 +83,12 @@ var recipientSelecter = (function() { } updateRecipientCount = function() { - var contactCount, mobileNumbersArray; - if($("#mobileNumbers").val() != "") { - mobileNumbersArray = $("#mobileNumbers").val().split(","); + var contactCount, mobileNumbersArray, mobileNumbersString; + mobileNumbersString = $("#mobileNumbers").val(); + if(mobileNumbersString) { + mobileNumbersArray = mobileNumbersString.split(","); } - contactCount = mobileNumbersArray? mobileNumbersArray.length:0 ; + contactCount = mobileNumbersArray? mobileNumbersArray.length: 0; $("#contacts-count").html(contactCount); $("#messages-count").html(contactCount); $("#recipient-count").html(contactCount); From 5cec80c02f82787ce7076c9baff88e1b31f47118 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 5 Dec 2012 17:53:52 +0300 Subject: [PATCH 0080/2668] ClickatelPreProcessor & Spec fixes --- .../clickatell/ClickatellPreProcessor.groovy | 2 + .../ClickatellPreProcessorSpec.groovy | 40 ++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/clickatell/ClickatellPreProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/clickatell/ClickatellPreProcessor.groovy index f5cb19896..86c487909 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/clickatell/ClickatellPreProcessor.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/clickatell/ClickatellPreProcessor.groovy @@ -24,6 +24,8 @@ class ClickatellPreProcessor implements Processor { def connection = ClickatellFconnection.get(connectionId) log "connection=$connection" ['apiId', 'username', 'password'].each { set x, it, connection."$it" } + if(connection.sendToUsa) + set x, 'fromNumber', connection.'fromNumber' log 'EXIT' } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/clickatell/ClickatellPreProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/clickatell/ClickatellPreProcessorSpec.groovy index b49bbb8bb..b7ad20906 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/clickatell/ClickatellPreProcessorSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/clickatell/ClickatellPreProcessorSpec.groovy @@ -12,12 +12,12 @@ class ClickatellPreProcessorSpec extends CamelUnitSpecification { ClickatellPreProcessor p def setup() { - def c = ClickatellFconnection.build(apiId:'11111', username:'bob', password:'secret') p = new ClickatellPreProcessor() } def 'out_body should be set to message text'() { - given: + setup: + buildTestConnection() def x = mockExchange("simple") when: p.process(x) @@ -26,7 +26,8 @@ class ClickatellPreProcessorSpec extends CamelUnitSpecification { } def 'out_body should be URL-encoded'() { - given: + setup: + buildTestConnection() def x = mockExchange("more complex") when: p.process(x) @@ -35,7 +36,8 @@ class ClickatellPreProcessorSpec extends CamelUnitSpecification { } def 'dispatch ID should be set in header'() { - given: + setup: + buildTestConnection() def x = mockExchange("simple") when: p.process(x) @@ -44,7 +46,8 @@ class ClickatellPreProcessorSpec extends CamelUnitSpecification { } def 'message destination should be set and stripped of leading plus'() { - given: + setup: + buildTestConnection() def x = mockExchange("simple") when: p.process(x) @@ -53,14 +56,39 @@ class ClickatellPreProcessorSpec extends CamelUnitSpecification { } def 'clickatell auth details should be set in header'() { - given: + setup: + buildTestConnection() def x = mockExchange("simple") when: p.process(x) then: + println "x.out.headers :: ${x.out.headers}" x.out.headers.'clickatell.apiId' == '11111' x.out.headers.'clickatell.username' == 'bob' x.out.headers.'clickatell.password' == 'secret' + x.out.headers.'clickatell.fromNumber' == null } + + def 'clickatell fromNumber should be set in header if sendToUsa is true'() { + setup: + buildTestConnection(true) + def x = mockExchange("simple") + when: + p.process(x) + then: + println "x.out.headers :: ${x.out.headers}" + x.out.headers.'clickatell.apiId' == '11111' + x.out.headers.'clickatell.username' == 'bob' + x.out.headers.'clickatell.password' == 'secret' + x.out.headers.'clickatell.fromNumber' == '%2B123321' + + } + + private ClickatellFconnection buildTestConnection(sendToUsa=false) { + if (sendToUsa) + ClickatellFconnection.build(apiId:'11111', username:'bob', password:'secret', sendToUsa: true, fromNumber: "+123321") + else + ClickatellFconnection.build(apiId:'11111', username:'bob', password:'secret') + } } From 53c17b8943f4884497f7952ead1f4f843377e2ff Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 6 Dec 2012 15:39:30 +0300 Subject: [PATCH 0081/2668] CORE-1769: Removed old Javascript that populated autoreply/autoforward message text input in edit (now done in gsp) --- .../frontlinesms-core/grails-app/views/autoforward/_validate.gsp | 1 - .../frontlinesms-core/grails-app/views/autoreply/_validate.gsp | 1 - 2 files changed, 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp index b8d76926d..5bae95a45 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp @@ -1,7 +1,6 @@ function initializePopup() { - $("#messageText").val("${activityInstanceToEdit.sentMessageText}"); $("#messageText").trigger("keyup"); checkSavedContactsAndGroups(); diff --git a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp index a7d8bb7a9..66ba04251 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp @@ -1,7 +1,6 @@ function initializePopup() { - $("#messageText").val("${activityInstanceToEdit.autoreplyText}"); $("#messageText").trigger("keyup"); From ccca3d20e6d6b775dc681c6b1f3db7065cf14fb7 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 6 Dec 2012 16:40:18 +0300 Subject: [PATCH 0082/2668] Autoreply edit requires that javascript after all :( --- .../frontlinesms-core/grails-app/views/autoreply/_validate.gsp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp index 66ba04251..a7d8bb7a9 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp @@ -1,6 +1,7 @@ function initializePopup() { + $("#messageText").val("${activityInstanceToEdit.autoreplyText}"); $("#messageText").trigger("keyup"); From 4f12b4f4ec1e01589530e186ee6e04b3c899050e Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 7 Dec 2012 11:20:34 +0300 Subject: [PATCH 0083/2668] Added escapeForJavascript metaclass modifier, and call in autoreply initializePopup --- .../grails-app/views/autoreply/_validate.gsp | 2 +- .../src/groovy/frontlinesms2/MetaClassModifiers.groovy | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp index a7d8bb7a9..5508db4c8 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp @@ -1,7 +1,7 @@ function initializePopup() { - $("#messageText").val("${activityInstanceToEdit.autoreplyText}"); + $("#messageText").val("${activityInstanceToEdit.autoreplyText.escapeForJavascript()}"); $("#messageText").trigger("keyup"); diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy index 456e5484f..25251ae23 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy @@ -13,6 +13,7 @@ class MetaClassModifiers { MetaClassModifiers.addZipMethodToFile() MetaClassModifiers.addCamelMethods() MetaClassModifiers.addMapMethods() + MetaClassModifiers.addEscapeForJavascriptToStrings() } static def addTodoConstantToSpecifications() { @@ -112,5 +113,12 @@ println "MetaClassModifiers.addCamelMethods()" } } + + static def addEscapeForJavascriptToStrings() { + String.metaClass.escapeForJavascript = { + delegate.replaceAll(/(\r\n)|[\r\n]/, '\\\\n') + } + + } } From 66b7a7bcd90a42f3923bfcc5d0dfc2edbd33a63b Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 7 Dec 2012 14:53:10 +0300 Subject: [PATCH 0084/2668] Some minor code refractoring --- .../views/webconnection/_validate.gsp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 3f2f452d3..698e6657d 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -52,6 +52,8 @@ var initialScripts = ; webconnectionDialog.setScripts(initialScripts); + toggleApiTab(); + aliasCustomValidation(); @@ -84,6 +86,17 @@ }); } + function toggleApiTab() { + $("#webconnectionType").live('change', function() { + if($(this).val() === 'generic') { + mediumPopup.enableTab('webconnection-api'); + } + else { + mediumPopup.disableTab('webconnection-api'); + } + }); + } + function setType(type) { $.getJSON(url_root + "webconnection/" + type + "/config", function(data) { var configTab = $("#webconnection-config"); @@ -96,12 +109,6 @@ webconnectionDialog.setScripts(eval("(" + data.scripts + ")")); webconnectionDialog.updateConfirmationScreen(); - if(type == 'generic') { - mediumPopup.enableTab('webconnection-api'); - } - else { - mediumPopup.disableTab('webconnection-api'); - } }); } @@ -121,10 +128,3 @@ } - - - $(function() { - setType('generic'); - }); - - From f41e3c1cee86583d571192592a36d65267b932fb Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 7 Dec 2012 16:37:27 +0300 Subject: [PATCH 0085/2668] fixed loading of generic webconnection --- .../grails-app/views/webconnection/_validate.gsp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 698e6657d..cde7f7e26 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -50,7 +50,7 @@ webconnectionDialog.updateConfirmationScreen() - var initialScripts = ; + var initialScripts = ; webconnectionDialog.setScripts(initialScripts); toggleApiTab(); @@ -106,7 +106,6 @@ magicwand.init(configTab.find('select[id^="magicwand-select"]')); $("#webconnection-confirm").html(data.confirm); - webconnectionDialog.setScripts(eval("(" + data.scripts + ")")); webconnectionDialog.updateConfirmationScreen(); }); From 1865cdce20dd5e1c61cea963cf30e23b6c807255 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 7 Dec 2012 16:49:36 +0300 Subject: [PATCH 0086/2668] Updated javascript unit test runner. --- plugins/frontlinesms-core/do/js_unit_test | 17 +++- .../frontlinesms-core/test/js/lib/dom_trix.js | 47 +++++++++++ .../test/js/recipient_selecter_tests.js | 79 +++++++------------ 3 files changed, 92 insertions(+), 51 deletions(-) create mode 100644 plugins/frontlinesms-core/test/js/lib/dom_trix.js diff --git a/plugins/frontlinesms-core/do/js_unit_test b/plugins/frontlinesms-core/do/js_unit_test index 1a3acea64..b01667b02 100755 --- a/plugins/frontlinesms-core/do/js_unit_test +++ b/plugins/frontlinesms-core/do/js_unit_test @@ -12,5 +12,20 @@ function check_npm_module_available() { check_npm_module_available fs check_npm_module_available jquery check_npm_module_available jsdom +check_npm_module_available qunit + set -e -qunit -c web-app/js/recipient_selecter.js -t test/js/recipient_selecter_tests.js + +function run_test() { + TARGET=$1 + echo "# Running tests for $TARGET..." + qunit -c "web-app/js/${TARGET}.js" -d `ls test/js/lib/*.js` -t "test/js/${TARGET}_tests.js" +} + +pushd test/js +TESTS=`ls *_tests.js | sed -e "s/_tests.js//"` +popd +echo "# Tests to run: $TESTS" + +run_test recipient_selecter + diff --git a/plugins/frontlinesms-core/test/js/lib/dom_trix.js b/plugins/frontlinesms-core/test/js/lib/dom_trix.js new file mode 100644 index 000000000..7fced8884 --- /dev/null +++ b/plugins/frontlinesms-core/test/js/lib/dom_trix.js @@ -0,0 +1,47 @@ +dom_trix = (function() { + var jsdom; + try { + console.log("Loading JSDOM..."); + jsdom = require('jsdom'); + console.log("JSDOM loaded."); + } catch(err) { + console.log("Error trying to load JSDOM: " + err); + process.exit(1); + } + + var initDomFromString, initDomFromFile, initJquery, resetDom; + initDomFromString = function(domString) { + console.log("Initialising DOM with HTML: " + domString + "..."); + var document = jsdom.jsdom(domString, null, { features: { QuerySelector: true } }), + window = document.createWindow(), + navigator = { + userAgent: 'node-js' + }; + global.window = window; + global.navigator = navigator; + global.document = window.document; + console.log("DOM SETUP COMPLETE"); + initJquery(); + }; + initDomFromFile = function(file) { + var fs = require('fs'); + initDomFromString(fs.readFileSync(file).toString()); + }; + initJquery = function() { + console.log("Initialising jQuery..."); + var jQuery = require("jquery"); + global.jQuery = jQuery; + global.$ = jQuery; + console.log("jQuery initialiased."); + }; + resetDom = function() { + // TODO + }; + return { + initDomFromString:initDomFromString, + initDomFromFile:initDomFromFile, + resetDom:resetDom + }; +}()); + + diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js index 8b1381bbc..3eae75fc9 100644 --- a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js +++ b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js @@ -1,50 +1,3 @@ -// DOM setup -var dom_trix = (function() { - var jsdom; - try { - console.log("Loading JSDOM..."); - jsdom = require('jsdom'); - console.log("JSDOM loaded."); - } catch(err) { - console.log("Error trying to load JSDOM: " + err); - process.exit(1); - } - - var initDomFromString, initDomFromFile, initJquery, resetDom; - initDomFromString = function(domString) { - console.log("Initialising DOM with HTML: " + domString + "..."); - var document = jsdom.jsdom(domString, null, { features: { QuerySelector: true } }), - window = document.createWindow(), - navigator = { - userAgent: 'node-js' - }; - global.window = window; - global.navigator = navigator; - global.document = window.document; - console.log("DOM SETUP COMPLETE"); - initJquery(); - }; - initDomFromFile = function(file) { - var fs = require('fs'); - initDomFromString(fs.readFileSync(file).toString()); - }; - initJquery = function() { - console.log("Initialising jQuery..."); - var jQuery = require("jquery"); - global.jQuery = jQuery; - global.$ = jQuery; - console.log("jQuery initialiased."); - }; - resetDom = function() { - // TODO - }; - return { - initDomFromString:initDomFromString, - initDomFromFile:initDomFromFile, - resetDom:resetDom - }; -}()); - test("a basic test example", function (assert) { ok(true, "this test is fine"); var value = "hello"; @@ -65,14 +18,40 @@ test("recipientSelecter is initialiased", function() { test("setContact should add a contact if he is not already there", function() { // given - dom_trix.initDomFromString("0"); - var e = jQuery("", {type:"checkbox"}); + dom_trix.initDomFromString("" + + "" + + "" + + "0" + + ""); + var e = jQuery("input[name=whatever]"); + + // when + recipientSelecter.setContact(e, "+123456"); + + // then + equal(jQuery("#mobileNumbers").val(), "+123456", "Mobile number should now be included in list"); + equal(jQuery("#recipient-count").text(), 1, "Should have one recipient."); + + // when + recipientSelecter.setContact(e, "+7890"); + + // then + equal(jQuery("#mobileNumbers").val(), "+123456,+7890", "Mobile number should now be included in list"); + equal(jQuery("#recipient-count").text(), 2, "Should have one recipient."); + + // when + recipientSelecter.setContact(e, "+123456"); + + // then + equal(jQuery("#mobileNumbers").val(), "+123456,+7890", "Mobile number should now be included in list"); + equal(jQuery("#recipient-count").text(), 2, "Should have one recipient."); // when + e.removeAttr("checked"); recipientSelecter.setContact(e, "+123456"); // then - equal(jQuery("#mobileNumbers").val(), ",+123456", "Mobile number should now be included in list"); + equal(jQuery("#mobileNumbers").val(), "+7890", "Mobile number should now be included in list"); equal(jQuery("#recipient-count").text(), 1, "Should have one recipient."); }); From 2896d7c49aabc74415e53fa666f994df506fb6d5 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 7 Dec 2012 17:24:15 +0300 Subject: [PATCH 0087/2668] fixed subscription error keywords error --- .../controllers/frontlinesms2/ActivityController.groovy | 8 ++++---- .../frontlinesms2/SubscriptionController.groovy | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 1c8e2ff25..b1f27b9c9 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -110,14 +110,14 @@ class ActivityController extends ControllerUtils { def create_new_activity() {} - def getCollidingKeywords(topLevelKeywords) { + def getCollidingKeywords(topLevelKeywords, instance) { if (topLevelKeywords == null) return [:] def collidingKeywords = [:] def currentKeyword topLevelKeywords.toUpperCase().split(",").collect { it.trim() }.each { currentKeyword = Keyword.getFirstLevelMatch(it) - if(currentKeyword) + if(currentKeyword && (currentKeyword.activity.id != instance.id)) collidingKeywords << [(currentKeyword.value):"'${currentKeyword.activity.name}'"] } println "colliding keywords:: $collidingKeywords" @@ -135,8 +135,8 @@ class ActivityController extends ControllerUtils { html { [ownerId:instance.id] } } } catch(Exception ex) { - ex.printStackTrace() - def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords) + //ex.printStackTrace() + def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords, instance) def errors if (collidingKeywords) { errors = collidingKeywords.collect { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy index 39e5bd1b5..a35400b81 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy @@ -52,6 +52,7 @@ class SubscriptionController extends ActivityController { def save() { def subscriptionInstance = Subscription.get(params.ownerId)?: new Subscription() + params.keywords = (params.topLevelKeywords.trim().length() > 0)?params.topLevelKeywords:("${params.joinKeywords},${params.leaveKeywords}") doSave('subscription', subscriptionService, subscriptionInstance) } From 7fe6d98cc4fdeeedc3dde03a91f51826dd0a9783 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 10 Dec 2012 11:04:01 +0300 Subject: [PATCH 0088/2668] Added new i18n for autoreply sorting --- .../controllers/frontlinesms2/ActivityController.groovy | 4 ++-- .../grails-app/views/activity/generic/_sorting.gsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 1c8e2ff25..290e7810c 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -16,7 +16,7 @@ class ActivityController extends ControllerUtils { def create() { def groupList = Group.getGroupDetails() + SmartGroup.getGroupDetails() [contactList: Contact.list(), - groupList:groupList] + groupList:groupList, activityType: params.controller] } def edit() { @@ -25,7 +25,7 @@ class ActivityController extends ControllerUtils { def activityType = activityInstance.shortName render view:"../$activityType/create", model:[contactList: Contact.list(), groupList:groupList, - activityInstanceToEdit: activityInstance] + activityInstanceToEdit: activityInstance, activityType: params.controller] } } diff --git a/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp b/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp index 7e6116c8e..9e91a9e03 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp @@ -1,7 +1,7 @@

    -

    +

    • From 3197cb8dc05d3441d36d1c9f578a3e6ee919bade Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 10 Dec 2012 12:02:41 +0300 Subject: [PATCH 0089/2668] autoreply walkthrough text changes implemented --- .../controllers/frontlinesms2/ActivityController.groovy | 2 +- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 4 +++- .../grails-app/views/activity/generic/_sorting.gsp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 60f7e4620..433bf39c0 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -25,7 +25,7 @@ class ActivityController extends ControllerUtils { def activityType = activityInstance.shortName render view:"../$activityType/create", model:[contactList: Contact.list(), groupList:groupList, - activityInstanceToEdit: activityInstance, activityType: params.controller] + activityInstanceToEdit: activityInstance, activityType: activityType] } } diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index c7c22bf16..1a1a25639 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -265,7 +265,9 @@ archive.activity.messages=Messages archive.activity.list.none=  No archived activities autoreply.enter.keyword=Enter keyword -autoreply.create.message=Enter message +autoreply.create.message=Enter autoreply message +activity.autoreply.sort.description=FrontlineSMS can automatically reply to incoming messages that contain (begin with?) a keyword, and move the incoming message into this activity. You can do this for all messages, or only those that match one of the specified keywords. +activity.autoreply.disable.sorting.description=Messages will not be automatically replied to and moved into this activity autoreply.confirm=Confirm autoreply.name.label=Message autoreply.details.label=Confirm details diff --git a/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp b/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp index 9e91a9e03..200cf7b5f 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp @@ -26,7 +26,7 @@ checked="${(activityInstanceToEdit?.keywords?.size() == 0)}"/>
      - +
    From 01256492c86594565f15345e55e85ea7621bad51 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 10 Dec 2012 12:32:33 +0300 Subject: [PATCH 0090/2668] Minor autoreply walkthrough i18n correction --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 1a1a25639..06c2b9790 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -266,7 +266,7 @@ archive.activity.list.none=  No archived activities autoreply.enter.keyword=Enter keyword autoreply.create.message=Enter autoreply message -activity.autoreply.sort.description=FrontlineSMS can automatically reply to incoming messages that contain (begin with?) a keyword, and move the incoming message into this activity. You can do this for all messages, or only those that match one of the specified keywords. +activity.autoreply.sort.description=FrontlineSMS can automatically reply to incoming messages that begin with a keyword, and move the incoming message into this activity. You can do this for all messages, or only those that match one of the specified keywords. activity.autoreply.disable.sorting.description=Messages will not be automatically replied to and moved into this activity autoreply.confirm=Confirm autoreply.name.label=Message From 9c8af43f3b6dffe10fbd403836f7864deca373ff Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 10 Dec 2012 16:53:22 +0300 Subject: [PATCH 0091/2668] Contact/Group/SmartGroup Removed from autoforward if deleted --- .../frontlinesms-core/application.properties | 3 +- .../frontlinesms2/AutoforwardService.groovy | 24 ++++++++++ .../service/AutoforwardServiceISpec.groovy | 48 +++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index ec0d49169..f8d7cdb18 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,6 +1,7 @@ #Grails Metadata file -#Thu Nov 15 15:41:15 EAT 2012 +#Mon Dec 10 11:30:10 EAT 2012 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 app.version=2.0-SNAPSHOT +plugins.events-push=1.0.M4-SNAPSHOT diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy index f67c50127..ec7bbf5ac 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy @@ -1,8 +1,11 @@ package frontlinesms2 import frontlinesms2.* +import grails.events.Listener +import groovy.sql.Sql class AutoforwardService { + def dataSource def saveInstance(Autoforward autoforward, params) { println "##### Saving Autoforward in Service" @@ -67,4 +70,25 @@ class AutoforwardService { } autoforward } + + @Listener(topic='beforeDelete', namespace='gorm') + def handleDeletedContact(Contact contact) { + println "### Removing Contact $contact from Autoforward ##" + new Sql(dataSource).execute('DELETE FROM autoforward_contact WHERE contact_id=?', [contact.id]) + return true + } + + @Listener(topic='beforeDelete', namespace='gorm') + def handleDeletedGroup(Group group) { + println "## Removing Group $group From Autoforward" + new Sql(dataSource).execute('DELETE FROM autoforward_grup WHERE group_id=?', [group.id]) + return true + } + + @Listener(topic='beforeDelete', namespace='gorm') + def handleDeletedSmartGroup(SmartGroup smartGroup) { + println "## Removing SmartGroup $smartGroup From Autoforward" + new Sql(dataSource).execute('DELETE FROM autoforward_smart_group WHERE smart_group_id=?', [smartGroup.id]) + return true + } } \ No newline at end of file diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/AutoforwardServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/AutoforwardServiceISpec.groovy index db9217167..5365492e8 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/AutoforwardServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/AutoforwardServiceISpec.groovy @@ -32,4 +32,52 @@ class AutoforwardServiceISpec extends grails.plugin.spock.IntegrationSpec{ autoforward.smartGroups*.name.containsAll(['group', 'group2']) !autoforward.smartGroups*.name.contains('groupSmart') } + + def 'deleting a contact should remove it from an autoforward'() { + given: + def c1 = new Contact(mobile:'12345', name:'').save(failOnError:true) + def c2 = new Contact(mobile:'67890', name:'').save(failOnError:true) + def autoforward = new Autoforward(name:'Excitement', sentMessageText:'This is exciting: ${messageText}') + .addToKeywords(value:'FORWARD') + .addToContacts(c1) + .addToContacts(c2) + .save(failOnError:true, flush:true) + when: + autoforwardService.handleDeletedContact(c1) + autoforward.refresh() + then: + !autoforward.contacts.contains(c1) + } + + def 'deleting a group should remove it from an autoforward'() { + given: + def g1 = new Group(name:'group3').save(failOnError:true) + def g2 = new Group(name:'group4').save(failOnError:true) + def autoforward = new Autoforward(name:'Excitement', sentMessageText:'This is exciting: ${messageText}') + .addToKeywords(value:'FORWARD') + .addToGroups(g1) + .addToGroups(g2) + .save(failOnError:true, flush:true) + when: + autoforwardService.handleDeletedGroup(g1) + autoforward.refresh() + then: + !autoforward.groups.contains(g1) + } + + def 'deleting a smart group should remove it from an autoforward'() { + given: + def sg1 = new SmartGroup(name:'group', mobile:'+254').save(failOnError:true) + def sg2 = new SmartGroup(name:'group2', mobile:'+256').save(failOnError:true) + def autoforward = new Autoforward(name:'Excitement', sentMessageText:'This is exciting: ${messageText}') + .addToKeywords(value:'FORWARD') + .addToSmartGroups(sg1) + .addToSmartGroups(sg2) + .save(failOnError:true, flush:true) + when: + autoforwardService.handleDeletedSmartGroup(sg1) + autoforward.refresh() + then: + !autoforward.smartGroups.contains(sg1) + } } \ No newline at end of file From 0652e5b0d6ef84ed413a0976c4549a68de57c4ed Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Mon, 10 Dec 2012 17:16:51 +0300 Subject: [PATCH 0092/2668] Fixed validation error with ClickatellFconnection --- .../frontlinesms2/ConnectionController.groovy | 3 +- .../ClickatellFconnection.groovy | 3 ++ .../domain/frontlinesms2/Fconnection.groovy | 4 ++ .../frontlinesms2/SmslibFconnection.groovy | 2 +- .../grails-app/i18n/messages.properties | 2 + .../taglib/frontlinesms2/FsmsTagLib.groovy | 2 +- .../grails-app/views/connection/wizard.gsp | 50 ++++--------------- .../grails-app/views/settings/general.gsp | 5 ++ .../js/settings/basicAuthValidation.js | 6 +-- 9 files changed, 30 insertions(+), 47 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index e84705485..368f5bd5c 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -145,6 +145,7 @@ class ConnectionController extends ControllerUtils { def fconnectionInstance = clazz.newInstance() fconnectionInstance.properties = params fconnectionInstance.validate() + println fconnectionInstance.errors.allErrors def connectionErrors = fconnectionInstance.errors.allErrors.collect { message(error:it) } if (fconnectionInstance.save()) { withFormat { @@ -163,7 +164,7 @@ class ConnectionController extends ControllerUtils { redirect(controller:'connection', action:"list") } json { - render([ok:false, text:connectionErrors.join(", ").toString()] as JSON) + render([ok:false, text:connectionErrors.unique().join(", ").toString()] as JSON) } } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index 5ec753550..8643595bd 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -20,6 +20,9 @@ class ClickatellFconnection extends Fconnection { String fromNumber static constraints = { + apiId blank:false + username blank:false + password blank:false fromNumber(nullable: true, validator: { val, obj -> println "checking them constraints..... and returning ${!obj.sendToUsa || val}" return !obj.sendToUsa || val diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index d05be3fa2..e90783504 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -44,6 +44,10 @@ class Fconnection { sort id:'asc' tablePerHierarchy false } + + static constraints = { + name blank:false + } String name diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy index 20f8448c4..0ef7d2ec8 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy @@ -9,7 +9,7 @@ import org.smslib.NotConnectedException class SmslibFconnection extends Fconnection { static passwords = ['pin'] static configFields = ['name', 'manufacturer', 'model', 'port', 'baud', 'pin', 'imsi', 'serial', 'send', 'receive'] - static defaultValues = [send:true, receive:true] + static defaultValues = [send:true, receive:true, baud:9600] static String getShortName() { 'smslib' } private def camelAddress = { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 2bb6b5481..759b39922 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -605,6 +605,8 @@ intellismsfconnection.emailUserName.label=Username intellismsfconnection.emailPassword.label=Password intellismsfconnection.description=Send an receive messages through an Intellisms account intellismsfconnection.global.info=You will need to configure an account with Intellisms (www.intellisms.co.uk). +intelliSmsFconnection.send.validator.invalid = You cannot configure a connection without SEND or RECEIVE functionality +intelliSmsFconnection.receive.validator.invalid = You cannot configure a connection without SEND or RECEIVE functionality #Controllers contact.label=Contact(s) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index be870aadb..f44a36e49 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -425,7 +425,7 @@ class FsmsTagLib { } private def isRequired(instanceClass, field) { - !instanceClass.constraints[field].nullable + !instanceClass.constraints[field].blank } private def isInteger(instanceClass, groovyKey) { diff --git a/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp b/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp index 28628e637..1dd7db20e 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp @@ -17,6 +17,7 @@ var fconnection = { + validator : function() { return $("#connectionForm").validate({ errorContainer: ".error-panel"})}, getType: function() { return "${fconnectionInstance?.shortName}"; return $("input[name=connectionType]:checked").val(); @@ -49,21 +50,13 @@ var fconnection = { }, isValid: function() { var valid = true; - var keys = fconnection[fconnection.getType()].validationSubsectionFieldKeys; - if(keys.length > 1) { - valid = validateSections(keys); - if(!valid) return valid; - $.each(keys, function(index, value) { - valid = valid && isFieldValid(value); - return valid; - }); - } else { - var fields = fconnection[fconnection.getType()].requiredFields; - $.each(fields, function(index, value) { - valid = valid && isFieldValid(value); - return valid; - }); - } + var fields = $('input:enabled:visible.required'); + $.each(fields, function(index, value) { + if (!fconnection.validator().element(value) && valid) { + valid = false; + $(".error-panel").text(i18n("connection.validation.prompt")); + } + }); return valid; }, humanReadableName: function() { @@ -127,31 +120,6 @@ function isFieldSet(fieldName) { return val!==null && val.length>0; } -function validateSubsectionFields(field) { - var valid = false; - var subSectionFields = $('.' + field + '-subsection-member'); - var requiredFields = fconnection[fconnection.getType()].requiredFields; - $.each(subSectionFields, function(index, value) { - var field = $(value).attr("field"); - if(requiredFields.indexOf(field) > -1) { - valid = isFieldValid(field); - return valid; - } - }); - return valid; -} - -function validateSections(keys) { - var valid = false; - $.each(keys, function(index, value) { - if(isSubsection(value)) { - valid = getFieldVal(value); - if(valid) return false; - } - }); - return valid; -} - function isSubsection(fieldName) { return $('#' + fieldName + '-subsection').length > 0; } @@ -214,7 +182,7 @@ function attachCheckBoxListener() { } function initializePopup() { - $("#connectionForm").validate(); + fconnection.validator(); fconnection.setType("${fconnectionInstance?fconnectionInstance.getClass().shortName: 'smslib'}"); diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index 3fe660a8c..66ce6fc38 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -4,6 +4,11 @@ <g:message code="settings.general.header"/> + + $(function() { + addBasicAuthValidator(); + }); +
    diff --git a/plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js b/plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js index c64cc5c5a..0b502da7b 100644 --- a/plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js +++ b/plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js @@ -1,10 +1,10 @@ -$(function() { +function addBasicAuthValidator() { var validatePassword = function(value, element) { var confirmPassword, password, passwordField, isValid; isValid = true; passwordField = $("input[name=password]"); password = passwordField.val(); - confirmPassword = $("input[name=confirmPassword]").val(); + confirmPassword = $("input[name=confirmPassword].password").val(); if(password.length > 0) { isValid = password === confirmPassword; passwordField.removeClass("error"); @@ -18,7 +18,7 @@ $(function() { jQuery.validator.addMethod("password", validatePassword, i18n("basic.authentication.password.mismatch")); basicAuthValidation.toggleFields("#enabledAuthentication"); basicAuthValidation.validator("#basic-auth"); -}); +} var basicAuthValidation = { validator: function(form){ From bcd38f6541b9342c0daec5d9c4e30f487b64e339 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 10 Dec 2012 17:38:11 +0300 Subject: [PATCH 0093/2668] added friendly 'from number' validation error --- .../controllers/frontlinesms2/ConnectionController.groovy | 1 + plugins/frontlinesms-core/grails-app/i18n/messages.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 368f5bd5c..9308d22eb 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -158,6 +158,7 @@ class ConnectionController extends ControllerUtils { } } } else { + println "errors::: ${fconnectionInstance.errors}" withFormat { html { flash.message = LogEntry.log(message(code: 'connection.creation.failed', args:[fconnectionInstance.errors])) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 759b39922..348885def 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -209,6 +209,7 @@ clickatellfconnection.sendToUsa.label=Send to USA clickatellfconnection.fromNumber.label=From Number clickatellfconnection.description=Send an receive messages through a Clickatell account clickatellfconnection.global.info=You will need to configure an account with Clickatell (www.clickatell.com). +clickatellFconnection.fromNumber.validator.invalid=A 'From Number' is required for sending messages to the United States # Smssync Fconnection smssyncfconnection.label=SMSSync From 9dc6731f3dc19935e56fa5b57dc6fa002720ac96 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 11 Dec 2012 10:24:50 +0300 Subject: [PATCH 0094/2668] removed some redundant printlns --- .../controllers/frontlinesms2/ConnectionController.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 9308d22eb..368f5bd5c 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -158,7 +158,6 @@ class ConnectionController extends ControllerUtils { } } } else { - println "errors::: ${fconnectionInstance.errors}" withFormat { html { flash.message = LogEntry.log(message(code: 'connection.creation.failed', args:[fconnectionInstance.errors])) From 2f5b5fb7e410ea5ff13ff18be2e18975d19ad4f2 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 11 Dec 2012 11:08:09 +0300 Subject: [PATCH 0095/2668] remove valdation on contacts and groups in autoforward --- .../grails-app/domain/frontlinesms2/Autoforward.groovy | 9 --------- .../test/unit/frontlinesms2/AutoforwardSpec.groovy | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index efd5f017d..5d021a930 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -3,12 +3,6 @@ package frontlinesms2 class Autoforward extends Activity { //> CONSTANTS static def shortName = 'autoforward' - private static def RECIPIENT_VALIDATOR = { val, obj -> - println "RECIPIENT_VALIDATOR:: obj=$obj val=$val" - def valid = val || obj.contacts || obj.groups || obj.smartGroups - println "Valid: $valid" - return valid - } //> SERVICES def messageSendService @@ -19,9 +13,6 @@ class Autoforward extends Activity { //> DOMAIN SETUP static constraints = { name blank:false, maxSize:255, validator:NAME_VALIDATOR(Autoforward) - contacts validator:RECIPIENT_VALIDATOR - groups validator:RECIPIENT_VALIDATOR - smartGroups validator:RECIPIENT_VALIDATOR sentMessageText blank:false } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy index 7d1868709..38a9ffe95 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy @@ -31,8 +31,8 @@ class AutoforwardSpec extends Specification { autoforward.validate() == valid where: valid | props - false | [name:"name"] - false | [name:"name", keywords:[new Keyword(value:"keyword")]] + true | [name:"name"] + true | [name:"name", keywords:[new Keyword(value:"keyword")]] true | [name:"name", contacts:[new Contact(name:"name")]] true | [name:"name", contacts:[new Contact(name:"name")], keywords:[new Keyword(value:"keyword")]] true | [name:"name", smartGroups:[new SmartGroup(name:"SmartGroup", contactName:"contactName")], keywords:[new Keyword(value:"keyword")]] From c633cb7c4433abe8d9421bb97f4b190b47167b28 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 11 Dec 2012 11:20:19 +0300 Subject: [PATCH 0096/2668] Fixed css issues when rendering error messages for the SMSLib wizard --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 4 ++-- plugins/frontlinesms-core/web-app/css/wizard.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 759b39922..2283efed2 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -181,8 +181,8 @@ smslibfconnection.baud.label=Baud rate smslibfconnection.pin.label=PIN smslibfconnection.imsi.label=SIM IMSI smslibfconnection.serial.label=Device Serial # -smslibfconnection.send.label=Use Modem for sending Messages -smslibfconnection.receive.label=Use Modem for Receiving Messages +smslibfconnection.send.label=Use for sending +smslibfconnection.receive.label=Use for receiving smslibFconnection.send.validator.error.send=Modem should be used for sending smslibFconnection.receive.validator.error.receive=or receiving messages smslibfconnection.description=Connect to USB, serial and bluetooth modems or phones diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index 8132b4815..4cedb736f 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -52,6 +52,6 @@ div.sorting-option { padding:5px 5px 10px 25px; } div.sorting-option input#keywords { display: block; margin-top:5px; } #connectionForm label[for=connectionType] { font-weight: bold } -#connectionForm td label { font-weight: bold } +#connectionForm td label:first-child { font-weight: bold } #connectionForm .connection-field-info { padding-left:10px; padding-bottom:3px;} From 141481fe8fdaa8809e77bcfc23a7f0d0b63f0818 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 11 Dec 2012 11:25:44 +0300 Subject: [PATCH 0097/2668] CORE-1795: Can now delete long messages --- .../services/frontlinesms2/TrashService.groovy | 2 +- .../service/TrashServiceISpec.groovy | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy index 2471fc51a..53fe793ad 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy @@ -18,7 +18,7 @@ class TrashService { if (object instanceof frontlinesms2.Fmessage) { object.isDeleted = true new Trash(displayName:object.displayName, - displayText:object.text, + displayText:object.text.truncate(252), objectClass:object.class.name, objectId:object.id).save() object.save(failOnError:true, flush:true) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy index cde1d5370..c915681ae 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy @@ -80,4 +80,21 @@ class TrashServiceISpec extends grails.plugin.spock.IntegrationSpec { then: 'still only 1 trash item exists for activity' Trash.findAllByObjectIdAndObjectClass(a.id, a.class.name).size() == 1 } + + def 'should be able to delete a very long message without trash service failing'() { + given: 'message exists' + def m = Fmessage.build(text: '''This message could go on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on''') + when: 'message deleted' + trashService.sendToTrash(m) + then: '1 trash item exists for message' + Trash.findAllByObjectIdAndObjectClass(m.id, m.class.name).size() == 1 + Trash.findByObjectIdAndObjectClass(m.id, m.class.name).displayText == '''This message could go on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and + on and on and on and on and on and on and on and on and on and on and o…''' + } } From 8a643cd7a80bf279029500720d303f63f1557393 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 11 Dec 2012 11:39:53 +0300 Subject: [PATCH 0098/2668] CORE-1795: Can now delete long messages - added DB constraint --- .../grails-app/domain/frontlinesms2/Trash.groovy | 4 +++- .../grails-app/services/frontlinesms2/TrashService.groovy | 2 +- .../frontlinesms2/service/TrashServiceISpec.groovy | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy index 48259c627..4cb5ddb4b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy @@ -8,11 +8,13 @@ class Trash { String objectClass String displayName String displayText + + static final int MAXIMUM_DISPLAY_TEXT_SIZE = 255 static constraints = { objectId unique:'objectClass' displayName(nullable: true) - displayText(nullable: true) + displayText(nullable: true, size: 0..MAXIMUM_DISPLAY_TEXT_SIZE) } static def findByObject(def o) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy index 53fe793ad..bb167d32c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/TrashService.groovy @@ -18,7 +18,7 @@ class TrashService { if (object instanceof frontlinesms2.Fmessage) { object.isDeleted = true new Trash(displayName:object.displayName, - displayText:object.text.truncate(252), + displayText:object.text.truncate(Trash.MAXIMUM_DISPLAY_TEXT_SIZE), objectClass:object.class.name, objectId:object.id).save() object.save(failOnError:true, flush:true) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy index c915681ae..fd8bad414 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/TrashServiceISpec.groovy @@ -95,6 +95,6 @@ class TrashServiceISpec extends grails.plugin.spock.IntegrationSpec { Trash.findAllByObjectIdAndObjectClass(m.id, m.class.name).size() == 1 Trash.findByObjectIdAndObjectClass(m.id, m.class.name).displayText == '''This message could go on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and on and - on and on and on and on and on and on and on and on and on and on and o…''' + on and on and on and on and on and on and on and on and on and on and on a…''' } } From e2a9eacd91318e4f136cbf99dca7ca6861a706ab Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 11 Dec 2012 11:43:53 +0300 Subject: [PATCH 0099/2668] Fixed failing SubscriptionController tests --- plugins/frontlinesms-core/application.properties | 2 +- .../controllers/frontlinesms2/SubscriptionController.groovy | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index f8d7cdb18..6b68df449 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Mon Dec 10 11:30:10 EAT 2012 +#Tue Dec 11 11:30:56 EAT 2012 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy index a35400b81..16c6e05a8 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy @@ -51,8 +51,9 @@ class SubscriptionController extends ActivityController { } def save() { + //TODO Should use the withDefault subscription closure def subscriptionInstance = Subscription.get(params.ownerId)?: new Subscription() - params.keywords = (params.topLevelKeywords.trim().length() > 0)?params.topLevelKeywords:("${params.joinKeywords},${params.leaveKeywords}") + params.keywords = (params.topLevelKeywords?.trim()?.length() > 0) ? params.topLevelKeywords:("${params.joinKeywords},${params.leaveKeywords}") doSave('subscription', subscriptionService, subscriptionInstance) } From d9ed111539f8492ac83cb811556744d5db55c6b8 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 11 Dec 2012 12:26:21 +0300 Subject: [PATCH 0100/2668] an autoforward with no addresses will not send messages --- .../domain/frontlinesms2/Autoforward.groovy | 21 +++++++++++-------- .../AutoforwardControllerISpec.groovy | 14 +++++++++++++ .../domain/AutoforwardISpec.groovy | 18 ++++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index 5d021a930..29f685cd3 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -27,17 +27,20 @@ class Autoforward extends Activity { //> PROCESS METHODS def processKeyword(Fmessage message, Keyword matchedKeyword) { - println "#####Mocked OwnerDetail ## $message.ownerDetail" - println "#####Mocked id ## $message.id" - def m = messageSendService.createOutgoingMessage([contacts:contacts, groups:groups?:[] + smartGroups?:[], messageText:sentMessageText]) - println "#####Mocked OutgoingMessage ## $m.id" - m.ownerDetail = message.id - this.addToMessages(m) this.addToMessages(message) - m.save(failOnError:true) - println "############# OwnerDetail of OutgoingMessage ## $m ####### $m.ownerDetail" - messageSendService.send(m) this.save(failOnError:true) + if(addressesAvailable()){ + def m = messageSendService.createOutgoingMessage([contacts:contacts, groups:groups?:[] + smartGroups?:[], messageText:sentMessageText]) + m.ownerDetail = message.id + this.addToMessages(m) + m.save(failOnError:true) + messageSendService.send(m) + } + } + + private def addressesAvailable() { + println "## All Contacts ## ${((contacts?:[] + groups*.members?:[] + smartGroups*.members?:[]).flatten() - null)}" + ((contacts?:[] + groups*.members?:[] + smartGroups*.members?:[]).flatten() - null).size() > 0 } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy index d3d9fb02a..3fbb75935 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AutoforwardControllerISpec.groovy @@ -43,4 +43,18 @@ class AutoforwardControllerISpec extends grails.plugin.spock.IntegrationSpec { Autoforward.findByName('Forward') controller.flash.message == i18nUtilService.getMessage([code:"autoforward.save.success", args:[Autoforward.findByName('Forward').name]]) } + + def 'moving a message into an autoforward that does not have contacts or groups should just fail the outgoing messages'() { + setup: + def autoforward = new Autoforward(name: "test", sentMessageText: "Someone said something").save(failOnError:true) + def message = Fmessage.build(text:'This should be moved to Autoforward') + def controller = new MessageController() + controller.params.messageId = message.id + controller.params.ownerId = autoforward.id + controller.params.messageSection = 'activity' + when: + controller.move() + then: + Fmessage.findByText("This should be moved to Autoforward").messageOwner.id == autoforward.id + } } \ No newline at end of file diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy index e5dd16c04..9e887359d 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy @@ -24,5 +24,23 @@ class AutoforwardISpec extends grails.plugin.spock.IntegrationSpec { then: outbound.ownerDetail == "${inbound.id}" } + + def 'Autoforward.addressesAvailable return proper values'(){ + setup: + def group = new Group (name:'Group 1').save(failOnError:true) + def smartGroup = new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) + def contact1 = new Contact(name:"Soja", mobile:"12345").save(failOnError:true) + def contact2 = new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) + def contact3 = new Contact(name:"Hijo", mobile:"34534534").save(failOnError:true) + group.addToMembers(contact1).save(failOnError:true) + def autoforward = new Autoforward(name: "test", sentMessageText: "Someone said something") + .addToKeywords(new Keyword(value:"DOESNTMATTER")) + .addToContacts(contact3) + .addToGroups(group) + .addToSmartGroups(smartGroup) + .save(failOnError:true) + expect: + autoforward.addressesAvailable() + } } From f0117c65feef6633978f6363b0eaffb6afa0dd4e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 11 Dec 2012 12:31:40 +0300 Subject: [PATCH 0101/2668] another added test for autoforward --- .../domain/AutoforwardISpec.groovy | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy index 9e887359d..f16f82c0c 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy @@ -25,7 +25,7 @@ class AutoforwardISpec extends grails.plugin.spock.IntegrationSpec { outbound.ownerDetail == "${inbound.id}" } - def 'Autoforward.addressesAvailable return proper values'(){ + def 'Autoforward.addressesAvailable return true if contacts/groups/smartgroups have contacts'(){ setup: def group = new Group (name:'Group 1').save(failOnError:true) def smartGroup = new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) @@ -42,5 +42,20 @@ class AutoforwardISpec extends grails.plugin.spock.IntegrationSpec { expect: autoforward.addressesAvailable() } + + def 'Autoforward.addressesAvailable returns false if contacts/groups/smartgroups dont have contacts'(){ + setup: + def group = new Group (name:'Group 1').save(failOnError:true) + def smartGroup = new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) + def contact1 = new Contact(name:"Soja", mobile:"12345").save(failOnError:true) + def contact2 = new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) + def contact3 = new Contact(name:"Hijo", mobile:"34534534").save(failOnError:true) + group.addToMembers(contact1).save(failOnError:true) + def autoforward = new Autoforward(name: "test", sentMessageText: "Someone said something") + .addToKeywords(new Keyword(value:"DOESNTMATTER")) + .save(failOnError:true) + expect: + !autoforward.addressesAvailable() + } } From f5febb59f08b4f2691b745e72d2b127d321325e0 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 11 Dec 2012 15:26:23 +0300 Subject: [PATCH 0102/2668] [CORE-1792] Started work on migrations --- plugins/frontlinesms-core/do/migration | 38 +++++++++++++++++++++++++ plugins/frontlinesms-core/do/migrations | 38 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 plugins/frontlinesms-core/do/migration create mode 100644 plugins/frontlinesms-core/do/migrations diff --git a/plugins/frontlinesms-core/do/migration b/plugins/frontlinesms-core/do/migration new file mode 100644 index 000000000..e77b9b029 --- /dev/null +++ b/plugins/frontlinesms-core/do/migration @@ -0,0 +1,38 @@ +#!bin/bash + +#Generate initial database in prod mode without any data in background +grails prod run-app + +RESPONSE="000" +SERVER_PORT=8080 +CONTEXT_PATH=frontlinesms-core +PING_URL=http://localhost:$SERVER_PORT$CONTEXT_PATH/status/show +echo "# Waiting for server to start" +echo "# Ping URL: $PING_URL" +until [ "$RESPONSE" -ne "000" ]; do + echo "# Pinging $PING_URL..." + RESPONSE=`curl -o /dev/null --silent --head --write-out '%{http_code}' $PING_URL` || echo "Setting response seems to give an error code" + echo "# Pinged server at $PING_URL and got response: $RESPONSE" + sleep 10 +done + +echo "# Final server response: $RESPONSE" +if [ "$RESPONSE" -eq "200" ]; then + echo "# Started FrontlineSMS successfully \\o/" + + #Kill grails and do migrations + do/kill-grails + #enter changelog details + echo "Enter name of the changelog" + read -e CHANGELOG_NAME + grails prod gorm-diff $CHANGELOG_NAME.groovy + less grails-app/migrations/$CHANGELOG_NAME.groovy + EXIT_CODE=0 +else + echo "# Error starting FrontlineSMS" + EXIT_CODE=1 +fi + + + +#view changelog diff --git a/plugins/frontlinesms-core/do/migrations b/plugins/frontlinesms-core/do/migrations new file mode 100644 index 000000000..e77b9b029 --- /dev/null +++ b/plugins/frontlinesms-core/do/migrations @@ -0,0 +1,38 @@ +#!bin/bash + +#Generate initial database in prod mode without any data in background +grails prod run-app + +RESPONSE="000" +SERVER_PORT=8080 +CONTEXT_PATH=frontlinesms-core +PING_URL=http://localhost:$SERVER_PORT$CONTEXT_PATH/status/show +echo "# Waiting for server to start" +echo "# Ping URL: $PING_URL" +until [ "$RESPONSE" -ne "000" ]; do + echo "# Pinging $PING_URL..." + RESPONSE=`curl -o /dev/null --silent --head --write-out '%{http_code}' $PING_URL` || echo "Setting response seems to give an error code" + echo "# Pinged server at $PING_URL and got response: $RESPONSE" + sleep 10 +done + +echo "# Final server response: $RESPONSE" +if [ "$RESPONSE" -eq "200" ]; then + echo "# Started FrontlineSMS successfully \\o/" + + #Kill grails and do migrations + do/kill-grails + #enter changelog details + echo "Enter name of the changelog" + read -e CHANGELOG_NAME + grails prod gorm-diff $CHANGELOG_NAME.groovy + less grails-app/migrations/$CHANGELOG_NAME.groovy + EXIT_CODE=0 +else + echo "# Error starting FrontlineSMS" + EXIT_CODE=1 +fi + + + +#view changelog From 8439669353b839790b1819a82296dab6f7a00525 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 11 Dec 2012 15:58:42 +0300 Subject: [PATCH 0103/2668] Updated activity wizards to use refactored recipient list validation. --- .../views/announcement/_validate.gsp | 24 +--- .../views/autoforward/_validate.gsp | 9 +- .../grails-app/views/poll/_validate.gsp | 26 +--- .../frontlinesms-core/test/js/lib/dom_trix.js | 45 ++++--- .../test/js/lib/js_test_util.js | 14 +++ .../test/js/recipient_selecter/standard.html | 38 ++++++ .../test/js/recipient_selecter_tests.js | 113 ++++++++++++++++-- .../web-app/js/recipient_selecter.js | 60 ++++++++-- 8 files changed, 243 insertions(+), 86 deletions(-) create mode 100644 plugins/frontlinesms-core/test/js/lib/js_test_util.js create mode 100644 plugins/frontlinesms-core/test/js/recipient_selecter/standard.html diff --git a/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp index 3f963a408..36283934b 100644 --- a/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/announcement/_validate.gsp @@ -12,7 +12,7 @@ } }, messages: { - addresses: { + addresses: { required: i18n("poll.recipients.validation.error") } }, @@ -29,32 +29,12 @@ return validator.element('#messageText'); }; - var recepientTabValidation = function() { - var valid = true; - recipientSelecter.addAddressHandler(); - valid = $('input[name=addresses]:checked').length > 0; - var addressListener = function() { - if($('input[name=addresses]:checked').length > 0) { - validator.element($('#contacts').find("input[name=addresses]")); - $('#recipients-list').removeClass("error"); - } else { - $('#recipients-list').addClass("error"); - validator.showErrors({"addresses": i18n("poll.recipients.validation.error")}); - } - }; - if (!valid) { - $('input[name=addresses]').change(addressListener); - $('input[name=addresses]').trigger("change"); - } - return valid; - }; - var confirmTabValidation = function() { return validator.element('input[name=name]'); }; mediumPopup.addValidation('announcement-create-message', messageTextTabValidation); - mediumPopup.addValidation('announcement-select-recipients', recepientTabValidation); + mediumPopup.addValidation('announcement-select-recipients', recipientSelecter.validateImmediate); mediumPopup.addValidation('announcement-confirm', confirmTabValidation); $("#tabs").bind("tabsshow", function(event, ui) { diff --git a/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp index 5bae95a45..c1d484704 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoforward/_validate.gsp @@ -26,20 +26,13 @@ return validator.element('#messageText'); }; - var recipientTabValidation = function() { - var valid = false; - recipientSelecter.addAddressHandler(); - valid = ($('input[name=addresses]:checked').length > 0) || ($('input[name=groups]:checked').length > 0); - return valid; - }; - var confirmTabValidation = function() { return validator.element('input[name=name]'); }; mediumPopup.addValidation('activity-generic-sorting', keyWordTabValidation); mediumPopup.addValidation('autoforward-create-message', messageTextTabValidation); - mediumPopup.addValidation('autoforward-recipients', recipientTabValidation); + mediumPopup.addValidation('autoforward-recipients', recipientSelecter.validateDeferred); mediumPopup.addValidation('autoforward-confirm', confirmTabValidation); $("#tabs").bind("tabsshow", function(event, ui) { diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index 09d2e254a..cb565f4e2 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -94,34 +94,18 @@ }); return validator.element('#poll-keyword') && valid; }; + var autoReplyTabValidation = function() { return validator.element('#autoreplyText'); }; + var composeMessageTabValidation = function() { return validator.element('#messageText'); }; + var recipientTabValidation = function() { - if(!isGroupChecked('dontSendMessage')) { - var valid = false; - recipientSelecter.addAddressHandler(); - valid = $("#recipient-count").html() > 0; - var addressListener = function() { - if($("#recipient-count").html() > 0) { - validator.element($('#contacts').find("input[name=addresses]")); - $('#recipients-list').removeClass("error"); - $(".error").hide(); - } else { - $('#recipients-list').addClass("error"); - validator.showErrors({"addresses": i18n("poll.recipients.validation.error")}); - } - }; - if (!valid) { - $('input[name=addresses]').change(addressListener); - $('input[name=addresses]').trigger("change"); - } - return valid; - } - return true; + return isGroupChecked('dontSendMessage') || + recipientSelecter.validateImmediate(); }; var confirmTabValidation = function() { diff --git a/plugins/frontlinesms-core/test/js/lib/dom_trix.js b/plugins/frontlinesms-core/test/js/lib/dom_trix.js index 7fced8884..0f2b64547 100644 --- a/plugins/frontlinesms-core/test/js/lib/dom_trix.js +++ b/plugins/frontlinesms-core/test/js/lib/dom_trix.js @@ -9,38 +9,49 @@ dom_trix = (function() { process.exit(1); } - var initDomFromString, initDomFromFile, initJquery, resetDom; + var initDomFromString, initDomFromFile, initJquery, initJqueryValidation, initI18n, jqueryValidations; + initDomFromString = function(domString) { console.log("Initialising DOM with HTML: " + domString + "..."); - var document = jsdom.jsdom(domString, null, { features: { QuerySelector: true } }), - window = document.createWindow(), - navigator = { - userAgent: 'node-js' - }; - global.window = window; - global.navigator = navigator; - global.document = window.document; - console.log("DOM SETUP COMPLETE"); + global.document = jsdom.jsdom(domString, null, { features: { QuerySelector: true } }); + global.window = global.document.createWindow(); + global.navigator = { userAgent:'node-js' }; initJquery(); + initJqueryValidation(); + initI18n(); + console.log("DOM initialiased."); }; + initDomFromFile = function(file) { var fs = require('fs'); initDomFromString(fs.readFileSync(file).toString()); }; + + initI18n = function() { + console.log("Initialising i18n..."); + global.i18n = function() {}; + console.log("i18n initialiased."); + }; + initJquery = function() { console.log("Initialising jQuery..."); - var jQuery = require("jquery"); - global.jQuery = jQuery; - global.$ = jQuery; + global.jQuery = window.jQuery = global.$ = window.$ = require("jquery").create(global.window); console.log("jQuery initialiased."); }; - resetDom = function() { - // TODO + + initJqueryValidation = function() { + console.log("Initialising jQuery validation..."); + jqueryValidations = { elements:[], errors:[] }; + global.validator = { + element:function(e) { jqueryValidations.elements.push(e); }, + showErrors:function(e) { jqueryValidations.errors.push(e); } + }; + console.log("jQuery validation initialiased."); }; + return { initDomFromString:initDomFromString, - initDomFromFile:initDomFromFile, - resetDom:resetDom + initDomFromFile:initDomFromFile }; }()); diff --git a/plugins/frontlinesms-core/test/js/lib/js_test_util.js b/plugins/frontlinesms-core/test/js/lib/js_test_util.js new file mode 100644 index 000000000..0582d0a56 --- /dev/null +++ b/plugins/frontlinesms-core/test/js/lib/js_test_util.js @@ -0,0 +1,14 @@ +fail = function(message) { + console.log("Explicit call to fail with message: " + message); + ok(false, message); +}; + +TODO = function(message) { + console.log("TODO: " + message); + if(message === undefined) { + fail(); + } else { + test("TODO: " + message, function() { fail(); }); + } +}; + diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter/standard.html b/plugins/frontlinesms-core/test/js/recipient_selecter/standard.html new file mode 100644 index 000000000..4049cde9a --- /dev/null +++ b/plugins/frontlinesms-core/test/js/recipient_selecter/standard.html @@ -0,0 +1,38 @@ + + + +
    + + 0 +
    +
    + +
    + +
    +
    +
      +
    • + + + +
      • +
    • + + + +
      • +
    +
      +
    • + + + +
      • +
    +
    +
    + + + diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js index 3eae75fc9..30d7f0b07 100644 --- a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js +++ b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js @@ -1,10 +1,9 @@ -test("a basic test example", function (assert) { - ok(true, "this test is fine"); - var value = "hello"; - equal("hello", value, "We expect value to be hello"); -}); +function setup() { + dom_trix.initDomFromFile("test/js/recipient_selecter/standard.html"); + + // Make recipientSelecter visible to jsdom + window.recipientSelecter = recipientSelecter; -test("recipientSelecter is initialiased", function() { notEqual(recipientSelecter, null, "recipientSelecter object should be defined"); notEqual(recipientSelecter.addAddressHandler, null); notEqual(recipientSelecter.updateRecipientCount, null); @@ -14,15 +13,106 @@ test("recipientSelecter is initialiased", function() { notEqual(recipientSelecter.validateAddressEntry, null); equal(recipientSelecter.nonExistentMethod, null); +} + +function checkGroup(elementNumber) { + var inputElement = $("#groups-" + elementNumber); + inputElement.attr("checked", "checked"); + recipientSelecter.selectMembers(inputElement, inputElement.val(), inputElement.next().text(), eval(inputElement.attr("groupmembers"))); +} + +function checkContact(elementNumber) { + var e = $("#addresses-" + elementNumber); + e.attr("checked", "checked"); + recipientSelecter.setContact(e, e.val()); +} + +function assertRecipientCountEquals(expectedCount) { + equal(jQuery("#recipient-count").text(), expectedCount, "recipient count check"); +} + + +test("a basic test example", function (assert) { + ok(true, "this test is fine"); + var value = "hello"; + equal("hello", value, "We expect value to be hello"); +}); + +test("validate should fail if no mobile number, contact, group or smart group selected", function() { + // given + setup(); + + // then + equal(false, recipientSelecter.validateImmediate()); + equal(false, recipientSelecter.validateDeferred()); +}); + +test("validate should pass if address is present in address field", function() { + // given + setup(); + + // when + $("#address").val("+123"); + + // then + ok(recipientSelecter.validateImmediate()); + ok(recipientSelecter.validateDeferred()); +}); + +test("validate should pass if address is added from address field", function() { + // given + setup(); + $("#address").val("+123"); + + // when + recipientSelecter.addAddressHandler(); + + // then + ok(recipientSelecter.validateImmediate()); + ok(recipientSelecter.validateDeferred()); +}); + +test("validate should pass if single contact is selected", function() { + // given + setup(); + + // when + checkContact(0); + + // then + ok(recipientSelecter.validateImmediate()); + ok(recipientSelecter.validateDeferred()); +}); + +test("validate should pass if populated group is selected", function() { + // given + setup(); + + // when + checkGroup(5); + + // then + assertRecipientCountEquals(2); + ok(recipientSelecter.validateImmediate(), "should validate"); + ok(recipientSelecter.validateDeferred(), "should validate"); +}); + +test("validateImmediate should not pass if only empty groups are selected, but validateDeferred should", function() { + // given + setup(); + + // when + checkGroup(0); + + // then + assertRecipientCountEquals(0); + equal(false, recipientSelecter.validateImmediate()); + ok(recipientSelecter.validateDeferred()); }); test("setContact should add a contact if he is not already there", function() { // given - dom_trix.initDomFromString("" + - "" + - "" + - "0" + - ""); + setup(); var e = jQuery("input[name=whatever]"); // when @@ -55,3 +145,4 @@ test("setContact should add a contact if he is not already there", function() { equal(jQuery("#recipient-count").text(), 1, "Should have one recipient."); }); + diff --git a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js index fbd5d20c7..23e695642 100644 --- a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js +++ b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js @@ -1,18 +1,27 @@ recipientSelecter = (function() { - var addAddressHandler, updateRecipientCount, searchForContacts, selectMembers, setContact, validateAddressEntry; + var addAddressHandler, updateRecipientCount, searchForContacts, selectMembers, setContact, validateAddressEntry, validateImmediate, validateDeferred; function inCheckedGroup(value) { var checkedGroups, t; checkedGroups = $("li.group input:checked"); t = false; $.each(checkedGroups, function(index, element) { - if($.inArray(value, $.makeArray($(element).attr("groupMembers")))) { + element = $(element); + if($.inArray(value, $.makeArray(element.attr("groupMembers")))) { t = true; } }); return t; } + function getMobileNumbersArray() { + var mobileNumbersString = $("#mobileNumbers").val(); + if(mobileNumbersString) { + return mobileNumbersString.split(","); + } + return []; + } + selectMembers = function(element, groupIdString, groupName, allContacts) { var mobileNumbers, contactMobileNumbers = {}; $.each($("#mobileNumbers").val().split(","), function(index, value) { @@ -43,6 +52,7 @@ recipientSelecter = (function() { $("#mobileNumbers").val(($.makeArray(mobileNumbers).join(","))); + updateRecipientCount(); }; @@ -73,7 +83,7 @@ recipientSelecter = (function() { $("#mobileNumbers").val(($.makeArray(mobileNumbers).join(","))); updateRecipientCount(); - } + }; // FIXME current this method is unused function setValueForCheckBox(value, checked) { @@ -108,7 +118,41 @@ recipientSelecter = (function() { return false; } return true; - } + }; + + /** Validate that at least one contact or mobile number is selected NOW! */ + validateImmediate = function() { + var valid, addressListener; + addAddressHandler(); + +// valid = $('input[name=addresses]:checked').length > 0; + valid = getMobileNumbersArray().length > 0; + + // TODO why is there listener setup here? + addressListener = function() { +// FIXME we need to pass the validator in here, otherwise we will never have access to it + if($('input[name=addresses]:checked').length > 0) { + if("undefined" !== typeof validator) validator.element($('#contacts').find("input[name=addresses]")); + $('#recipients-list').removeClass("error"); + } else { + $('#recipients-list').addClass("error"); + if("undefined" !== typeof validator) validator.showErrors({"addresses": i18n("poll.recipients.validation.error")}); + } + }; + if (!valid) { + $('input[name=addresses]').change(addressListener); + $('input[name=addresses]').trigger("change"); + } + return valid; + }; + + /** + * Validate that at least one contact, mobile number, group or smart group + * is selected, but allow empty groups. + */ + validateDeferred = function() { + return $("#groups li.group input[type='checkbox']:checked").size() || validateImmediate(); + }; addAddressHandler = function() { var address, checkbox, sanitizedAddress; @@ -120,7 +164,7 @@ recipientSelecter = (function() { if(address[0] === "+") { sanitizedAddress = "+" + sanitizedAddress; } - checkbox = $("li.manual").find(":checkbox[value=" + sanitizedAddress + "]").val(); + checkbox = $("li.manual").find(":checkbox[value='" + sanitizedAddress + "']").val(); if(checkbox !== address) { $("#contacts").prepend("
  • " + sanitizedAddress + "
    • "); $("li.manual.contact[f-number='"+sanitizedAddress+"'] input").trigger('click'); @@ -152,7 +196,7 @@ recipientSelecter = (function() { } }); } - } + }; return { addAddressHandler:addAddressHandler, @@ -160,7 +204,9 @@ recipientSelecter = (function() { searchForContacts:searchForContacts, selectMembers:selectMembers, setContact:setContact, - validateAddressEntry:validateAddressEntry + validateAddressEntry:validateAddressEntry, + validateImmediate:validateImmediate, + validateDeferred:validateDeferred }; }()); From 191ff5b3570e8fbc86beb3856c9834688f887acd Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 11 Dec 2012 16:00:08 +0300 Subject: [PATCH 0104/2668] Removed pointless test from recipient_selecter_tests --- .../frontlinesms-core/test/js/recipient_selecter_tests.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js index 30d7f0b07..46ddb6722 100644 --- a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js +++ b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js @@ -31,13 +31,6 @@ function assertRecipientCountEquals(expectedCount) { equal(jQuery("#recipient-count").text(), expectedCount, "recipient count check"); } - -test("a basic test example", function (assert) { - ok(true, "this test is fine"); - var value = "hello"; - equal("hello", value, "We expect value to be hello"); -}); - test("validate should fail if no mobile number, contact, group or smart group selected", function() { // given setup(); @@ -145,4 +138,3 @@ test("setContact should add a contact if he is not already there", function() { equal(jQuery("#recipient-count").text(), 1, "Should have one recipient."); }); - From 6ca845fb727c437f5558022917f2d759ca66a168 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 11 Dec 2012 16:39:43 +0300 Subject: [PATCH 0105/2668] Geof|Sitati Initial database migration without alias update handling --- .../domain/frontlinesms2/PollResponse.groovy | 1 - .../migrations/changelog-2.0.groovy | 268 ++++++++++++++++++ .../grails-app/migrations/changelog.groovy | 2 + 3 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/PollResponse.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/PollResponse.groovy index eb5077911..18bcf96ec 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/PollResponse.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/PollResponse.groovy @@ -3,7 +3,6 @@ package frontlinesms2 class PollResponse { String key String value - boolean isUnknownResponse = false static belongsTo = [poll: Poll] static hasMany = [messages: Fmessage] List messages = [] diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy new file mode 100644 index 000000000..b66e633a1 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -0,0 +1,268 @@ +databaseChangeLog = { + + changeSet(author: "geoffrey (generated)", id: "1355230052153-1") { + createTable(tableName: "autoforward") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "autoforwardPK") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-2") { + createTable(tableName: "autoforward_contact") { + column(name: "autoforward_contacts_id", type: "bigint") + + column(name: "contact_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-3") { + createTable(tableName: "autoforward_grup") { + column(name: "autoforward_groups_id", type: "bigint") + + column(name: "group_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-4") { + createTable(tableName: "autoforward_smart_group") { + column(name: "autoforward_smart_groups_id", type: "bigint") + + column(name: "smart_group_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-5") { + createTable(tableName: "fconnection_fmessage") { + column(name: "fconnection_messages_id", type: "bigint") + + column(name: "fmessage_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-6") { + createTable(tableName: "generic_webconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "generic_webcoPK") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-7") { + createTable(tableName: "request_parameter") { + column(autoIncrement: "true", name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "request_paramPK") + } + + column(name: "version", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "connection_id", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "name", type: "varchar(255)") { + constraints(nullable: "false") + } + + column(name: "value", type: "varchar(255)") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-8") { + createTable(tableName: "smssync_dispatch") { + column(name: "connection_id", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "dispatch_id", type: "bigint") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-9") { + createTable(tableName: "smssync_fconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "smssync_fconnPK") + } + + column(name: "receive_enabled", type: "boolean") { + constraints(nullable: "false") + } + + column(name: "secret", type: "varchar(255)") + + column(name: "send_enabled", type: "boolean") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-10") { + createTable(tableName: "subscription") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "subscriptionPK") + } + + column(name: "default_action", type: "varchar(255)") { + constraints(nullable: "false") + } + + column(name: "group_id", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "join_autoreply_text", type: "varchar(255)") + + column(name: "leave_autoreply_text", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-11") { + createTable(tableName: "ushahidi_webconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "ushahidi_webcPK") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-12") { + createTable(tableName: "webconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "webconnectionPK") + } + + column(name: "api_enabled", type: "boolean") { + constraints(nullable: "false") + } + + column(name: "http_method", type: "varchar(255)") { + constraints(nullable: "false") + } + + column(name: "secret", type: "varchar(255)") + + column(name: "url", type: "varchar(255)") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-13") { + addColumn(tableName: "clickatell_fconnection") { + column(name: "from_number", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-14") { + addColumn(tableName: "clickatell_fconnection") { + column(name: "send_to_usa", type: "boolean") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-15") { + addColumn(tableName: "fmessage") { + column(name: "owner_detail", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-16") { + //Not null contraint is added at the end of this script + addColumn(tableName: "keyword") { + column(name: "is_top_level", type: "boolean") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-17") { + addColumn(tableName: "keyword") { + column(name: "keywords_idx", type: "integer") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-18") { + addColumn(tableName: "keyword") { + column(name: "owner_detail", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-20") { + addColumn(tableName: "smslib_fconnection") { + column(name: "manufacturer", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-21") { + addColumn(tableName: "smslib_fconnection") { + column(name: "model", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-22") { + addNotNullConstraint(columnDataType: "varchar(1600)", columnName: "TEXT", tableName: "FMESSAGE") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-23") { + addPrimaryKey(columnNames: "connection_id, dispatch_id", constraintName: "smssync_dispaPK", tableName: "smssync_dispatch") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-25") { + addForeignKeyConstraint(baseColumnNames: "autoforward_contacts_id", baseTableName: "autoforward_contact", constraintName: "FK8954F717D290A53C", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "autoforward", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-26") { + addForeignKeyConstraint(baseColumnNames: "contact_id", baseTableName: "autoforward_contact", constraintName: "FK8954F7176256D8C2", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "contact", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-27") { + addForeignKeyConstraint(baseColumnNames: "autoforward_groups_id", baseTableName: "autoforward_grup", constraintName: "FK3C39752FC133A1DB", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "autoforward", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-28") { + addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "autoforward_grup", constraintName: "FK3C39752F9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-29") { + addForeignKeyConstraint(baseColumnNames: "autoforward_smart_groups_id", baseTableName: "autoforward_smart_group", constraintName: "FK4D8334002A1445A5", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "autoforward", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-30") { + addForeignKeyConstraint(baseColumnNames: "smart_group_id", baseTableName: "autoforward_smart_group", constraintName: "FK4D8334003BEF92BF", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "smart_group", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-31") { + addForeignKeyConstraint(baseColumnNames: "fconnection_messages_id", baseTableName: "fconnection_fmessage", constraintName: "FKD49CD6FC51C23BBF", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "fconnection", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-32") { + addForeignKeyConstraint(baseColumnNames: "fmessage_id", baseTableName: "fconnection_fmessage", constraintName: "FKD49CD6FC92DDC012", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "fmessage", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-33") { + addForeignKeyConstraint(baseColumnNames: "connection_id", baseTableName: "request_parameter", constraintName: "FKF047F9F95F834456", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "webconnection", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-34") { + addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "subscription", constraintName: "FK1456591D9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") + } + + // changeSet(author: "geoffrey", id:"1355230052153-35") { + // grailsChange{ + // change{ + + // } + // } + // } + + //make this changelog work with preexisting polls + changeSet(author: "geoffrey (generated)", id: "1355230052153-36") { + dropColumn(columnName: "ALIASES", tableName: "POLL_RESPONSE") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-37") { + addNotNullConstraint(columnDataType: "boolean", columnName: "IS_TOP_LEVEL", tableName: "KEYWORD") + } +} diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy index 664031784..25966c48f 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy @@ -20,5 +20,7 @@ databaseChangeLog = { include file: 'changelog-0.4.groovy' include file: 'changelog-1.0-rc2.groovy' + + include file: 'changelog-2.0.groovy' } From 8e1e34e65ec26facaa7a3e362cd81b00dd5e099a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 11 Dec 2012 16:49:12 +0300 Subject: [PATCH 0106/2668] Minor JS cleanup. --- .../grails-app/views/autoreply/_validate.gsp | 15 ++- .../grails-app/views/status/_traffic.gsp | 108 ++++++++---------- 2 files changed, 59 insertions(+), 64 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp index 5508db4c8..b5692d975 100644 --- a/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/autoreply/_validate.gsp @@ -1,5 +1,7 @@ function initializePopup() { + var validator, keyWordTabValidation, messageTextTabValidation, confirmTabValidation; + $("#messageText").val("${activityInstanceToEdit.autoreplyText.escapeForJavascript()}"); $("#messageText").trigger("keyup"); @@ -8,7 +10,7 @@ aliasCustomValidation(); genericSortingValidation(); - var validator = $("#create_autoreply").validate({ + validator = $("#create_autoreply").validate({ errorContainer: ".error-panel", rules: { messageText: { required:true }, @@ -16,17 +18,17 @@ } }); - var keyWordTabValidation = function() { + keyWordTabValidation = function() { if(!isGroupChecked("blankKeyword")){ return validator.element('#keywords'); } else return true; }; - var messageTextTabValidation = function() { + messageTextTabValidation = function() { return validator.element('#messageText'); }; - var confirmTabValidation = function() { + confirmTabValidation = function() { return validator.element('input[name=name]'); }; @@ -40,9 +42,10 @@ } function updateConfirmationMessage() { - var autoreplyText = $('#messageText').val().htmlEncode(); + var autoreplyText, keywords; + autoreplyText = $('#messageText').val().htmlEncode(); if(!(isGroupChecked("blankKeyword"))){ - var keywords = $('#keywords').val().toUpperCase(); + keywords = $('#keywords').val().toUpperCase(); $("#keyword-confirm").html('

    ' + keywords + '

    '); } else { $("#keyword-confirm").html('

    ' + i18n("autoreply.blank.keyword") + '

    '); diff --git a/plugins/frontlinesms-core/grails-app/views/status/_traffic.gsp b/plugins/frontlinesms-core/grails-app/views/status/_traffic.gsp index 160abb555..6a284b224 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/_traffic.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/_traffic.gsp @@ -1,66 +1,58 @@ $(function() { - var data1 = ${messageStats["sent"]}; - var data2 = ${messageStats["received"]}; - var xdata = ${messageStats["xdata"]}; - var data = [data1, data2]; - var dataCaption = ["Sent", "Received"]; - var holder = "trafficGraph"; - var sent = data1.sum(), received = data2.sum(), total = data.pack().sum(); - var sentPercent = "", receivedPercent = ""; - if(total > 0) { - sentPercent = " (" + Math.round(sent * 100 / total) + "%) "; - receivedPercent = " (" + Math.round(received * 100 / total) + "%) "; - } + var data1 = ${messageStats["sent"]}; + var data2 = ${messageStats["received"]}; + var xdata = ${messageStats["xdata"]}; + var data = [data1, data2]; + var dataCaption = ["Sent", "Received"]; + var holder = "trafficGraph"; + var sent = data1.sum(), received = data2.sum(), total = data.pack().sum(); + var sentPercent = "", receivedPercent = ""; + if(total > 0) { + sentPercent = " (" + Math.round(sent * 100 / total) + "%) "; + receivedPercent = " (" + Math.round(received * 100 / total) + "%) "; + } - var formatString = '' - formatString += '' - formatString += '
    %s messages
    ' - plot3 = $.jqplot(holder, data, { - stackSeries: true, - captureRightClick: true, - seriesDefaults:{ - renderer:$.jqplot.BarRenderer, - rendererOptions: { - barMargin: 15, - highlightMouseDown: true - }, - pointLabels: {show: false} - }, - series:[ - {label:i18n("traffic.sent") + ':' + sent + sentPercent}, - {label:i18n("traffic.received") + ':' + received + receivedPercent} - ], - axes: { - xaxis: { - renderer: $.jqplot.CategoryAxisRenderer, - ticks: xdata - }, - yaxis: { - padMin: 0 - } - }, - highlighter: { - show:true, - showTooltip: true, - tooltipLocation: 'n', - tooltipAxes: 'y', - yvalues: 1, - formatString: formatString - }, - legend: { - renderer: $.jqplot.EnhancedLegendRenderer, - show: true, - location: 'nw', - placement: 'inside' - } - }); - - $(window).bind('resize', function(event, ui) { - plot3.replot( { resetAxes: true } ); - }); + var formatString = '' + formatString += '' + formatString += '
    %s messages
    ' + plot3 = $.jqplot(holder, data, { + stackSeries: true, + captureRightClick: true, + seriesDefaults:{ + renderer:$.jqplot.BarRenderer, + rendererOptions:{ barMargin:15, highlightMouseDown:true }, + pointLabels: {show: false} + }, + series:[ + { label:i18n("traffic.sent") + ':' + sent + sentPercent }, + { label:i18n("traffic.received") + ':' + received + receivedPercent } + ], + axes: { + xaxis: { renderer:$.jqplot.CategoryAxisRenderer, ticks:xdata }, + yaxis:{ padMin:0 } + }, + highlighter: { + show:true, + showTooltip: true, + tooltipLocation: 'n', + tooltipAxes: 'y', + yvalues: 1, + formatString: formatString + }, + legend: { + renderer: $.jqplot.EnhancedLegendRenderer, + show: true, + location: 'nw', + placement: 'inside' + } + }); + + $(window).bind('resize', function(event, ui) { + plot3.replot( { resetAxes: true } ); }); +});

    From 42bd59e52a8884b44e1fda6363f8897c4fca28fa Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 11 Dec 2012 16:51:53 +0300 Subject: [PATCH 0107/2668] Minor JS cleanup to recipient_selecter --- .../frontlinesms-core/web-app/js/recipient_selecter.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js index 23e695642..77c351361 100644 --- a/plugins/frontlinesms-core/web-app/js/recipient_selecter.js +++ b/plugins/frontlinesms-core/web-app/js/recipient_selecter.js @@ -125,18 +125,21 @@ recipientSelecter = (function() { var valid, addressListener; addAddressHandler(); -// valid = $('input[name=addresses]:checked').length > 0; valid = getMobileNumbersArray().length > 0; // TODO why is there listener setup here? addressListener = function() { // FIXME we need to pass the validator in here, otherwise we will never have access to it if($('input[name=addresses]:checked').length > 0) { - if("undefined" !== typeof validator) validator.element($('#contacts').find("input[name=addresses]")); + if("undefined" !== typeof validator) { + validator.element($('#contacts').find("input[name=addresses]")); + } $('#recipients-list').removeClass("error"); } else { $('#recipients-list').addClass("error"); - if("undefined" !== typeof validator) validator.showErrors({"addresses": i18n("poll.recipients.validation.error")}); + if("undefined" !== typeof validator) { + validator.showErrors({"addresses": i18n("poll.recipients.validation.error")}); + } } }; if (!valid) { From a60e23b623438216d8e5b40b520f6a01c4de9446 Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 11 Dec 2012 17:13:02 +0300 Subject: [PATCH 0108/2668] fixed validation of urls in webconnection --- .../frontlinesms-core/application.properties | 2 +- .../grails-app/conf/BuildConfig.groovy | 1 + .../frontlinesms2/ActivityController.groovy | 4 +--- .../domain/frontlinesms2/Webconnection.groovy | 2 +- .../grails-app/i18n/messages.properties | 1 + .../GenericWebconnectionSpec.groovy | 24 +++++++++++++++++++ .../web-app/META-INF/context.xml | 4 ++++ .../web-app/WEB-INF/context.xml | 4 ++++ 8 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/META-INF/context.xml create mode 100644 plugins/frontlinesms-core/web-app/WEB-INF/context.xml diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index f8d7cdb18..5754abc25 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Mon Dec 10 11:30:10 EAT 2012 +#Mon Dec 10 17:49:03 EAT 2012 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index d3a0b0982..73a65366d 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -89,6 +89,7 @@ grails.project.dependency.resolution = { runtime ':routing:1.2.2-camel-2.9.4' runtime ":csv:0.3.1" compile ":quartz2:0.2.3-frontlinesms" + compile "commons-validator:commons-validator:1.4.0" test ":code-coverage:1.2.5" test ":codenarc:0.17" diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 433bf39c0..8d22d5539 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -147,9 +147,7 @@ class ActivityController extends ControllerUtils { } }.join('\n') } else { - errors = instance.errors.allErrors.collect { - message(code:it.codes[0], args:it.arguments.flatten(), defaultMessage:it.defaultMessage) - }.join('\n') + errors = instance.errors.allErrors.collect { message(error:it) }.join('\n') } withFormat { json { render([ok:false, text:errors] as JSON) } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index da3382537..d6462e020 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -58,7 +58,7 @@ abstract class Webconnection extends Activity implements FrontlineApi { }) secret(nullable:true) url(nullable:false, validator: { val, obj -> - return val.startsWith("http://") || val.startsWith("https://") + return new org.apache.commons.validator.UrlValidator().isValid(val) }) } static mapping = { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 06c2b9790..2c0637799 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -881,6 +881,7 @@ webconnection.ushahidi.crowdmapkey.label=Crowdmap/Ushahidi API Key: webconnection.ushahidi.keyword.label=Keyword: webconnection.api.disabled=API Disabled frontlinesms2.GenericWebconnection.url.validator.error=Invalid URL (should start with http:// or https://) +frontlinesms2.UshahidiWebconnection.url.validator.error=Invalid URL (should start with http:// or https://) webconnection.confirm=Confirm webconnection.keyword.title=Transfer every message received containing the following keyword: diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy index 30020cfe9..1e7b2e0b5 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy @@ -29,6 +29,30 @@ class GenericWebconnectionSpec extends CamelUnitSpecification { null | false } + def "Test URL constraints"() { + when: + def extComm = new GenericWebconnection(name:"URL",url:url,httpMethod:Webconnection.HttpMethod.GET) + then: + extComm.validate() == valid + where: + url | valid + 'http://www.cuug.com/branderr/csce.html' | true + 'ftp://www.sagana.com/home/smith/budget.wk1' | true + 'https://www.apple.com/index.html' | true + 'http://127.0.0.1:8080/frontlinesms-core' | true + 'http://127.0.0.1' | true + 'www.apple.com/index.html' | false + 'http://localhost:8080/frontlinesms-core' | false + 'http//www.apple.com/index.php' | false + 'https://http://home/frontlinesms' | false + 'http://....home.com' | false + 'http:/www.apple.com/index.html' | false + 'http:/wwww.apple.com/index.html' | false + 'htpp:/www.apple.com/index.html' | false + 'htttp:/www.apple.com/index.html' | false + 'htttp:/www..apple.com/index.html' | false + } + def 'apiProcess should pass call to service'() { given: WebconnectionService s = Mock() diff --git a/plugins/frontlinesms-core/web-app/META-INF/context.xml b/plugins/frontlinesms-core/web-app/META-INF/context.xml new file mode 100644 index 000000000..f11b8330c --- /dev/null +++ b/plugins/frontlinesms-core/web-app/META-INF/context.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/WEB-INF/context.xml b/plugins/frontlinesms-core/web-app/WEB-INF/context.xml new file mode 100644 index 000000000..f11b8330c --- /dev/null +++ b/plugins/frontlinesms-core/web-app/WEB-INF/context.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 8261d26d8d4c7db4842412968bbb0d2385bfbbab Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 11 Dec 2012 17:44:10 +0300 Subject: [PATCH 0109/2668] Fixed building of migrationless installers. --- .../grails-app/conf/Config.groovy | 1 + .../grails-app/conf/DataSource.groovy | 72 ++++++++++--------- .../frontlinesms-core/install/build.install4j | 4 +- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/Config.groovy b/plugins/frontlinesms-core/grails-app/conf/Config.groovy index 930ea9d92..edfb02cb1 100644 --- a/plugins/frontlinesms-core/grails-app/conf/Config.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/Config.groovy @@ -62,6 +62,7 @@ grails.hibernate.cache.queries = true grails.plugin.databasemigration.updateOnStartFileNames = ['changelog.groovy'] // Allow disabling of migrations via system property +println "MIGRATIONS: System.properties.'db.migrations' = ${System.properties['db.migrations']}" grails.plugin.databasemigration.updateOnStart = System.properties['db.migrations'] != 'false' // set per-environment settings diff --git a/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy b/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy index 0d4f56c1d..83ba31a06 100644 --- a/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy @@ -11,38 +11,42 @@ hibernate { } // environment specific settings environments { - development { - dataSource { - def runMigrations = System.properties.'db.migrations' - if(runMigrations == "false") { - println "WARNING:: DATABASE MIGRATION DISABLED" - dbCreate = "create-drop" - } - url = "jdbc:h2:mem:devDb;MVCC=TRUE" - } - } - test { - dataSource { - dbCreate = "update" - url = "jdbc:h2:mem:testDb${frontlinesms2.StaticApplicationInstance.uniqueId};MVCC=TRUE" - logSql = true - } - } - production { - dataSource { - def prodDbName = System.properties.'db.name' ?: 'prodDb' // production DB name defaults to prodDb - url = "jdbc:h2:${frontlinesms2.ResourceUtils.resourcePath}/${prodDbName};MVCC=TRUE" - pooled = true - properties { - maxActive = -1 - minEvictableIdleTimeMillis=1800000 - timeBetweenEvictionRunsMillis=1800000 - numTestsPerEvictionRun=3 - testOnBorrow=true - testWhileIdle=true - testOnReturn=true - validationQuery="SELECT 1" - } - } - } + def runMigrations = System.properties.'db.migrations' != 'false' + development { + dataSource { + if(!runMigrations) { + println "WARNING:: DATABASE MIGRATION DISABLED" + dbCreate = 'create-drop' + } + url = "jdbc:h2:mem:devDb;MVCC=TRUE" + } + } + test { + dataSource { + dbCreate = 'update' + url = "jdbc:h2:mem:testDb${frontlinesms2.StaticApplicationInstance.uniqueId};MVCC=TRUE" + logSql = true + } + } + production { + dataSource { + if(!runMigrations) { + println "WARNING:: DATABASE MIGRATION DISABLED" + dbCreate = 'create' + } + def prodDbName = System.properties.'db.name' ?: 'prodDb' // production DB name defaults to prodDb + url = "jdbc:h2:${frontlinesms2.ResourceUtils.resourcePath}/${prodDbName};MVCC=TRUE" + pooled = true + properties { + maxActive = -1 + minEvictableIdleTimeMillis=1800000 + timeBetweenEvictionRunsMillis=1800000 + numTestsPerEvictionRun=3 + testOnBorrow=true + testWhileIdle=true + testOnReturn=true + validationQuery="SELECT 1" + } + } + } } diff --git a/plugins/frontlinesms-core/install/build.install4j b/plugins/frontlinesms-core/install/build.install4j index 8b17040d6..e08de9c14 100644 --- a/plugins/frontlinesms-core/install/build.install4j +++ b/plugins/frontlinesms-core/install/build.install4j @@ -42,7 +42,7 @@ - + @@ -80,7 +80,7 @@ - ${compiler:db.migrations} -Dfrontlinesms.resource.path=~/.${compiler:app.shortName} + -Dfrontlinesms.resource.path=~/.${compiler:app.shortName} From caaf27bdf9e775ee80c13c6d256912fac29ca964 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 11 Dec 2012 17:56:10 +0300 Subject: [PATCH 0110/2668] added debug lines to migration script --- .../migrations/changelog-2.0.groovy | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy index b66e633a1..7625ccc96 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -249,13 +249,19 @@ databaseChangeLog = { addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "subscription", constraintName: "FK1456591D9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") } - // changeSet(author: "geoffrey", id:"1355230052153-35") { - // grailsChange{ - // change{ - - // } - // } - // } + // TODO: this should transform old keywords into top level keywords, and old poll Aliases into second level keywords + changeSet(author: "sitati", id:"1355230052153-35") { + grailsChange{ + change{ + println "MIGRATIONS:::::::::: about to migrate pollResponses" + sql.executeUpdate("UPDATE keyword SET is_top_level = true") + sql.eachRow("SELECT * FROM POLL_RESPONSE") { pollResponse -> + println "MIGRATIONS::::::::: migrating pollResponse $pollResponse" + // sql.execute('INSERT INTO keyword ()') TODO + } + } + } + } //make this changelog work with preexisting polls changeSet(author: "geoffrey (generated)", id: "1355230052153-36") { From 2ec9085cbb0a593b70c204d5ec53747d3dc7da11 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 11 Dec 2012 18:48:41 +0300 Subject: [PATCH 0111/2668] added more alias->keyword migrations --- .../grails-app/migrations/changelog-2.0.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy index 7625ccc96..28bc4a054 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -177,6 +177,7 @@ databaseChangeLog = { } } + //TODO:: WHAT IS THIS? I think it is breaking existing keywords changeSet(author: "geoffrey (generated)", id: "1355230052153-17") { addColumn(tableName: "keyword") { column(name: "keywords_idx", type: "integer") @@ -257,7 +258,9 @@ databaseChangeLog = { sql.executeUpdate("UPDATE keyword SET is_top_level = true") sql.eachRow("SELECT * FROM POLL_RESPONSE") { pollResponse -> println "MIGRATIONS::::::::: migrating pollResponse $pollResponse" - // sql.execute('INSERT INTO keyword ()') TODO + pollResponse.ALIASES.each { aliasValue -> + sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level) values ($pollResponse.POLL_ID, $pollResponse.ID, $aliasValue, false)") + } } } } From 8c0b2655c64fb32c874084ec6f8092d8a2774279 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 10:44:22 +0300 Subject: [PATCH 0112/2668] Cleaned up dependencies introduced to support events. --- plugins/frontlinesms-core/application.properties | 3 +-- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 5754abc25..c4b302c3c 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,7 +1,6 @@ #Grails Metadata file -#Mon Dec 10 17:49:03 EAT 2012 +#Thu Dec 13 10:40:00 EAT 2012 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 app.version=2.0-SNAPSHOT -plugins.events-push=1.0.M4-SNAPSHOT diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 73a65366d..1e5e9bddd 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -82,7 +82,6 @@ grails.project.dependency.resolution = { runtime ":database-migration:1.0" runtime ":jquery:1.7.1" runtime ':jquery-ui:1.8.15' - runtime ":resources:1.1.6" runtime ":export:1.1" runtime ":markdown:1.0.0.RC1" @@ -91,6 +90,8 @@ grails.project.dependency.resolution = { compile ":quartz2:0.2.3-frontlinesms" compile "commons-validator:commons-validator:1.4.0" + compile ':platform-core:1.0.RC2' + test ":code-coverage:1.2.5" test ":codenarc:0.17" test ":spock:0.6" From 7e07b1a694e39eee2e72170d425b4e18848cc81d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 13 Dec 2012 11:20:03 +0300 Subject: [PATCH 0113/2668] corrected keywords_idx migration in keyword table for poll --- .../grails-app/migrations/changelog-2.0.groovy | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy index 28bc4a054..dffe3265b 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -255,11 +255,14 @@ databaseChangeLog = { grailsChange{ change{ println "MIGRATIONS:::::::::: about to migrate pollResponses" - sql.executeUpdate("UPDATE keyword SET is_top_level = true") - sql.eachRow("SELECT * FROM POLL_RESPONSE") { pollResponse -> - println "MIGRATIONS::::::::: migrating pollResponse $pollResponse" - pollResponse.ALIASES.each { aliasValue -> - sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level) values ($pollResponse.POLL_ID, $pollResponse.ID, $aliasValue, false)") + sql.executeUpdate("UPDATE keyword SET is_top_level = true, keywords_idx = 0") + sql.eachRow("SELECT * FROM POLL") { poll -> + def pollKeywordIndex = 1 // because top level keyword already set as zero + sql.eachRow("SELECT * FROM POLL_RESPONSE WHERE POLL_ID = ${poll.ID}") { pollResponse -> + pollResponse.ALIASES?.split(',').each { aliasValue -> + sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level, keywords_idx) values ($poll.ID, $pollResponse.KEY, ${aliasValue.trim()}, false, $pollKeywordIndex)") + pollKeywordIndex += 1 + } } } } From b76d8d8a5ee2782bec59df9a794f423c4348369d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 11:25:21 +0300 Subject: [PATCH 0114/2668] Fixed resources plugin dependency; updated selenium. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 1e5e9bddd..6715fba73 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -49,7 +49,7 @@ grails.project.dependency.resolution = { // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg. // runtime 'mysql:mysql-connector-java:5.1.16' - def seleniumVersion = '2.25.0' + def seleniumVersion = '2.28.0' def camel = { def camelVersion = "2.9.4" "org.apache.camel:camel-$it:$camelVersion" @@ -82,6 +82,7 @@ grails.project.dependency.resolution = { runtime ":database-migration:1.0" runtime ":jquery:1.7.1" runtime ':jquery-ui:1.8.15' + runtime ':resources:1.2.RC3' runtime ":export:1.1" runtime ":markdown:1.0.0.RC1" From 0248a4821042ab462f8d263f2624833e64d3e881 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 13 Dec 2012 11:37:32 +0300 Subject: [PATCH 0115/2668] getting latest message in DispatchRouterService --- .../services/frontlinesms2/DispatchRouterService.groovy | 3 ++- .../frontlinesms2/domain/FmessageISpec.groovy | 9 +++++++++ .../services/DispatchRouterServiceSpec.groovy | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 49e606a43..c19ff57b2 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -36,7 +36,8 @@ class DispatchRouterService { if(appSettingsService.get('routing.uselastreceiver') == true){ def d = Dispatch.get(exchange.in.getHeader('frontlinesms.dispatch.id')) println "dispatch to send # $d ### d.dst # $d?.dst" - def latestReceivedMessage = Fmessage.findBySrcAndOrderByDateCreated(d.dst) + def latestReceivedMessage = Fmessage.findBySrc(d.dst, [sort: 'dateCreated', order:'desc']) + println "## latestReceivedMessage ## is $latestReceivedMessage" if(latestReceivedMessage?.receivedOn) { log "## Sending message with receivedOn Connection ##" def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index 6ec897463..f24511a5b 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -390,6 +390,15 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { then: message.receivedOn == null } +@spock.lang.IgnoreRest + def 'doing a Fmessage.findBySrc should give me youngest message'() { + when: + Fmessage.build(src:'111', text:'oldest') + Fmessage.build(src:'111', text:'old') + Fmessage.build(src:'111', text:'youngest') + then: + Fmessage.findBySrc('111', [sort: 'dateCreated', order:'desc']).text == 'youngest' + } private Folder getTestFolder(params=[]) { new Folder(name:params.name?:'test', diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index 2f0b87f26..17a005646 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -13,7 +13,7 @@ import org.apache.camel.Message @Mock([Dispatch, Fmessage]) class DispatchRouterServiceSpec extends Specification { def setup() { - Fmessage.metaClass.static.findBySrcAndOrderByDateCreated = { src-> + Fmessage.metaClass.static.findBySrc = { src, map-> def m = Mock(Fmessage) m.receivedOn >> '2' return m From 30442ea1029a96f5a1ce41832fc9bcd1fa98643d Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 13 Dec 2012 12:25:01 +0300 Subject: [PATCH 0116/2668] fixed routing to lastReceivedConnection in DispatchRouterService --- .../frontlinesms2/DispatchRouterService.groovy | 10 ++++++---- .../services/DispatchRouterServiceSpec.groovy | 13 +++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index c19ff57b2..e23173426 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -33,11 +33,13 @@ class DispatchRouterService { return "seda:out-$requestedFconnectionId" } else { def routeId - if(appSettingsService.get('routing.uselastreceiver') == true){ - def d = Dispatch.get(exchange.in.getHeader('frontlinesms.dispatch.id')) - println "dispatch to send # $d ### d.dst # $d?.dst" + log "appSettingsService.['routing.uselastreceiver'] is ${appSettingsService.get('routing.uselastreceiver')}" + if(appSettingsService.get('routing.uselastreceiver') == 'true'){ + log "Dispatch is ${exchange.in.getBody()}" + def d = exchange.in.getBody() + log "dispatch to send # $d ### d.dst # $d?.dst" def latestReceivedMessage = Fmessage.findBySrc(d.dst, [sort: 'dateCreated', order:'desc']) - println "## latestReceivedMessage ## is $latestReceivedMessage" + log "## latestReceivedMessage ## is $latestReceivedMessage" if(latestReceivedMessage?.receivedOn) { log "## Sending message with receivedOn Connection ##" def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index 17a005646..ec4cd7ba2 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -66,7 +66,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should assign message to the last received route if route preference set to last received route'(){ given: - mockAppSettingsService(true,'any') + mockAppSettingsService('true','any') mockRoutes(1, 2, 3) when: def routedTo = service.slip(mockExchange(), null, null) @@ -76,7 +76,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should not assign messages to any route if routing preference is not to send messages even if routes are available'(){ given: - mockAppSettingsService(false,'dontsend') + mockAppSettingsService('false','dontsend') mockRoutes(1, 2, 3) when: def routedTo = service.slip(mockExchange(), null, null) @@ -87,7 +87,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should not assign messages to any route if routing preference is not to send messages when routes are not avalilable'(){ given: - mockAppSettingsService(false,'dontsend') + mockAppSettingsService('false','dontsend') when: def routedTo = service.slip(mockExchange(), null, null) then: @@ -107,7 +107,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should assign messages to round robin if routing preference is set to use avalilable routes'() { given: - mockAppSettingsService(false,'any') + mockAppSettingsService('false','any') mockRoutes(1, 2, 3) when: def routedTo = (1..5).collect { service.slip(mockExchange(), null, null) } @@ -117,7 +117,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should prioritise internet services over modems if routing preference is set to use avalilable routes'() { given: - mockAppSettingsService(false,'any') + mockAppSettingsService('false','any') mockRoutes(1:'internet', 2:'modem', 3:'internet', 4:'modem') when: def routedTo = (1..5).collect { service.slip(mockExchange(), null, null) } @@ -127,7 +127,7 @@ class DispatchRouterServiceSpec extends Specification { private def mockExchange() { def exchange = Mock(Exchange) - exchange.in >> mockExchangeMessage(['frontlinesms.dispatch.id':'1'], null) + exchange.in >> mockExchangeMessage(['frontlinesms.dispatch.id':'1'], Mock(Dispatch)) exchange.out >> mockExchangeMessage([:], null) println "x.in.headers ######### $exchange.in.headers" return exchange @@ -135,6 +135,7 @@ class DispatchRouterServiceSpec extends Specification { private mockExchangeMessage(headers, body){ def m = Mock(Message) + body.id >> 1 m.body >> body m.headers >> headers return m From e6b435bf9483a50b4611e39df49b9133dfc6d804 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 12:27:51 +0300 Subject: [PATCH 0117/2668] Added junit reporting to javascript unit tests. --- plugins/frontlinesms-core/do/js_unit_test_xml | 3 + .../test/js/lib/junitlogger.js | 268 ++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100755 plugins/frontlinesms-core/do/js_unit_test_xml create mode 100644 plugins/frontlinesms-core/test/js/lib/junitlogger.js diff --git a/plugins/frontlinesms-core/do/js_unit_test_xml b/plugins/frontlinesms-core/do/js_unit_test_xml new file mode 100755 index 000000000..a41e397a6 --- /dev/null +++ b/plugins/frontlinesms-core/do/js_unit_test_xml @@ -0,0 +1,3 @@ +#!/bin/bash +set -e +do/js_unit_test | sgrep '("")' | sed -e '/\/testsuites/,$d'; echo "" diff --git a/plugins/frontlinesms-core/test/js/lib/junitlogger.js b/plugins/frontlinesms-core/test/js/lib/junitlogger.js new file mode 100644 index 000000000..af5b2e199 --- /dev/null +++ b/plugins/frontlinesms-core/test/js/lib/junitlogger.js @@ -0,0 +1,268 @@ +(function() { + var count = 0, suiteCount = 0, currentSuite, currentTest, suites = [], assertCount, start, results = {failed:0, passed:0, total:0, time:0}; + + QUnit.jUnitReport = function(data) { + // Gets called when a report is generated + console.log(data.xml); + }; + + QUnit.moduleStart(function(data) { + currentSuite = { + name: data.name, + tests: [], + failures: 0, + time: 0, + stdout : '', + stderr : '' + }; + + suites.push(currentSuite); + }); + + QUnit.moduleDone(function(data) { + }); + + QUnit.testStart(function(data) { + if(!start){ start = new Date(); } + + assertCount = 0; + + currentTest = { + name: data.name, + failures: [], + start: new Date() + }; + + // Setup default suite if no module was specified + if (!currentSuite) { + currentSuite = { + name: "default", + tests: [], + failures: 0, + time: 0, + stdout : '', + stderr : '' + }; + + suites.push(currentSuite); + } + + currentSuite.tests.push(currentTest); + }); + + QUnit.testDone(function(data) { + currentTest.failed = data.failed; + currentTest.total = data.total; + currentSuite.failures += data.failed; + + results.failed += data.failed; + results.passed += data.passed; + results.total += data.total; + }); + + QUnit.log(function(data) { + assertCount++; + + if (!data.result) { + currentTest.failures.push(data.message); + + // Add log message of failure to make it easier to find in jenkins UI + currentSuite.stdout += '[' + currentSuite.name + ', ' + currentTest.name + ', ' + assertCount + '] ' + data.message + '\n'; + } + }); + + QUnit.done(function(data) { + function ISODateString(d) { + function pad(n) { + return n < 10 ? '0' + n : n; + } + + return d.getUTCFullYear() + '-' + + pad(d.getUTCMonth() + 1)+'-' + + pad(d.getUTCDate()) + 'T' + + pad(d.getUTCHours()) + ':' + + pad(d.getUTCMinutes()) + ':' + + pad(d.getUTCSeconds()) + 'Z'; + } + + // Generate XML report + var i, ti, fi, test, suite, + xmlWriter = new XmlWriter({ + linebreak_at : "testsuites,testsuite,testcase,failure,system-out,system-err" + }), + now = new Date(); + + xmlWriter.start('testsuites'); + for (i = 0; i < suites.length; i++) { + suite = suites[i]; + + // Calculate time + for (ti = 0; ti < suite.tests.length; ti++) { + test = suite.tests[ti]; + + test.time = (now.getTime() - test.start.getTime()) / 1000; + suite.time += test.time; + } + + xmlWriter.start('testsuite', { + id: "" + i, + name: suite.name, + errors: "0", + failures: suite.failures, + hostname: "localhost", + tests: suite.tests.length, + time: Math.round(suite.time * 1000) / 1000, + timestamp: ISODateString(now) + }); + + for (ti = 0; ti < suite.tests.length; ti++) { + test = suite.tests[ti]; + + xmlWriter.start('testcase', { + name: test.name, + total: test.total, + failed: test.failed, + time: Math.round(test.time * 1000) / 1000 + }); + + for (fi = 0; fi < test.failures.length; fi++) { + xmlWriter.start('failure', {type: "AssertionFailedError", message: test.failures[fi]}, true); + } + + xmlWriter.end('testcase'); + } + + if (suite.stdout) { + xmlWriter.start('system-out'); + xmlWriter.cdata('\n' + suite.stdout); + xmlWriter.end('system-out'); + } + + if (suite.stderr) { + xmlWriter.start('system-err'); + xmlWriter.cdata('\n' + suite.stderr); + xmlWriter.end('system-err'); + } + + xmlWriter.end('testsuite'); + } + + xmlWriter.end('testsuites'); + + results.time = new Date() - start; + + QUnit.jUnitReport({ + results:results, + xml: xmlWriter.getString() + }); + }); + + function XmlWriter(settings) { + function addLineBreak(name) { + if (lineBreakAt[name] && data[data.length - 1] !== '\n') { + data.push('\n'); + } + } + + function makeMap(items, delim, map) { + var i; + + items = items || []; + + if (typeof(items) === "string") { + items = items.split(','); + } + + map = map || {}; + + i = items.length; + while (i--) { + map[items[i]] = {}; + } + + return map; + } + + function encode(text) { + var baseEntities = { + '"' : '"', + "'" : ''', + '<' : '<', + '>' : '>', + '&' : '&' + }; + + return ('' + text).replace(/[<>&\"\']/g, function(chr) { + return baseEntities[chr] || chr; + }); + } + + var data = [], stack = [], lineBreakAt; + + settings = settings || {}; + lineBreakAt = makeMap(settings.linebreak_at || 'mytag'); + + this.start = function(name, attrs, empty) { + if (!empty) { + stack.push(name); + } + + data.push('<', name); + + for (var aname in attrs) { + data.push(" " + encode(aname), '="', encode(attrs[aname]), '"'); + } + + data.push(empty ? ' />' : '>'); + addLineBreak(name); + }; + + this.end = function(name) { + stack.pop(); + addLineBreak(name); + data.push(''); + addLineBreak(name); + }; + + this.text = function(text) { + data.push(encode(text)); + }; + + this.cdata = function(text) { + data.push(''); + }; + + this.comment = function(text) { + data.push(''); + }; + + this.pi = function(name, text) { + if (text) { + data.push('\n'); + } else { + data.push('\n'); + } + }; + + this.doctype = function(text) { + data.push('\n'); + }; + + this.getString = function() { + for (var i = stack.length - 1; i >= 0; i--) { + this.end(stack[i]); + } + + stack = []; + + return data.join('').replace(/\n$/, ''); + }; + + this.reset = function() { + data = []; + stack = []; + }; + + this.pi(settings.xmldecl || 'xml version="1.0" encoding="UTF-8"'); + } +})(); From 3f1fe19962b327c69b6c1b578f06bda5d7518abb Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 12:53:26 +0300 Subject: [PATCH 0118/2668] Minor cleanup to GenericWebconnectionSpec and url validation --- .../grails-app/conf/BuildConfig.groovy | 1 - .../domain/frontlinesms2/Webconnection.groovy | 4 +-- .../controller/HelpControllerISpec.groovy | 2 +- .../GenericWebconnectionSpec.groovy | 35 ++++++++++--------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 6715fba73..eeec9c0a1 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -89,7 +89,6 @@ grails.project.dependency.resolution = { runtime ':routing:1.2.2-camel-2.9.4' runtime ":csv:0.3.1" compile ":quartz2:0.2.3-frontlinesms" - compile "commons-validator:commons-validator:1.4.0" compile ':platform-core:1.0.RC2' diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index fb730ae50..1b1c3609c 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -57,9 +57,7 @@ abstract class Webconnection extends Activity implements FrontlineApi { return true }) secret(nullable:true) - url(nullable:false, validator: { val, obj -> - return new org.apache.commons.validator.UrlValidator().isValid(val) - }) + url nullable:false, url:true, validator:{ val, obj -> val ==~ 'http(s?)://.*' } } static mapping = { requestParameters cascade: "all-delete-orphan" diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy index 4ce88d54f..740512eaa 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy @@ -20,7 +20,7 @@ class HelpControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.response.text == '

    This help file is not yet available, sorry.

    ' } - def 'appSettingsService should be updated prooperly on new popup display'() { + def 'appSettingsService should be updated properly on new popup display'() { when: controller.newfeatures() then: diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy index 1e7b2e0b5..1753c3fb7 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy @@ -29,28 +29,29 @@ class GenericWebconnectionSpec extends CamelUnitSpecification { null | false } - def "Test URL constraints"() { + @Unroll + def "Test URL constraints for #url (valid? #valid)"() { when: def extComm = new GenericWebconnection(name:"URL",url:url,httpMethod:Webconnection.HttpMethod.GET) then: extComm.validate() == valid where: - url | valid - 'http://www.cuug.com/branderr/csce.html' | true - 'ftp://www.sagana.com/home/smith/budget.wk1' | true - 'https://www.apple.com/index.html' | true - 'http://127.0.0.1:8080/frontlinesms-core' | true - 'http://127.0.0.1' | true - 'www.apple.com/index.html' | false - 'http://localhost:8080/frontlinesms-core' | false - 'http//www.apple.com/index.php' | false - 'https://http://home/frontlinesms' | false - 'http://....home.com' | false - 'http:/www.apple.com/index.html' | false - 'http:/wwww.apple.com/index.html' | false - 'htpp:/www.apple.com/index.html' | false - 'htttp:/www.apple.com/index.html' | false - 'htttp:/www..apple.com/index.html' | false + url | valid + 'http://www.example.com/branderr/csce.html' | true + 'https://www.example.com/index.html' | true + 'http://127.0.0.1:8080/frontlinesms-core' | true + 'http://127.0.0.1' | true + 'www.example.com/index.html' | false + 'http://localhost:8080/frontlinesms-core' | false + 'http//www.example.com/index.php' | false + 'https://http://home/frontlinesms' | false + 'http://....home.com' | false + 'http:/www.example.com/index.html' | false + 'http:/wwww.example.com/index.html' | false + 'htpp:/www.example.com/index.html' | false + 'htttp:/www.example.com/index.html' | false + 'htttp:/www..example.com/index.html' | false + 'ftp://www.example.com/home/smith/budget.wk1' | false } def 'apiProcess should pass call to service'() { From 665b7052c3d71f7202f2ba505459435f74231ee5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 14:05:14 +0300 Subject: [PATCH 0119/2668] Added japanese translation. --- .../grails-app/i18n/messages_jp.properties | 751 ++++++++++++++++++ 1 file changed, 751 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties new file mode 100644 index 000000000..75f2bf00b --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties @@ -0,0 +1,751 @@ +# FrontlineSMS English translation by the FrontlineSMS team, Nairobi +language.name=Japanese + +# General info +app.version.label=Version + +# Common action imperatives - to be used for button labels and similar +action.ok=OK +action.close=閉じる +action.cancel=キャンセル +action.done=完了 +action.next=次へ +action.prev=前へ +action.back=戻る +action.create=作成 +action.edit=編集 +action.rename=名前の変更 +action.save=保存 +action.save.all=全て保存 +action.delete=消去 +action.delete.all=すべて消去 +action.send=送る +action.export=エクスポート + +# Messages when FrontlineSMS server connection is lost +server.connection.fail.title=サーバへの接続が失われました. +server.connection.fail.info=FrontlineSMSを再起動するか, ウインドウを閉じて下さい. + +#Connections: +connection.creation.failed={0} に接続されませんでした +connection.route.destroyed={0} から {1} への経路が破棄されました +connection.route.connecting=接続しています... +connection.route.disconnecting=切断しています... +connection.route.successNotification={0}への経路の作成に成功しました +connection.route.failNotification={1} への経路の作成に失敗:: {2} [edit] +connection.route.destroyNotification={0} への経路を切断 +connection.test.sent={1} を経由した {0} へのテストメッセージの送信に成功しました +# Connection exception messages +connection.error.org.smslib.alreadyconnectedexception=デバイスは接続済みです +connection.error.org.smslib.gsmnetworkregistrationexception=GSMネットワークへの登録に失敗しました +connection.error.org.smslib.invalidpinexception=PINが間違っています +connection.error.org.smslib.nopinexception=PINが入力されませんでした +connection.error.java.io.ioexception=ポート接続エラーです: {0} + +connection.header=接続 +connection.list.none=登録されている接続はありません +connection.edit=接続を編集 +connection.delete=接続を消去 +connection.deleted=接続 {0} は消去されました +connection.route.create=経路を作成する +connection.add=新しい接続を追加 +connection.createtest.message.label=メッセージ +connection.route.destroy=経路を破棄 +connection.send.test.message=テストメッセージを送る +connection.test.message=おめでとうございます! \\o/ {0} の SMS送信の設定に成功しました \\o/ +connection.validation.prompt=全ての必須項目への入力をお願いします +connection.select=接続タイプを選択して下さい +connection.type=タイプを選択して下さい +connection.details=詳細を入力 +connection.confirm=確認 +connection.createtest.number=番号 +connection.confirm.header=設定を確認 +connection.name.autoconfigured=ポート {2} で, {0} を {1} に自動設定しました + +status.connection.header=接続 +status.connection.none=設定済みの接続がありません. +status.devises.header=検知されたデバイス +status.detect.modems=モデムを検知 +status.modems.none=検知されたデバイスがありません. + +connectionstatus.not_connected=切断 +connectionstatus.connecting=接続しています +connectionstatus.connected=接続済み + +default.doesnt.match.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は要求されたパターン [{3}] と一致しません。 +default.invalid.url.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は有効なURLではありません。 +default.invalid.creditCard.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は有効なクレジットカードナンバーではありません。 +default.invalid.email.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は有効なe-mailアドレスではありません。 +default.invalid.range.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は [{3}] から [{4}]　の間の値でなければなりません。 +default.invalid.size.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は [{3}] から [{4}]　の間のサイズでなければなりません。 +default.invalid.max.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は最大値 [{3}] を超えています。 +default.invalid.min.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は最小値 [{3}] よりも低い値となっています。 +default.invalid.max.size.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は [{3}] の最大サイズを超えています。 +default.invalid.min.size.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は [{3}] の最小サイズよりも低い値となっています。 +default.invalid.validator.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] はカスタムバリデーションされませんでした。 +default.not.inlist.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] が リスト [{3}]　に見つかりません。 +default.blank.message=クラス[{1}]のプロパティ[{0}]は空欄にしないで下さい。 +default.not.equal.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は [{3}]　と同じ値にすることはできません。 +default.null.message=クラス [{1}] のプロパティ [{0}] はnullにしないで下さい。 +default.not.unique.message=クラス[{1}]のプロパティ[{0}]の値 [{2}] は既に使用されています。他の値を入力して下さい。 + +default.paginate.prev=戻る +default.paginate.next=進む +default.boolean.true=真 +default.boolean.false=偽 +default.date.format=yyyy/MM/dd hh:mm +default.number.format=0 + +default.unarchived={0} がアンアーカイブされました +default.unarchive.failed={0} のアンアーカイブに失敗しました +default.trashed={0} をゴミ箱に移動しました +default.restored={0} を復元しました +default.restore.failed={0} をID {1} で復元できませんでした +default.archived={0} のアーカイブに成功しました +default.archived.multiple={0} をアーカイブしました +default.created={0} を作成しました +default.created.message={0} {1} は作成されました、 +default.create.failed={0} の作成に失敗しました +default.updated={0} はアップデートされました +default.update.failed=id {1} での {0} のアップデートに失敗しました +default.updated.multiple= {0} はアップデートされました +default.updated.message={0} はアップデートされました +default.deleted={0} は消去されました +default.trashed={0} をゴミ箱に移動しました +default.trashed.multiple={0} をゴミ箱に移動しました +default.archived={0} はアーカイブされました +default.unarchived={0} がアンアーカイブされました +default.unarchive.keyword.failed={0} の展開に失敗しました. そのキーワードはすでに使用されています +default.unarchived.multiple={0} がアンアーカイブされました +default.delete.failed=id {1} での {0} の消去に失敗しました +default.notfound=id {1} で {0} が見つけられませんでした +default.optimistic.locking.failure=編集中に他のユーザが {0} をアップデートしました + +default.home.label=ホーム +default.list.label={0} リスト +default.add.label={0} を追加 +default.new.label=新規 {0} +default.create.label={0} を作成 +default.show.label={0} を表示 +default.edit.label={0} を編集 +search.clear=検索をクリア + +default.button.create.label=作成 +default.button.edit.label=編集 +default.button.update.label=更新 +default.button.delete.label=削除 +default.button.search.label=検索 +default.button.apply.label=実行 +default.button.delete.confirm.message=ほんとうによいですか? + +default.deleted.message={0} を削除しました + +# Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author) +typeMismatch.java.net.URL=プロパティ {0} は有効なURLでないといけません +typeMismatch.java.net.URI=プロパティ {0} は有効なURIでないといけません +typeMismatch.java.util.Date=プロパティ {0} は有効な日付でないといけません +typeMismatch.java.lang.Double=プロパティ {0} は有効な数でないといけません +typeMismatch.java.lang.Integer=プロパティ {0} は有効な数でないといけません +typeMismatch.java.lang.Long=プロパティ {0} は有効な数でないといけません +typeMismatch.java.lang.Short=プロパティ {0} は有効な数でないといけません +typeMismatch.java.math.BigDecimal=プロパティ {0} は有効な数でないといけません +typeMismatch.java.math.BigInteger=プロパティ {0} は有効な数でないといけません +typeMismatch.int = {0} は有効な数でないといけません + +# Application specific messages +messages.trash.confirmation=ゴミ箱を空にします。中のメッセージは破棄され、復元することはできません。続けて良いですか? +default.created.poll=アンケートが作成されました! +default.search.label=検索をクリア +default.search.betweendates.title=日付の範囲: +default.search.moresearchoption.label=他の検索オプション +default.search.date.format=yyyy/MM/dd +default.search.moreoption.label=他のオプション + +# SMSLib Fconnection +smslibfconnection.label=電話/モデム +smslibfconnection.type.label=タイプ +smslibfconnection.name.label=名前 +smslibfconnection.port.label=ポート +smslibfconnection.baud.label=ボー +smslibfconnection.pin.label=PIN +smslibfconnection.imsi.label=SIM IMSI +smslibfconnection.serial.label=デバイスのシリアル番号 +smslibfconnection.send.label=モデムはメッセージの送信のみに使用して下さい +smslibfconnection.receive.label =モデムはメッセージの受信のみに使用して下さい +smslibFconnection.send.validator.error.send=モデムは送信のみに使われます +smslibFconnection.receive.validator.error.receive=または受信のみに使われます + +# Email Fconnection +emailfconnection.label=Eメール +emailfconnection.type.label=タイプ +emailfconnection.name.label=名前 +emailfconnection.receiveProtocol.label=プロトコル +emailfconnection.serverName.label=サーバ名 +emailfconnection.serverPort.label=サーバのポート +emailfconnection.username.label=ユーザ名 +emailfconnection.password.label=パスワード + +# CLickatell Fconnection +clickatellfconnection.label=Clickatellアカウント +clickatellfconnection.type.label=タイプ +clickatellfconnection.name.label=名前 +clickatellfconnection.apiId.label=API ID +clickatellfconnection.username.label=ユーザ名 +clickatellfconnection.password.label=パスワード + +# Messages Tab +message.create.prompt=メッセージを入力 +message.character.count=残り {0} 文字 ({1} SMS メッセージ) +message.character.count.warning=置換後はより長くなる可能性があります +announcement.label=アナウンス +announcement.description=アナウンス・メッセージを送り、回答をまとめます +announcement.info1=アナウンスは保存され, メッセージは待機メッセージキューに追加されます +announcement.info2=メッセージ数やネットワークの状況により,全てのメッセージを送信するには多少の時間がかかることがあります. +announcement.info3=メッセージの状態を見るには, 待機メッセージフォルダを開いて下さい. +announcement.info4=アナウンスを見るには, メニューの左でクリックして下さい +announcement.validation.prompt=すべての必須項目を入力して下さい +announcement.select.recipients=対象者を選択 +announcement.confirm=Confirm +announcement.delete.warn={0} を削除 警告: この操作は取り消せません! +announcement.prompt=このアナウンスに名前をつけて下さい +announcement.confirm.message=メッセージ +announcement.details.label=詳細を確認 +announcement.message.label=メッセージ +announcement.message.none=なし +announcement.recipients.label=対象者 +announcement.create.message=メッセージを作成 +#TODO embed javascript values +announcement.recipients.count=選択された連絡先 +announcement.messages.count=メッセージは送信されませんでした +announcement.moreactions.delete=アナウンスを削除 +announcement.moreactions.rename=アナウンス名を変更 +announcement.moreactions.edit=アナウンスを編集 +announcement.moreactions.export=アナウンスをエクスポート +frontlinesms2.Announcement.name.unique.error.frontlinesms2.Announcement.name={1} {0} "{2}" はユニークでなければいけません + + +archive.inbox=受信アーカイブ +archive.sent=送信アーカイブ +archive.activity=アクティビティアーカイブ +archive.folder=フォルダアーカイブ +archive.folder.name=名前 +archive.folder.date=日付 +archive.folder.messages=メッセージ +archive.folder.none=  アーカイブされたフォルダがありません +archive.activity.name=名前 +archive.activity.type=タイプ +archive.activity.date=日付 +archive.activity.messages=メッセージ +archive.activity.list.none=  アーカイブされたアクティビティがありません +autoreply.enter.keyword=キーワードを入力 +autoreply.create.message=メッセージを入力 +autoreply.confirm=確認 +autoreply.name.label=メッセージ +autoreply.details.label=確認の詳細 +autoreply.label=自動返信 +autoreply.keyword.label=キーワード +autoreply.description=受信したメッセージに自動的に返信します +autoreply.info=自動返信が作成されると, キーワードを含むメッセージは, メニュー右手をクリックして見られる自動返信アクティビティに追加されます. +autoreply.info.warning=キーワードが設定されていない場合、自動返信は全ての受信メッセージに返信されます。 +autoreply.info.note=注意: 自動返信をアーカイブした場合は, 受信メッセージはソートされません。 +autoreply.validation.prompt=必須項目を入力して下さい +autoreply.message.title=この自動返信で送られるメッセージ: +autoreply.keyword.title=キーワードでメッセージを自動的にソート: +autoreply.name.prompt=この自動返信に名前をつけて下さい +autoreply.message.count=0 文字 (1 SMSメッセージ) +autoreply.moreactions.delete=自動返信を消去 +autoreply.moreactions.rename=自動返信の名前を変更 +autoreply.moreactions.edit=自動返信を編集 +autoreply.moreactions.export=自動返信をエクスポート +autoreply.all.messages=キーワード使用不可(全受信メッセージはこの自動返信を受け取ります) +autoreply.text.none=なし +frontlinesms2.Autoreply.name.unique.error.frontlinesms2.Autoreply.name={1} {0} "{2}" はユニークでなければいけません +frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=自動返信名はユニークでなければいけません +frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Keyword "{2}" はすでに使用されています +frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=メッセージを空白にすることはできません + +contact.new=新規連絡先 +contact.list.no.contact=連絡先がありません! +contact.header=連絡先 +contact.all.contacts=全ての連絡先 +contact.create=新しい連絡先を作成 +contact.groups.header=グループ +contact.create.group=新しいグループを作成 +contact.smartgroup.header=スマートグループ +contact.create.smartgroup=新しいスマートグループを作る +contact.add.to.group=グループに追加... +contact.remove.from.group=グループから削除 +contact.customfield.addmoreinformation=情報を追加する... +contact.customfield.option.createnew=新規作成... +contact.name.label=名前 +contact.phonenumber.label=モバイル +contact.phonenumber.international.warning=この番号は国際フォーマットではありません. メッセージと連絡先を組み合わせるときに問題を引き起こすことがあります. +contact.notes.label=ノート +contact.email.label=eメール +contact.groups.label=グループ +contact.notinanygroup.label=どのグループでもありません +contact.messages.label=メッセージ +contact.sent.messages={0} 通送信済み +contact.received.messages={0} 通受信 +contact.search.messages=メッセージを探す + +group.rename=グループ名を変更 +group.edit=グループを編集 +group.delete=グループを削除 +group.moreactions=追加のアクション... + +customfield.validation.prompt=名前を入力してて下さい +customfield.name.label=名前 +export.contact.info=FrontlineSMSから連絡先をエクスポートするには, エクスポート形式とエクスポートに含む情報を選んで下さい +export.message.info=FrontlineSMSからメッセージをエクスポートするには, エクスポート形式とエクスポートに含む情報を選んで下さい +export.selectformat=出力形式を選択して下さい +export.csv=CSVは表計算で使用される形式です +export.pdf=PDFは印刷に使用される形式です +folder.name.label=名前 +group.delete.prompt={0}を本当に削除しても良いですか? 警告: この操作は取り消せません +layout.settings.header=設定 +activities.header=アクティビティ +activities.create=アクティビティ新規作成 +folder.header=フォルダ +folder.create=フォルダ新規作成 +folder.label=フォルダ +message.folder.header={0} フォルダ +fmessage.trash.actions=ゴミ箱のアクション... +fmessage.trash.empty=ゴミ箱を空にする +fmessage.to.label=To +trash.empty.prompt=ゴミ箱の中の全てのメッセージとアクティビティが完全に削除されます。 +fmessage.responses.total=合計 {0} 回答 +fmessage.label=メッセージ +fmessage.label.multiple={0} メッセージ +poll.prompt=このアンケートに名前をつける +poll.details.label=詳細確認 +poll.message.label=メッセージ +poll.choice.validation.error.deleting.response=保存した選択に空欄があってはいけません +poll.alias=別名 +poll.aliases.prompt=関連オプションに別名をつけて下さい +poll.aliases.prompt.details=カンマで区切ることで, オプションに複数の別名をつけることができます. 最初の別名はアンケートのインストラクション・メッセージに送信されます. +poll.alias.validation.error=別名はユニークでなければいけません +poll.sort.label=自動ソート +poll.autosort.no.description=メッセージは自動的にソートされません +poll.autosort.description=メッセージをキーワードでソート +poll.sort.keyword=キーワード +poll.sort.by=ソート順 +poll.autoreply.label=自動返信 +poll.autoreply.none=なし +poll.recipients.label=対象者 +poll.recipients.none=なし +#TODO embed javascript values +poll.recipients.count=選択された連絡先 +poll.messages.count=メッセージが送信されます +poll.yes=はい +poll.no=いいえ +poll.label=アンケート +poll.description=質問の送信と返答の分析 +poll.messages.sent={0} 通が送信されました +poll.response.enabled=自動返答が有効です +poll.message.edit=対象者に送るメッセージの編集 +poll.message.prompt=以下のメッセージはアンケートの対象者に送信されます +poll.message.count=上限160文字(1 SMSメッセージ) + +poll.moreactions.delete=アンケートを削除 +poll.moreactions.rename=アンケート名を変更 +poll.moreactions.edit=アンケートを編集 +poll.moreactions.export=アンケートをエクスポート + +#TODO embed javascript values +poll.reply.text=はいには "{0} {1}" を, いいえには "{2} {3}" を答えて下さい. +poll.reply.text1={0} "{1} {2}" for {3} +poll.reply.text2='はい' または 'いいえ'を答えて下さい. +poll.reply.text3= または +poll.reply.text4={0} {1} +poll.reply.text5=返信 +poll.reply.text6=返答して下さい +poll.message.send={0} {1} +poll.recipients.validation.error=メッセージを送信する連絡先を選択して下さい +frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name = {1} {0} "{2}" はユニークでなければいけません +frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=回答のオプションは全く同じではいけません +frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value = キーワード "{2}" はすでに使用されています + +wizard.title.new=新規 +wizard.fmessage.edit.title={0} を編集 +popup.title.saved={0} を保存しました! +popup.activity.create=アクティビティの新規作成 : タイプを選んで下さい +popup.smartgroup.create=スマートグループを作成 +popup.help.title=ヘルプ +smallpopup.customfield.create.title=カスタムフィールドを作成 +smallpopup.group.rename.title=グループ名変更 +smallpopup.group.edit.title=グループを編集 +smallpopup.group.delete.title=グループを削除 +smallpopup.fmessage.rename.title={0} の名前を変更 +smallpopup.fmessage.delete.title={0} を削除 +smallpopup.fmessage.export.title=エクスポート +smallpopup.delete.prompt={0} を削除しますか? +smallpopup.delete.many.prompt={0} 連絡先を削除しますか? +smallpopup.empty.trash.prompt=ゴミ箱を空にしますか? +smallpopup.messages.export.title=エクスポート結果 ({0} メッセージ) +smallpopup.test.message.title=テストメッセージ +smallpopup.recipients.title=対象者 +smallpopup.folder.title=フォルダ +smallpopup.group.title=グループ +smallpopup.contact.export.title=エクスポート +smallpopup.contact.delete.title=削除 +contact.selected.many={0} 連絡先が選択されています +group.join.reply.message=ようこそ +group.leave.reply.message=さようなら +fmessage.new.info=新しく {0} 通のメッセージが届いています. クリックして閲覧 +wizard.quickmessage.title=クイックメッセージ +wizard.messages.replyall.title=全て返信 +wizard.send.message.title=メッセージを送る +wizard.ok=はい +wizard.create=作成 +wizard.send=送る +common.settings=設定 +common.help=ヘルプ + +activity.validation.prompt=すべての必須項目に入力して下さい +autoreply.blank.keyword=キーワードが空白です. 自動返答は全てのメッセージに返されます + + +poll.type.prompt=作成するアンケートの種類を選択 +poll.question.yes.no=はい/いいえで答えられる質問 +poll.question.multiple=選択式の質問（例：'赤ですか？','青ですか？','緑ですか？'） +poll.question.prompt=質問を入力 +poll.message.none=アンケート用のメッセージは送信できません（返答のみです） +poll.replies.header=アンケートの回答に自動返信する（オプション） +poll.replies.description=受信したメッセージがアンケートの回答であるとき、回答者にメッセージを送る +poll.autoreply.send=アンケートの回答への自動返信 +poll.responses.prompt=選択肢を入力（2から5） +poll.sort.header=キーワードでメッセージを自動ソート（オプション） +poll.sort.description=アンケートの回答の中にキーワードがあるとき,FrontlineSMSはシステム内のメッセージを自動的にソートする +poll.no.automatic.sort=メッセージを自動ソートしない +poll.sort.automatically=下記のキーワードを含むメッセージを自動ソート +poll.validation.prompt=すべての必須項目に入力して下さい +poll.name.validator.error.name=そのアンケート名は既に使用されています。 +pollResponse.value.blank.value=アンケート回答の値は空白にはできません。 +poll.alias.validation.error.invalid.alias=間違った別名です.Try a, name, word +poll.question=質問を入力 +poll.response=回答リスト +poll.sort=自動ソート +poll.reply=自動返信 +poll.edit.message=メッセージの編集 +poll.recipients=アンケート対象者を選択 +poll.confirm=確認 +poll.save=アンケートを保存! +poll.messages.queue=投票にメッセージを追加する場合,メッセージをキューに追加 +poll.messages.queue.status=メッセージ数やネットワークの状況により,すべてのメッセージの送信には多少時間がかかります. +poll.pending.messages=メッセージの状態を表示するために,待機メッセージフォルダを開いて下さい +poll.send.messages.none=メッセージは送信されません +quickmessage.details.label=詳細を確認 +quickmessage.message.label=メッセージ +quickmessage.message.none=なし +quickmessage.recipient.label=アンケート対象者 +quickmessage.recipients.label=アンケート対象者 +quickmessage.message.count=上限160字(SMS 1通あたり) +quickmessage.enter.message=メッセージを入力 +quickmessage.select.recipients=アンケート対象者を選択 +quickmessage.confirm=確認 +#TODO embed javascript values +quickmessage.recipients.count=選択された連絡先 +quickmessage.messages.count=メッセージ送信 +quickmessage.count.label=メッセージ数: +quickmessage.messages.label=メッセージ入力 +quickmessage.phonenumber.label=電話番号の追加: +quickmessage.phonenumber.add=追加 +quickmessage.selected.recipients=選択されたアンケート対象者 +quickmessage.validation.prompt=すべての必須項目を入力して下さい + +fmessage.number.error=この項目に入力した文字は、保存時に失われました +search.filter.label=検索上限 +search.filter.group=選択したグループ +search.filter.activities=アクティビティ/フォルダを選ぶ +search.filter.messages.all=全送受信 +search.filter.inbox=受信メッセージのみ +search.filter.sent=送信メッセージのみ +search.filter.archive=アーカイブを含む +search.betweendates.label=日付の範囲 +search.header=検索 +search.quickmessage=クリック・メッセージ +search.export=結果をエクスポート +search.keyword.label=キーワードまたは文章 +search.contact.name.label=連絡先の名前 +search.contact.name=連絡先の名前 +search.result.header=結果 +search.moreoptions.label=オプションの続き +settings.general=一般 +settings.connections=電話番号とコネクション +settings.logs=システム +settings.general.header=設定 > 一般 +settings.logs.header=システムログ +logs.none=ログがありません +logs.content=メッセージ +logs.date=時間 +logs.filter.label=ログを見る +logs.filter.anytime=全時間 +logs.filter.1day=直近24時間 +logs.filter.3days=直近3日 +logs.filter.7days=直近7日 +logs.filter.14days=直近14日 +logs.filter.28days=直近28日 +logs.download.label=システムログのダウンロード +logs.download.buttontext=ログダウンロード +logs.download.title=送信ログのダウンロード +logs.download.continue=続く + +smartgroup.validation.prompt=必須項目に入力して下さい. 各項目に適用できるルールは一つだけです. +smartgroup.info=スマートグループを作成にするには, そのグループに加える連絡先の条件を選択して下さい +smartgroup.contains.label=次のキーワードを含む +smartgroup.startswith.label=次の数字から始まる +smartgroup.add.anotherrule=他のルールを追加 +smartgroup.name.label=名前 + +modem.port=ポート +modem.description=説明 +modem.locked=ロックされているかもしれません +traffic.header=トラフィック +traffic.update.chart=アップデートチャート +traffic.filter.2weeks=直近2週間を見る +traffic.filter.between.dates=日付の範囲 +traffic.filter.reset=フィルタをリセット +traffic.allgroups=すべてのグループを見る +traffic.all.folders.activities=全てのアクティビティ/フォルダを見る +traffic.sent=送信 +traffic.received=受信 +traffic.total=合計 + +tab.message=メッセージ +tab.archive=アーカイブ +tab.contact=連絡先 +tab.status=状態 +tab.search=検索 + +help.info=このバージョンはベータ版ですので、組み込みヘルプがありません. この段階でヘルプを得るには、ユーザフォーラムを利用して下さい + +# IntelliSms Fconnection +intellismsfconnection.label=IntelliSMSアカウント +intellismsfconnection.type.label=タイプ +intellismsfconnection.name.label=名前 +intellismsfconnection.username.label=ユーザ名 +intellismsfconnection.password.label=パスワード + +intellismsfconnection.send.label=送信に使用 +intellismsfconnection.receive.label=受信に使用 +intellismsfconnection.receiveProtocol.label=プロトコル +intellismsfconnection.serverName.label=サーバ名 +intellismsfconnection.serverPort.label=サーバポート +intellismsfconnection.emailUserName.label=ユーザ名 +intellismsfconnection.emailPassword.label=パスワード + +#Controllers +contact.label=連絡先 +contact.edited.by.another.user=この連絡先は編集中に他のユーザにより更新されました +contact.exists.prompt=この番号での連絡先がすでに存在します +contact.exists.warn=この番号での連絡先がすでに存在します +contact.view.duplicate=複製を見る +contact.addtogroup.error=同じグループからの追加または削除はできません! +contact.mobile.label=モバイル +contact.email.label=電子メール +fconnection.label=Fコネクション +fconnection.name=Fコネクション +fconnection.unknown.type=未知のコネクションタイプ: +fconnection.test.message.sent=テストメッセージが送信されました! +announcement.saved=アナウンスが保存されメッセージは送信キューに入りました +announcement.not.saved=アナウンスは保存されませんでした! +announcement.id.exist.not=ID {0}のアナウンスが見つかりませんでした +autoreply.saved=自動返信は保存されました +autoreply.not.saved=自動返信は保存されませんでした! +report.creation.error=レポート作成に失敗しました +export.message.title=FrontlineSMSのメッセージのエクスポート +export.database.id=データベースID +export.message.date.created=日付が作成されました +export.message.text=テキスト +export.message.destination.name=宛先名 +export.message.destination.mobile=モバイルの宛先 +export.message.source.name=ソース名 +export.message.source.mobile=モバイルのソース +export.contact.title=FrontlineSMSの連絡先のエクスポート +export.contact.name=名前 +export.contact.mobile=モバイル +export.contact.email=Eメール +export.contact.notes=メモ +export.contact.groups=グループ +export.messages.name1={0} {1} ({2} メッセージ) +export.messages.name2={0} ({1} メッセージ) +export.contacts.name1={0} グループ ({1} 連絡先) +export.contacts.name2={0} スマートグループ ({1} 連絡先) +export.contacts.name3=全連絡先 ({0} 連絡先) +folder.label=フォルダ +folder.archived.successfully=フォルダはアーカイブされました! +folder.unarchived.successfully=フォルダはアンアーカイブされました! +folder.trashed=フォルダはゴミ箱に捨てられました! +folder.restored=フォルダが復元されました! +folder.exist.not=ID ｛0｝のフォルダが見つかりませんでした +folder.renamed=フォルダ名変更 + +group.label=グループ +group.name.label=名前 +group.update.success=グループは更新されました +group.save.fail=グループは保存できませんでした +group.delete.fail=グループを削除できませんした + +import.label=インポート +import.backup.label=直前のバックアップからデータをインポート +import.prompt.type=インポートするデータのタイプを選ぶ +import.contacts=連絡先の詳細 +import.messages=メッセージの詳細 +import.version1.info=バージョン1からデータをエクスポートするには,英語でエクスポートして下さい +import.prompt=インポートするデータファイルを選ぶ +import.upload.failed=ファイルのアップロードに失敗しました +import.contact.save.error=連絡先の保存中にエラーが生じました +import.contact.complete={0}連絡先がインポートされ, {1}が失敗しました +import.contact.failed.download=失敗した連絡先をダウンロード(CSV) +import.message.save.error=メッセージのセーブ中にエラーが生じました +import.message.complete={0}メッセージがインポートされ,{1}が失敗しました + +many.selected = {0} は{1} 件選択されました。 + +flash.message.activity.found.not=アクティビティが見つかりません +flash.message.folder.found.not=フォルダが見つかりません +flash.message=メッセージ +flash.message.fmessage={0}メッセージ +flash.message.fmessages.many={0} SMS メッセージ +flash.message.fmessages.many.one=1 SMS メッセージ +fmessage.exist.not=ID {0} のメッセージは見つかりませんでした +flash.message.poll.queued=アンケートは保存され、メッセージは送信キューに入りました +flash.message.poll.saved=アンケートは保存されました +flash.message.poll.not.saved=アンケートは保存されませんでした! +system.notification.ok=OK +system.notification.fail=失敗 +flash.smartgroup.delete.unable=スマートグループが削除できません +flash.smartgroup.saved=スマートグループ {0} を保存 +flash.smartgroup.save.failed=スマートグループの保存に失敗しました. エラーは {0} +smartgroup.id.exist.not=ID {0} のスマートグループは見つかりませんでした +smartgroup.save.failed=スマートグループ{0}はパラメーター {1}{2}の保存に失敗しました。エラーは {3} +contact.name.label=名前 +contact.phonenumber.label=電話番号 + +searchdescriptor.searching=検索中 +searchdescriptor.all.messages=すべてのメッセージ +searchdescriptor.archived.messages=, アーカイブされたメッセージを含む +searchdescriptor.exclude.archived.messages=, アーカイブされたメッセージを含まない +searchdescriptor.only=, {0}のみ +searchdescriptor.between=, {0} と {1} の間 +searchdescriptor.from=, {0} から +searchdescriptor.until=, {0} まで +poll.title=アンケート{0} +announcement.title=アナウンス{0} +autoreply.title=自動返信{0} +folder.title=フォルダ{0} +frontlinesms.welcome=ようこそ, FrontlineSMSへ! \\o/ +failed.pending.fmessages={0} 待機メッセージが失敗しました. 待機メッセージ一覧を確認して下さい. + +language.label=言語 +language.prompt=SMSのユーザインタフェースの言語を変える +frontlinesms.user.support=FrontlineSMSユーザサポート +download.logs.info1=警告: FrontlineSMSチームにログを提出されても, 直接お答えすることはできかねます. ユーザサポートが必要なときは, ヘルプファイルを読んでいただけますようお願いします. もしそれができない場合は、問題をユーザサポートフォーラムに書き込んで下さい: +download.logs.info2=他のユーザが同じ問題をすでに報告し、解決策を見つけています! ログを用意して'次へ'をクリックして下さい + +dynamicfield.contact_name.label=連絡先名 +dynamicfield.contact_number.label=連絡先番号 +dynamicfield.keyword.label=キーワード +dynamicfield.message_content.label=メッセージ本文 + +# Fmessage domain +fmessage.queued={0}への送信メッセージはキューに入りました +fmessage.queued.multiple={0} アンケート対象者への送信メッセージはキューに入りました +fmessage.retry.success={0}への再送メッセージはキューに入りました +fmessage.retry.success.multiple={0} 通の再送メッセージがキューに入りました +fmessage.displayName.label=名前 +fmessage.text.label=メッセージ +fmessage.date.label=日付 +fmessage.to=To: {0} +fmessage.to.multiple=To: {0} アンケート対象者 +fmessage.quickmessage=クイックメッセージ +fmessage.archive=アーカイブ +fmessage.activity.archive={0} をアーカイブ +fmessage.unarchive={0} をアンアーカイブ +fmessage.export=エクスポート +fmessage.rename={0} の名前を変更 +fmessage.edit={0} を編集 +fmessage.delete={0} を削除 +fmessage.moreactions=その他の操作 +fmessage.footer.show=一覧 +fmessage.footer.show.failed=失敗 +fmessage.footer.show.all=全て +fmessage.footer.show.starred=星マーク付きのみ +fmessage.archive.back=戻る +fmessage.activity.sentmessage=({0} メッセージ送信済み) +fmessage.failed=失敗 +fmessage.header=メッセージ +fmessage.section.inbox=受信箱 +fmessage.section.sent=送信 +fmessage.section.pending=待機 +fmessage.section.trash=ゴミ箱 +fmessage.addsender=連絡先に追加 +fmessage.resend=再送信 +fmessage.retry=再試行 +fmessage.reply=返信 +fmessage.forward=転送 +fmessage.unarchive=アンアーカイブ +fmessage.delete=削除 +fmessage.messages.none=メーセージがありません! +fmessage.selected.none=メッセージが選択されていません +fmessage.move.to.header=メッセージを移動... +fmessage.move.to.inbox=受信箱 +fmessage.archive.many=全てアーカイブ +fmessage.count=1 メッセージ +fmessage.count.many={0} メッセージ +fmessage.many= メッセージ +fmessage.delete.many=全て削除 +fmessage.reply.many=全て返信 +fmessage.restore=復元 +fmessage.restore.many=復元 +fmessage.retry.many=復元に失敗 +fmessage.selected.many={0} メッセージが選択されています +fmessage.unarchive.many=全てアンアーカイブ + +# TODO move to poll.* +fmessage.showpolldetails=グラフを見る +fmessage.hidepolldetails=グラフを隠す + +# TODO move to search.* +fmessage.search.none=該当するメッセージは見つかりませんでした +fmessage.search.description=左から新しい検索を開始できます + +activity.name=名前 +activity.delete.prompt={0} をゴミ箱に移します. このとき関連する全てのメッセージもゴミ箱に移動します. +activity.label=アクティビティ +activity.categorize=回答を分類 + +magicwand.title=代用表現を追加 +folder.create.success=フォルダ作成に成功しました +folder.create.failed=フォルダを作成できませんでした +folder.name.validator.error=すでに使用されているフォルダ名です +folder.name.blank.error=フォルダ名は空白にできません +poll.name.blank.error=アンケート名は空白にできません +poll.name.validator.error=すでに使用されているアンケート名です +autoreply.name.blank.error=自動返信名は空白にできません +autoreply.name.validator.error=すでに使用されている自動返信名です +announcement.name.blank.error=アナウンス名は空白にできません +announcement.name.validator.error=すでに使用されているアナウンス名です +group.name.blank.error=グループ名は空白にできません +group.name.validator.error=すでに使用されているグループ名です + +#Jquery Validation messages +jquery.validation.required=この項目は必須です +jquery.validation.remote=この項目を固定して下さい +jquery.validation.email=有効なEメールアドレスを入力して下さい. +jquery.validation.url=有効なURLを入力して下さい. +jquery.validation.date=有効な日付を入力して下さい. +jquery.validation.dateISO=有効な日付(ISO)を入力して下さい. +jquery.validation.number=有効な番号を入力して下さい. +jquery.validation.digits=数字のみを入力して下さい. +jquery.validation.creditcard=有効なクレジットカード番号を入力して下さい. +jquery.validation.equalto=同じ値を再度入力して下さい. +jquery.validation.accept=有効な期間延長範囲内で値を入力して下さい +jquery.validation.maxlength={0} 文字以上を入力して下さい. +jquery.validation.minlength=少なくとも {0} 文字以上入力して下さい. +jquery.validation.rangelength={0} 文字から {1} 文字以内の値を入力して下さい. +jquery.validation.range={0} から {1} 以内の値を入力して下さい. +jquery.validation.max={0} 以下の値を入力して下さい. +jquery.validation.min={0}以上の値を入力して下さい. + From 05d1ad641ae2ac7f23887a745a13194fb4860902 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 13 Dec 2012 14:33:48 +0300 Subject: [PATCH 0120/2668] updated substitution expressions with 'contact_x' to 'recipient_x' --- .../migrations/changelog-2.0.groovy | 51 +++++++++++++++---- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy index dffe3265b..953472432 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -250,31 +250,62 @@ databaseChangeLog = { addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "subscription", constraintName: "FK1456591D9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") } - // TODO: this should transform old keywords into top level keywords, and old poll Aliases into second level keywords + //> POLL, ALIAS AND KEYWORD TRANSFORMATIONS changeSet(author: "sitati", id:"1355230052153-35") { grailsChange{ change{ - println "MIGRATIONS:::::::::: about to migrate pollResponses" + // first set all existing keywords as top-level, and as first in the keyword list for the poll sql.executeUpdate("UPDATE keyword SET is_top_level = true, keywords_idx = 0") sql.eachRow("SELECT * FROM POLL") { poll -> - def pollKeywordIndex = 1 // because top level keyword already set as zero - sql.eachRow("SELECT * FROM POLL_RESPONSE WHERE POLL_ID = ${poll.ID}") { pollResponse -> - pollResponse.ALIASES?.split(',').each { aliasValue -> - sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level, keywords_idx) values ($poll.ID, $pollResponse.KEY, ${aliasValue.trim()}, false, $pollKeywordIndex)") - pollKeywordIndex += 1 + println "MIGRATIONS:::::::::: about to migrate poll: ${poll}" + // check if poll has keywords (if not, it has automatic sorting disabled, no need to act on aliases) + def pollKeywordCount = 0 + sql.eachRow("SELECT * FROM keyword WHERE activity_id = ${poll.ID}") { pollKeyword -> pollKeywordCount += 1 } + if(pollKeywordCount) { + def pollKeywordIndex = 1 // because top level keyword already set as zero + sql.eachRow("SELECT * FROM POLL_RESPONSE WHERE POLL_ID = ${poll.ID}") { pollResponse -> + println "MIGRATIONS:::::::::: for poll: ${poll}, migrating poll response:::: ${pollResponse}" + pollResponse.ALIASES?.split(',').each { aliasValue -> + println "MIGRATIONS:::::::::: for poll: ${poll}, migrating poll response ${pollResponse}: alias::: ${aliasValue}" + sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level, keywords_idx) values ($poll.ID, $pollResponse.KEY, ${aliasValue.trim()}, false, $pollKeywordIndex)") + pollKeywordIndex += 1 + } } } + else { + println "Poll had no keywords, skipping alias migration" + } + // update ${contact_name} and ${contact_number} substitutions to ${recipient_name} and ${recipient_number} + if(poll.AUTOREPLY_TEXT?.contains('${contact_name}') || poll.AUTOREPLY_TEXT?.contains('${contact_number}')) { + def newAutoreplyText = poll.AUTOREPLY_TEXT.replace('${contact_name}', '${recipient_name}').replace('${contact_number}', '${recipient_number}').replace('"', '\\"') + sql.executeUpdate("UPDATE poll SET AUTOREPLY_TEXT = $newAutoreplyText WHERE poll.ID = ${poll.id}") + } } } } } - //make this changelog work with preexisting polls - changeSet(author: "geoffrey (generated)", id: "1355230052153-36") { - dropColumn(columnName: "ALIASES", tableName: "POLL_RESPONSE") + //> AUTOREPLY TRANSFORMATIONS + changeSet(author: "sitati", id:"1355230052153-36") { + grailsChange{ + change{ + sql.eachRow("SELECT * FROM AUTOREPLY") { autoreply -> + // update ${contact_name} and ${contact_number} substitutions to ${recipient_name} and ${recipient_number} + if(autoreply.AUTOREPLY_TEXT?.contains('${contact_name}') || autoreply.AUTOREPLY_TEXT?.contains('${contact_number}')) { + def newAutoreplyText = autoreply.AUTOREPLY_TEXT.replace('${contact_name}', '${recipient_name}').replace('${contact_number}', '${recipient_number}').replace('"', '\\"') + sql.executeUpdate("UPDATE autoreply SET AUTOREPLY_TEXT = '"+newAutoreplyText + "' WHERE autoreply.ID = ${autoreply.id}") + } + } + } + } } + //> POLL CLEANUP changeSet(author: "geoffrey (generated)", id: "1355230052153-37") { + dropColumn(columnName: "ALIASES", tableName: "POLL_RESPONSE") + } + + changeSet(author: "geoffrey (generated)", id: "1355230052153-38") { addNotNullConstraint(columnDataType: "boolean", columnName: "IS_TOP_LEVEL", tableName: "KEYWORD") } } From 8dc0562411efdbaa1461de2a3233d9be5de71508 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 13 Dec 2012 14:52:15 +0300 Subject: [PATCH 0121/2668] ClickatelFconnection migrations --- .../grails-app/migrations/changelog-2.0.groovy | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy index 953472432..79fb44dcf 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -177,7 +177,6 @@ databaseChangeLog = { } } - //TODO:: WHAT IS THIS? I think it is breaking existing keywords changeSet(author: "geoffrey (generated)", id: "1355230052153-17") { addColumn(tableName: "keyword") { column(name: "keywords_idx", type: "integer") @@ -300,12 +299,22 @@ databaseChangeLog = { } } - //> POLL CLEANUP + //> POLL RESPONSE ALIAS CLEANUP changeSet(author: "geoffrey (generated)", id: "1355230052153-37") { dropColumn(columnName: "ALIASES", tableName: "POLL_RESPONSE") } + //> INSTATING REQUIRED NOT_NULL CONSTRAINT ON KEYWORD.IS_TOP_LEVEL changeSet(author: "geoffrey (generated)", id: "1355230052153-38") { addNotNullConstraint(columnDataType: "boolean", columnName: "IS_TOP_LEVEL", tableName: "KEYWORD") } + + //> CLICKATEL FCONNECTION TRANSFORMATIONS + changeSet(author: "sitati", id:"1355230052153-39") { + grailsChange{ + change{ + sql.executeUpdate("UPDATE clickatell_fconnection SET send_to_usa = false") + } + } + } } From 096cf9b660c6bab0002f8ea8fd7ca275f45b329c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 15:01:09 +0300 Subject: [PATCH 0122/2668] Updated hiding of 'get started' message popup. --- .../controllers/frontlinesms2/HelpController.groovy | 3 ++- .../frontlinesms2/controller/HelpControllerISpec.groovy | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index f1dd642ea..ee76dd6a3 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -23,13 +23,14 @@ class HelpController extends ControllerUtils { render text:helpText.markdownToHtml() } def updateShowNewFeatures() { - appSettingsService['newfeatures.popup.show.immediately'] = false appSettingsService['newfeatures.popup.show.infuture'] = params.enableNewFeaturesPopup?: false appSettingsService.persist() render text:[] as JSON } def newfeatures() { + appSettingsService['newfeatures.popup.show.immediately'] = false + appSettingsService.persist() params.helpSection = 'core/features/new' section() } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy index 740512eaa..6629eec70 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/HelpControllerISpec.groovy @@ -20,11 +20,11 @@ class HelpControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.response.text == '

    This help file is not yet available, sorry.

    ' } - def 'appSettingsService should be updated properly on new popup display'() { + def 'appSettingsService should be updated to hide for rest of session on new popup display'() { when: controller.newfeatures() then: - appSettingsService['newfeatures.popup.show.infuture'] == 'false' + appSettingsService['newfeatures.popup.show.immediately'] == 'false' } @spock.lang.Unroll @@ -41,3 +41,4 @@ class HelpControllerISpec extends grails.plugin.spock.IntegrationSpec { false | 'false' } } + From 6f0eac8cb2410b6f33e9079767352a0926beb94b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 15:14:30 +0300 Subject: [PATCH 0123/2668] Fixed display of double slash in config location. --- .../src/groovy/frontlinesms2/ResourceUtils.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ResourceUtils.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ResourceUtils.groovy index 1dc48492e..a1a4da769 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ResourceUtils.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ResourceUtils.groovy @@ -4,7 +4,7 @@ class ResourceUtils { /* N.B. Unfortunately this code is currently triplcated throughout application. Please take care when editing. FIXME move to external lib. */ static String getResourcePath() { def path = System.getProperty("frontlinesms.resource.path"); - if(!path) return System.getProperty("user.home") + File.separatorChar + "/.frontlinesms2-default" + if(!path) return System.getProperty("user.home") + File.separatorChar + ".frontlinesms2-default" else if(path[0] == '~') return System.getProperty("user.home") + path.substring(1); else return path; } From 6f7a70bdb90a9c7f1e3fafba89f659b27ed09db2 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 15:15:39 +0300 Subject: [PATCH 0124/2668] Removed dead file. --- .../grails-app/views/search/_activity_list.gsp | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 plugins/frontlinesms-core/grails-app/views/search/_activity_list.gsp diff --git a/plugins/frontlinesms-core/grails-app/views/search/_activity_list.gsp b/plugins/frontlinesms-core/grails-app/views/search/_activity_list.gsp deleted file mode 100644 index 07f4ff487..000000000 --- a/plugins/frontlinesms-core/grails-app/views/search/_activity_list.gsp +++ /dev/null @@ -1,2 +0,0 @@ -
  • -
    • From ef5e73535f1480bde9912a61bab14eb59f37fdca Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 13 Dec 2012 15:33:56 +0300 Subject: [PATCH 0125/2668] test for 2.2.0 migration --- .../migration/migration_2_2_0_spec.groovy | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy diff --git a/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy b/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy new file mode 100644 index 000000000..28178ecbb --- /dev/null +++ b/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy @@ -0,0 +1,69 @@ +// migrations test + +withFrontlineSMS('2.1.3') { + new ClickatelFconnection(name:"Test Clickatel connection", apiId: "doesntmatter", username:"testuser", password:"testpass").save(failOnError:true) + def keyword = new Keyword(value: 'FOOTBALL') + def poll1 = new Poll(name: 'Football Teams', question:"Who will win?", sentMessageText:"Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'", autoreplyText:"Thank you, ${contact_name}, for participating in the football poll", keyword: keyword) + poll1.addToResponses(key:'A', value:'manchester', aliases:'MANCHESTER, A') + poll1.addToResponses(key:'B', value:'barcelona', aliases:'BARCELONA, B') + poll1.addToResponses(PollResponse.createUnknown()) + + poll1.save(failOnError:true, flush:true) + PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'UTD!')) + PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'MUFC!')) + PollResponse.findByValue('unknown').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'All I want is a good game.')) + + def barcelonaResponse = PollResponse.findByValue('barcelona'); + 10.times { + def msg = new Fmessage(src: "+9198765432${it}", date: new Date() - it, text: "Barca", inbound:true) + msg.save(failOnError: true); + barcelonaResponse.addToMessages(msg); + } + poll1.save(flush: true) + def poll2 = new Poll(name: 'No keywords', question:"Are keywords mandatory?", sentMessageText:"Must I use keywords? Reply if you want, but automatic sorting is disabled", autoreplyText:"You may be right", yesNo:true) + poll2.addToResponses(key:'A', value:'yes', aliases:'SOMETHING, IRRELEVANT') + poll2.addToResponses(key:'B', value:'no') + poll2.addToResponses(PollResponse.createUnknown()) + poll2.save(failOnError:true, flush:true) + new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: "Thanks for the input. Your number, ${contact_number}, has been added to our records").save(failOnError:true, flush:true) +} + +withFrontlineSMS('2.2.0') { + // check data migrated properly + def click = ClickatelFconnection.findByName("Test Clickatel connection") + assert click.apiId == "doesntmatter" + assert click.username == "testuser" + assert click.password == "testpass" + assert click.sendToUsa == false + assert click.fromNumber == null + + def poll1 = Poll.findByName('Football Teams') + assert poll1.question == "Who will win?" + assert poll1.sentMessageText == "Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'" + assert poll1.autoreplyText == "Thank you, ${recipient_name}, for participating in the football poll" + assert poll1.keywords*.value.sort() == [''] + assert poll1.keywords.size() == 5 + assert poll1.keywords*.value.sort() == ['A', 'B', 'BARCELONA', 'FOOTBALL', 'MANCHESTER'] + ['A':false, 'B':false, 'BARCELONA':false, 'FOOTBALL':true, 'MANCHESTER':false].each { k, v -> + assert Keyword.findByValue(k).isTopLevel == v + } + + def poll2 = Poll.findByName("No keywords") + assert poll2.keywords.size() == 0 + assert !Keyword.findByValue('SOMETHING') + assert !Keyword.findByValue('IRRELEVANT') + + def autoreply = Autoreply.findByName('Toothpaste') + assert autoreply.autoreplyText == "Thanks for the input. Your number, ${recipient_number}, has been added to our records" + + // create any additional data for future +} + +performMigration { + // some migration you're trying to test out... +} + +withCurrentFrontlineSMS { + // check that the `performMigration` executed OK +} + From db4fc064dad722d75dd707f4ec79109ac9490b43 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 15:55:57 +0300 Subject: [PATCH 0126/2668] Added fsms.select taglib, and used it in search to ensure correct inclusion of "nothing selected" option. --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 19 +++++++++++++++++++ .../views/search/_basic_filters.gsp | 16 +++++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index be870aadb..f38e294f3 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -345,6 +345,25 @@ class FsmsTagLib { } out << '' } + + def select = { att, body -> + // add the no-selection option to the list if required + if(!att.hideNoSelection && att.noSelection && att.value != null) { + def key = (att.noSelection.keySet() as List).first() + def value = (att.noSelection.values() as List).first() + if(att.optionKey && att.optionValue) { + if(att.optionKey && att.optionKey instanceof Closure || att.optionValue instanceof Closure) { + att.from = [[key:key, value:value]] + att.from + } else { + att.from = [[(att.optionKey):key, (att.optionValue):value]] + att.from + } + } else { + if(att.keys) att.keys = [key] + att.keys + att.from = [value] + att.from + } + } + out << g.select(att, body) + } private def getFields(att) { def fields = att.remove('fields') diff --git a/plugins/frontlinesms-core/grails-app/views/search/_basic_filters.gsp b/plugins/frontlinesms-core/grails-app/views/search/_basic_filters.gsp index 6a96d9f95..fd449e014 100644 --- a/plugins/frontlinesms-core/grails-app/views/search/_basic_filters.gsp +++ b/plugins/frontlinesms-core/grails-app/views/search/_basic_filters.gsp @@ -1,17 +1,19 @@

    - - - + noSelection="${['':g.message(code:'search.filter.messages.all')]}"/>
    From 728e547be3914301686508450a75b3bb9db23030 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 16:06:43 +0300 Subject: [PATCH 0127/2668] FIXED CORE-1801: Long search description messes up button layout --- plugins/frontlinesms-core/grails-app/views/search/_header.gsp | 4 ++-- plugins/frontlinesms-core/web-app/css/search.css | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/search/_header.gsp b/plugins/frontlinesms-core/grails-app/views/search/_header.gsp index e9ef86623..f5fb12f54 100644 --- a/plugins/frontlinesms-core/grails-app/views/search/_header.gsp +++ b/plugins/frontlinesms-core/grails-app/views/search/_header.gsp @@ -1,5 +1,5 @@ -
    -

    +
    +

    diff --git a/plugins/frontlinesms-core/web-app/css/search.css b/plugins/frontlinesms-core/web-app/css/search.css index d56377dc2..eac846c68 100644 --- a/plugins/frontlinesms-core/web-app/css/search.css +++ b/plugins/frontlinesms-core/web-app/css/search.css @@ -1,4 +1,6 @@ -#body.messages #main-list-head h1.search { background-image:url("../images/icons/search.png"); } +#body.messages #main-list-head .search h1 { background-image:url("../images/icons/search.png"); } +#body.messages #main-list-head .search .buttons { padding:6px 0; } +#body.messages #main-list-head .search .buttons > * { margin:2px 0; } #body-menu.search { padding:17px; } #body-menu.search form > * { margin-bottom:15px; } From e477980b7209ecc212381bca21e41990d30a9189 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 16:37:30 +0300 Subject: [PATCH 0128/2668] FIXED CORE-1786 polls - error message with multiple choice where it failed w/o top-level keyword --- .../controllers/frontlinesms2/ActivityController.groovy | 1 - .../controllers/frontlinesms2/PollController.groovy | 1 + .../grails-app/services/frontlinesms2/PollService.groovy | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 8d22d5539..7edd5e12b 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -135,7 +135,6 @@ class ActivityController extends ControllerUtils { html { [ownerId:instance.id] } } } catch(Exception ex) { - //ex.printStackTrace() def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords, instance) def errors if (collidingKeywords) { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy index 3d5960e19..79ecd2c6e 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy @@ -7,6 +7,7 @@ class PollController extends ActivityController { def pollService def save() { + params.keywords = params.topLevelKeyword?: "$params.keywordsA,$params.keywordsB,$params.keywordsC,$params.keywordsD,$params.keywordsE" withPoll { poll -> doSave('poll', pollService, poll) } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy index 25efaa8fa..5ac5d9c1a 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy @@ -18,7 +18,7 @@ class PollService{ println "#### Round 1 Save!!" if(params.enableKeyword == "true"){ poll.editKeywords(params) - }else{ + } else { poll.noKeyword() } poll.save(failOnError:true) @@ -34,4 +34,4 @@ class PollService{ poll.save(failOnError:true) poll } -} \ No newline at end of file +} From eaf350413153fddce779dde032c69de6964ea41c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 16:43:30 +0300 Subject: [PATCH 0129/2668] FIXED CORE-1803 Generated message for polls has extraneous whitespace when there is no top-level keyword --- .../frontlinesms-core/grails-app/i18n/messages.properties | 1 + .../frontlinesms-core/grails-app/views/poll/_validate.gsp | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 2c0637799..7d9c56eb7 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -422,6 +422,7 @@ folder.moreactions.export=Export folder #TODO embed javascript values poll.reply.text=Reply "{0} {1}" for Yes, "{2} {3}" for No. poll.reply.text1={0} "{1} {2}" for {3} +poll.reply.text1.notoplevel={0} "{1}" for {2} poll.reply.text2=Please answer 'Yes' or 'No' poll.reply.text3= or poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index cb565f4e2..2592f327b 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -149,7 +149,13 @@ replyText = i18n("poll.reply.text5"); $(".choices").each(function() { if (replyText != 'Reply' && this.value) replyText = replyText + ','; - if (this.value) replyText = i18n("poll.reply.text1", replyText, keywordText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); + if (this.value) { + if(keywordText) { + replyText = i18n("poll.reply.text1", replyText, keywordText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); + } else { + replyText = i18n("poll.reply.text1.notoplevel", replyText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); + } + } }); replyText = replyText + '.'; } From c8350472de9de859f708686835a810765eebec8c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 13 Dec 2012 16:50:52 +0300 Subject: [PATCH 0130/2668] FIXED CORE-1782 - 'more options' in search tab is NOT a drop-down --- plugins/frontlinesms-core/web-app/css/search.css | 4 +++- .../frontlinesms-core/web-app/js/search/moreOptions.js | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/css/search.css b/plugins/frontlinesms-core/web-app/css/search.css index eac846c68..4a16951fc 100644 --- a/plugins/frontlinesms-core/web-app/css/search.css +++ b/plugins/frontlinesms-core/web-app/css/search.css @@ -11,4 +11,6 @@ #body-menu.search a.search { margin:10px 0; } #body-menu.search a.clear { border:none; background:transparent; text-align:left; padding-left:0; margin-left:0; } -#body-menu.search #more-options a { padding-left:0; margin-left:0; } +#body-menu.search #more-options a { padding-left:0; margin-left:0; background-position:center right; + background-repeat:no-repeat; background-image:url("../images/icons/accordion-unexpanded.png"); } +#body-menu.search #more-options a.expanded { background-image:url("../images/icons/accordion-expanded.png"); } diff --git a/plugins/frontlinesms-core/web-app/js/search/moreOptions.js b/plugins/frontlinesms-core/web-app/js/search/moreOptions.js index 0e606da6b..acabdcc61 100644 --- a/plugins/frontlinesms-core/web-app/js/search/moreOptions.js +++ b/plugins/frontlinesms-core/web-app/js/search/moreOptions.js @@ -8,11 +8,14 @@ $(function() { }); $("#extra-options-list").hide(); - $("#toggle-extra-options").find("#minus").hide(); $("#toggle-extra-options").live("click", function() { + var extraOpts = $("#toggle-extra-options"); + if(extraOpts.hasClass("expanded")) { + extraOpts.removeClass("expanded"); + } else { + extraOpts.addClass("expanded"); + } $("#extra-options-list").toggle(); - $("#toggle-extra-options").find("#minus").toggle(); - $("#toggle-extra-options").find("#plus").toggle(); }); }); From 5f8f98f161f426912e73a3fa98908708a0c0ae85 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 13 Dec 2012 16:54:47 +0300 Subject: [PATCH 0131/2668] Poll activity with no top level keyword accepts inbox messages --- .../grails-app/domain/frontlinesms2/Poll.groovy | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy index 66f9c3941..ecaecdf00 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy @@ -121,8 +121,11 @@ class Poll extends Activity { this.keywords?.clear() def keys = attrs.findAll { it ==~ /keywords[A-E]=.*/ } println "###### Keywords :: ${keys}" - attrs.topLevelKeyword?.replaceAll(/\s/, "").split(",").each{ - this.addToKeywords(new Keyword(value:"${it.trim().toUpperCase()}")) + if(attrs.topLevelKeyword?.trim().length() > 0) { + attrs.topLevelKeyword?.replaceAll(/\s/, "").trim().split(",").each{ + println "## Setting Poll topLevelKeyword # $it" + this.addToKeywords(new Keyword(value:"${it.trim().toUpperCase()}")) + } } println "Keywords after setting Most TopLevel ## ${this.keywords*.value}" keys.each { k, v -> @@ -132,7 +135,7 @@ class Poll extends Activity { println "###### V :: ${v}" println attrs["keywords${k}"] attrs["keywords${k}"]?.replaceAll(/\s/, "").split(",").each{ - this.addToKeywords(new Keyword(value:"${it.toUpperCase()}", ownerDetail:"${k}", isTopLevel:!attrs.topLevelKeyword?.trim()))//adds the keyword without setting the ownerDetail as pollResponse.id + this.addToKeywords(new Keyword(value:"${it.toUpperCase()}", ownerDetail:"${k}", isTopLevel:!(attrs.topLevelKeyword?.trim().length() > 0)))//adds the keyword without setting the ownerDetail as pollResponse.id } } } From 6b7528211e4f9ade6b84dcff4ffd0bd11a3fc432 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 13 Dec 2012 17:44:34 +0300 Subject: [PATCH 0132/2668] added test for removing toplevel keyword in poll --- .../controller/PollControllerISpec.groovy | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy index c51a316ea..42f56dfbc 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy @@ -241,4 +241,49 @@ class PollControllerISpec extends grails.plugin.spock.IntegrationSpec { (poll.keywords[3].value == 'HARAMBEE')&&(poll.keywords[3].ownerDetail == poll.responses[2].key) (poll.keywords[4].value == 'TEAM')&&(poll.keywords[4].ownerDetail == poll.responses[2].key) } + + def "editing a poll and removing the top level keyword should set responses as top level"() { + setup: + def p = new Poll(name: 'This is a poll', yesNo:false) + p.addToResponses(new PollResponse(key:'A', value:"Manchester")) + p.addToResponses(new PollResponse(key:'B', value:"Barcelona")) + p.addToResponses(new PollResponse(key:'C', value:"Harambee Stars")) + p.addToResponses(PollResponse.createUnknown()) + p.save(failOnError:true) + def k1 = new Keyword(value: "FOOTBALL", activity: p) + def k2 = new Keyword(value: "MANCHESTER", activity: p, ownerDetail:"A", isTopLevel:false) + def k3 = new Keyword(value: "HARAMBEE", activity: p, ownerDetail:"B", isTopLevel:false) + def k4 = new Keyword(value: "BARCELONA", activity: p, ownerDetail:"C", isTopLevel:false) + p.addToKeywords(k1) + p.addToKeywords(k2) + p.addToKeywords(k3) + p.addToKeywords(k4) + p.save(failOnError:true, flush:true) + and: + controller.params.ownerId=Poll.findByName('This is a poll').id + controller.params.name = 'test-poll-1' + controller.params.choiceA = "yes" + controller.params.choiceB = "no" + controller.params.choiceC = "maybe" + controller.params.autoreplyText = "automatic reply text" + controller.params.enableKeyword = "true" + controller.params.topLevelKeyword = "" + controller.params.keywordsA = "Manchester" + controller.params.keywordsB = "Barcelona" + controller.params.keywordsC = "Harambee,Team" + controller.params.dontSendMessage=true + when: + controller.save() + then: + def poll = Poll.findByName("test-poll-1") + poll.keywords[0].value == 'MANCHESTER' + poll.keywords[1].value == 'BARCELONA' + poll.keywords[2].value == 'HARAMBEE' + poll.keywords[3].value == 'TEAM' + + poll.keywords[0].isTopLevel + poll.keywords[1].isTopLevel + poll.keywords[2].isTopLevel + poll.keywords[3].isTopLevel + } } From 2e7bbb7cfbbb940839611ab6e569b799e5c455d1 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 13 Dec 2012 18:13:38 +0300 Subject: [PATCH 0133/2668] message to be sent in poll picks first keyword --- plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index 2592f327b..ed650d445 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -140,7 +140,7 @@ var keywordText = ''; var replyText = ''; if ($('#poll-keyword').attr("disabled") == undefined || $('#poll-keyword').attr("disabled") == false) { - keywordText = $("#poll-keyword").val().toUpperCase(); + keywordText = getFirstAlias($("#poll-keyword")).toUpperCase(); if($("input[name='pollType']:checked").val() == "yesNo") { var yesAlias = getFirstAlias($("ul#poll-aliases li input#keywordsA")) var noAlias = getFirstAlias($("ul#poll-aliases li input#keywordsB")) From 229e4c4333b804a9a49bd5676136340cd257335b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 09:53:53 +0300 Subject: [PATCH 0134/2668] Updated remote control plugin; added skeleton of migration tests (now compiles). --- .../grails-app/conf/BuildConfig.groovy | 2 +- .../migration/migration_2_2_0_spec.groovy | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) mode change 100644 => 100755 plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index eeec9c0a1..6293c703e 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -98,7 +98,7 @@ grails.project.dependency.resolution = { test ":geb:$gebVersion" test ':build-test-data:2.0.2' - test ':remote-control:1.2' + compile ':remote-control:1.3' compile(':functional-test-development:0.9.3') { exclude 'hibernate' } diff --git a/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy b/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy old mode 100644 new mode 100755 index 28178ecbb..9cb6367f2 --- a/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy +++ b/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy @@ -1,5 +1,50 @@ +#!/usr/bin/env groovy // migrations test +@Grab('org.codehaus.groovy.modules.remote:remote-transport-http:0.5') +import groovyx.remote.transport.http.HttpTransport +import groovyx.remote.client.RemoteControl +def SERVER_PORT='8080' + +// define remote classes we need to compile +class Autoreply {} +class ClickatelFconnection {} +class Fmessage {} +class Keyword {} +class Poll {} + +def getRemoteControl() { +} + +// TODO fail if git working directory not clean + +// TEST HELPERS +def withFrontlineSMS = { String version, Closure remoteCode -> + println "# Checking out FrontlineSMS version: $version..." + // TODO check out correct code + println "# Starting grails server on port $SERVER_PORT..." + // TODO start server + println "# Running test script with remote control..." + // TODO run test script on remote server + def remoteControl = getRemoteControl() + println "# Killing remote server" + // TODO kill remote server + println "# Checking test response code..." + // TODO check response code and exit on failure +} + +def withCurrentFrontlineSMS = { Closure remoteCode -> + println "# Starting grails server on port $SERVER_PORT..." + // TODO start server + println "# Running test script with remote control..." + // TODO run test script on remote server +} + +def performMigration = { Closure remoteCode -> + println "# TODO run migration..." +} + +// TEST SCRIPTS withFrontlineSMS('2.1.3') { new ClickatelFconnection(name:"Test Clickatel connection", apiId: "doesntmatter", username:"testuser", password:"testpass").save(failOnError:true) def keyword = new Keyword(value: 'FOOTBALL') From f80559995023d69f56baf0b83992a595971f53fb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 12:15:42 +0300 Subject: [PATCH 0135/2668] Autoforward help text & screenshots added --- .../grails-app/views/help/_index.gsp | 3 + .../activities/2.creating_an_activity.txt | 14 ++-- .../activities/8.creating_an_autoforward.txt | 66 ++++++++++++++++++ .../web-app/images/help/autoforward1.png | Bin 0 -> 26822 bytes .../web-app/images/help/autoforward2.png | Bin 0 -> 18127 bytes .../web-app/images/help/autoforward3.png | Bin 0 -> 32644 bytes .../web-app/images/help/autoforward4.png | Bin 0 -> 29888 bytes .../web-app/images/help/autoforward5.png | Bin 0 -> 22806 bytes .../web-app/images/help/autoforward6.png | Bin 0 -> 17908 bytes 9 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt create mode 100644 plugins/frontlinesms-core/web-app/images/help/autoforward1.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/autoforward2.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/autoforward3.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/autoforward4.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/autoforward5.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/autoforward6.png diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index 58e3da4bc..483d3b707 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -25,6 +25,8 @@ * [How do I create an announcement][31] * ### Auto Reply * [How do I create an Auto-Reply?][32] + * ### Auto Forward + * [How do I create an Auto-Forward?][100] * ### Managing your Activities * [How do I Archive an Activity?][34] * [How do I Export an Activity?][35] @@ -135,4 +137,5 @@ [97]: core/settings/6.edit_delete_connection [98]: core/settings/5.manually_adding_device [99]: core/settings/7.translatingfrontlinesms +[100]: core/activities/8.creating_an_autoforward diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt b/plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt index 9803911c4..c458bbf1e 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt @@ -10,13 +10,19 @@ There are several different types of Activity available to you in FrontlineSMS. 2. Under the heading "Activity" click the button "Create New Activity". 3. A new window will appear asking you to choose the kind of activity you want to create. Choose the type you wish to create and click next. -There are currently three kinds of activities: +There are currently siz kinds of activities: +[Announcements][3] +[Auto Replies][4] +[Auto Forwards][6] [Polls][2] -[Activities][3] -[Auto Reply][4] +[Subscriptions][7] +[Webconnections][8] [1]: core/activities/2.creating_an_activity [2]: core/activities/3.creating_a_poll -[3]: core/activities/2.creating_an_activity +[3]: core/activities/2.creating_an_announcement [4]: core/activities/5.creating_an_auto-reply +[6]: core/activities/8.creating_an_autoforward +[7]: ??? +[8]: ??? [5]: ../images/help/creating_activity.png diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt b/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt new file mode 100644 index 000000000..a908b24c9 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt @@ -0,0 +1,66 @@ +# Creating an Autoforward + +An autoforward activity allows you to automatically forward incoming SMS to selected contacts. Autoforwards can set up to be global, thereby acting on all incoming messages, or they can be set up so that only messages matching one of the configured keywords are forwarded. The message sent to the selected recipients can be configured to contain more information than just the original message content. Both incoming messages that triggered the Autoforward and the resultant outgoing messages are stored under the Autoforward activity for ease of access. When setting up an autoforward, you can select any number of individual contacts, groups or smart groups to forward to. Autoforwards can be used to enable communication between members of a group, and can form part of a opt-in information service when used together with [subscriptions][1] + +### How to Create an AutoForward + +From the [messages tab][2] click on 'Create New Activity'. + +![Select Activity][7] + +A new window will appear and you will be presented with a number of options. Choose "Autoforward" and click next. + +![Enter Message][8] + +In the first step you can configure the message that will be sent when an incoming message triggers an Autoforward. There are various substitution expressions, available through the 'magic wand' button, which you can use to populate the message content. The default value, '${message_text}', will forward incoming messages without any changes. + +**Automatic Sorting** +![Auto sorting][9] + +On the next tab, you can configure FrontlineSMS to automatically trigger your Autoforward on incoming messages. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by spaces. With this setting, any incoming message that starts with one of those keywords will trigger the Autoforward. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Autoforward, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Autoforward's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. + +When you have finished setting up your automatic sorting options, click next. + +**Select Recipients** + +![Select Recipients][10] + +In this step, you can select the recipients you want your Autoforward to send messages to. A list of all your saved contacts, groups and smart groups is available to choose from, and you can search the list using the search bar at the bottom. Using the text field above the list, you can also manually enter any number of phone numbers to forward messages to. When using groups or smart groups in an Autoforward, FrontlineSMS will forward the message to the current members of the group at the time when the incoming message arrives. This means that after setting up your Autoforward you can add and remove members from your groups, possibly using a [Subscription][1], and all the latest members will receive messages from the Autoforward. + +Once you have populated your recipient list, click next. + +**Confirm Screen** + +On this screen you will find a summary of all the options you have selected, so you can confirm that you entered the correct settings before creating the activity. You will also be prompted to give a name to your Autoforward to make it easily recognisable from the list of activities on the messages tab. + +![Confirm][11] + +Clicking Create will save the [activity][3]. + +**_Confirmation_** + +Once successfully created, you will see a confirmation screen. This means that your Autoforward has successfully been saved and will now actively forward incoming messages according to your automatic sorting rules. If there were any errors when saving the activity, a yellow error message will prompt you about the changes required. This will usually be because you have reused a keyword that another activity is using, or given the Autoforward the same name as an existing activity. Once you correct any of these issues, click 'Create' again to save the Autoforward. + +![Summary][12] + +Clicking OK will take you back to the [Messages Tab][2] + +Your Autoforward will appear under the Activities sub-heading. + +### Related Actions +[Creating a Poll][4] +[Creating a Group][5] +[Creating a Smart Group][6] + +[1]: core/activities/9.creating_a_subscription +[2]: core/messages/1.getting_around_the_messages_tab +[3]: core/activities/1.getting_around_activities +[4]: core/activities/3.creating_a_poll +[5]: core/contacts/4.creating_a_group +[6]: core/contacts/5.creating_a_smart_group +[7]: ../images/help/autoforward1.png +[8]: ../images/help/autoforward2.png +[9]: ../images/help/autoforward3.png +[10]: ../images/help/autoforward4.png +[11]: ../images/help/autoforward5.png +[12]: ../images/help/autoforward6.png diff --git a/plugins/frontlinesms-core/web-app/images/help/autoforward1.png b/plugins/frontlinesms-core/web-app/images/help/autoforward1.png new file mode 100644 index 0000000000000000000000000000000000000000..1bb81d53217febf2745f2595bdbf59927c829c7f GIT binary patch literal 26822 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ࣺ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 iTT_2z?{~3%nxj7w%@tY#^|Z|Z0000 literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/autoforward3.png b/plugins/frontlinesms-core/web-app/images/help/autoforward3.png new file mode 100644 index 0000000000000000000000000000000000000000..3b88b0356131fd108b8dcaf227cf140adb4cd5a8 GIT binary patch literal 32644 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 X!w_TiDmB2@27%;dl%*@)7=Ha9#~nUc literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/autoforward5.png b/plugins/frontlinesms-core/web-app/images/help/autoforward5.png new file mode 100644 index 0000000000000000000000000000000000000000..0f27ece043e80832168eefde4634e0c9ec65d4a5 GIT binary patch literal 22806 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 C%8(ua literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/autoforward6.png b/plugins/frontlinesms-core/web-app/images/help/autoforward6.png new file mode 100644 index 0000000000000000000000000000000000000000..7aa2e714642b505317b75771a7e9df37836b3516 GIT binary patch literal 17908 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 Date: Fri, 14 Dec 2012 12:17:27 +0300 Subject: [PATCH 0136/2668] addee --- .../activities/8.creating_a_subscription.txt | 58 +++++++++++++++++++ .../web-app/trial help/autoreply_keywords.txt | 6 ++ .../web-app/trial help/poll_keywords.txt | 50 ++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 plugins/frontlinesms-core/web-app/help/core/activities/8.creating_a_subscription.txt create mode 100644 plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt create mode 100644 plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_a_subscription.txt b/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_a_subscription.txt new file mode 100644 index 000000000..2c9962f22 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_a_subscription.txt @@ -0,0 +1,58 @@ +# Creating a Subsctiption # + +A subscription is a type of acrtivity that allows users to join certain groups or leave that grouop based on the message that they text in and how it matches the set keywords. + +### [How to Create an Subsctiption ] [] +1. From the [messages tab][3] click on 'Create New Activity'. +2. A new window will appear and you will be presented with a number of options. Choose "Subscription" and click next +![Select Activity][9] + +**_Select a Group_** +You can select the group that contacts will join or leave + +When you have selected the desired group click next. + +**_Setup Keywords_** +On this screen you will be able to determine if messages will be sorted into the subscription or not. +To disbale automatic sorting of message into the subscription, please check the 'Disable automatic sorting' in the Automatic Sorting section. This is the first section on that Sorting Tab. + +If you want contact to automatically join and leave the group then you need to have sorting enabled. +Therefore, you may decide to enter a top level keywords(seperated by commas) or to leave it blank. The top level keyword is optional. Either one of the top level keywords seperated by the commas will work. + +A subscription needs keywords that will match to the join action(Contact will join the group) and keywords that will match the leave action(Contact will leave the group). The keywords for subscription actions are not optional and need to filled in. At least one keyword per acton needs to be present. The keywords in a subsciption, inclucing top level and subsctipition action keywords need to be unique within that subsctiption. +The top level keywords if provided needs to be unique across all activities and their respective top level keywords. If the top level keyword is not provided then the subscriptiona action keywords become top level and need to be unique across all activites and their top level keywords. + +A subscription allows a default action to be triggered if a message matched a top level keyword only but no subscription keyword is not matched. + +Take fot example a subscription where sorting is enabled and keywords look as follows. +Top level keywords : 'team, tim, tom' +Join Keywords : 'join, in, inthere' +Leave Ketwords : 'leave, out, ouththere' +Default Action : Add Contact to the Group + +The incoming message will be mapped to action as illustrated below + +Incoming Message | Action Triggered +team join | Joined Group +team in | Joined Group +team inthere | Joined Group +tim join | Joined Group +tim in | Joined Group +tim inthere | Joined Group +team leave | Joined Group +team out | Joined Group +team outhere | Joined Group +team | Default Action +tim | Default Action +tom | Default Action + + +**_Send Autoreplies_** +On this tab you can setup the autoreplies that will be sent to the contact after they have joined or left a group. +You can setup seperate messages one that is sent when a contact joins the group and one that is sent when a contact leaves the group. +Setting up this messages is optional. + +**_Confirm Screen_** +On this screen you will find a summary of all the options you have selected, so you can confirm that what you have created is what you would like to send. + +On this screen you can set/edit the name of the subscription. The name needs to be unique among other subscriptions. Two subscriptions cannot share the same name. \ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt b/plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt new file mode 100644 index 000000000..d36580827 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt @@ -0,0 +1,6 @@ +Autoreplies in verison 2.2.0 have also undergone changes since version 2.1.3. In version 2.1.3 Autoreplies allowed users to only use one keyword, but with version 2.2.0 Autoreplies can have multiple keywords stored as comma seperated values. +For example, in version 2.1.3, an Food auroreply would reply with a message of the special meal served at the restaurant for tha day if the user texted in 'food'. +But now in version 2.2.0 that autoreply can be setup with keywords "food,special,meal,today". The user can text in meal or food or special or today and they will still get the message containing the special served at the restaurant. + +Likewise the multiple keywords can be used to handle spelling mistakes that user can make when testing in. +In autoreplies, the keywords "food,special,meal,today" are the top level keywords and the individually need to be unique across all activities. Once the autoreply is saved then, another activity cannot use food,meal,special,today as part of the that activities top level keywords. diff --git a/plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt b/plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt new file mode 100644 index 000000000..6b20a1ce4 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt @@ -0,0 +1,50 @@ +Poll initially supported use of aliases. A user would setup a poll with with one keyword and the responses would be mapped to aliases.A response could have one or more aliases seperated with commas. +For example, in version 2.1.3, a poll would look like this + +Poll Name : Football Poll +Keyword : Football + +Responses | Aliases +Manchester United | Manu, Manchster +Arsenal | Arsenal, Ars + +With version 2.2 as a user you can create a poll with a top level keyword and the aliases are now converted to second level keywords. + +In version 2.2.0 Polls would look like this + +Poll Name: Footbal Poll +TopLevel Keyword : Football, Foot, Footy + +Responses | Second Level Keywords +Manchester United | Manu, Manchster +Arsenal | Arsenal, Ars, Arnl + +AS you can see from above the aliases have been replaced with second level keywords. The top level keyword is optional. +If a top level keyword is provided messages will be mapped to resposes as follows + +Incoming Message | Response Mapped To +football manu | Mancheter United +foot manu | Mancheter United +footy manu | Mancheter United +football arsenal | Arsenal +football ars | Arsenal +footy arsenal | Arsenal +foot arsl | Arsenal + +If the top level keyword is not provided, then the incoming messages will be mapped to resposes as follows + +Incoming Message | Response Mapped To +manu | Mancheter United +manchester | Mancheter United +arsenal | Arsenal +ars | Arsenal + +The person texting in only needs to test in at least one of the second level keywords. + +This feature is quite usefull if you want frontlinesms to handle spelling mistakes. For example, for the top level keyword one can have rthe keywords football, footbal, fotball. This spelling handling also applies to second level keywords + +Validation of keywords +All keywords, toplevel or second level keywords need to be unique within that activity. Therefore, the Football poll described above have football as a top level keyword and also as a second level keyword. Likewise keywords among the second level keywords need to be unique among themselves. +In any poll if the top level keyword is not provided, then the second level keywords will be treated as top level. +### Important : Top level keywords need to be unique across all activities. A poll and an autoreply cannot share a top level keywords. For more information regarding keywords in autoreplies see the autoreply section. + From a76e210c400a8af5f1b2fc1491613e267e67f17e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 12:24:34 +0300 Subject: [PATCH 0137/2668] FIXED CORE-1803 - Generated message for polls has extraneous whitespace when there is no top-level keyword --- .../grails-app/i18n/messages.properties | 6 ++---- .../grails-app/i18n/messages_ar.properties | 4 +--- .../grails-app/i18n/messages_de.properties | 5 ++--- .../grails-app/i18n/messages_es.properties | 4 ++-- .../grails-app/i18n/messages_fr.properties | 4 ++-- .../grails-app/i18n/messages_in_ID.properties | 5 ++--- .../grails-app/i18n/messages_jp.properties | 5 ++--- .../grails-app/i18n/messages_pt.properties | 5 ++--- .../grails-app/i18n/messages_ru.properties | 4 ++-- .../grails-app/i18n/messages_sw.properties | 1 - .../grails-app/views/poll/_validate.gsp | 20 ++++++++++++------- 11 files changed, 30 insertions(+), 33 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 3d1bf202b..83f16cfce 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -423,12 +423,10 @@ folder.moreactions.export=Export folder #TODO embed javascript values -poll.reply.text=Reply "{0} {1}" for Yes, "{2} {3}" for No. -poll.reply.text1={0} "{1} {2}" for {3} -poll.reply.text1.notoplevel={0} "{1}" for {2} +poll.reply.text=Reply "{0}" for Yes, "{1}" for No. +poll.reply.text1={0} "{1}" for {2} poll.reply.text2=Please answer 'Yes' or 'No' poll.reply.text3= or -poll.reply.text4={0} {1} poll.reply.text5=Reply poll.reply.text6=Please answer poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties index 0c6fd4be0..93519dcd7 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties @@ -353,11 +353,9 @@ poll.moreactions.edit=تعديل الاستطلاع poll.moreactions.export=تصدير الاستطلاع #TODO embed javascript values -poll.reply.text=Reply "نعم {0} {1} " , "{2} {3} كلا " -poll.reply.text1={0} "{1} {2}" for {3} +poll.reply.text=Reply نعم "{0}", "{1}" كلا poll.reply.text2=الرجاء الإجابة ب "نعم" أو "كلا" poll.reply.text3= أو -poll.reply.text4={0} {1} poll.reply.text5=الإجابة poll.reply.text6=الرجاء الإجابة poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties index 95c913dfc..686b08a3e 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties @@ -353,11 +353,10 @@ poll.moreactions.edit=Umfrage bearbeiten poll.moreactions.export=Umfrage exportieren #TODO embed javascript values -poll.reply.text=Antworten Sie mit "{0} {1}" für Ja, "{2} {3}" für Nein. -poll.reply.text1={0} "{1} {2}" für {3} +poll.reply.text=Antworten Sie mit "{0}" für Ja, "{1}" für Nein. +poll.reply.text1={0} "{1}" für {2} poll.reply.text2=Bitte antworten Sie mit 'Ja' oder 'Nein' poll.reply.text3= oder -poll.reply.text4={0} {1} poll.reply.text5=Antworten Sie poll.reply.text6=Bitte antworten Sie poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties index a16a9d1c5..113819e4e 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties @@ -353,8 +353,8 @@ poll.moreactions.edit=Editar encuesta poll.moreactions.export=Exportar encuesta #TODO embed javascript values -poll.reply.text=Responda "{0} {1}" para Sí, "{2} {3}" para No. -poll.reply.text1={0} "{1} {2}" para {3} +poll.reply.text=Responda "{0}" para Sí, "{1}" para No. +poll.reply.text1={0} "{1}" para {2} poll.reply.text2=Por favor responda 'Si' o 'No' poll.reply.text3= o poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties index dae1391e1..af0a0b25f 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties @@ -353,8 +353,8 @@ poll.moreactions.edit=Modifier le sondage poll.moreactions.export=Exporter sondage #TODO embed javascript values -poll.reply.text=Répondre"{0} {1}" pour Yes, "{2} {3}" pour No. -poll.reply.text1={0} "{1} {2}" pour {3} +poll.reply.text=Répondre "{0}" pour Yes, "{1}" pour No. +poll.reply.text1={0} "{1}" pour {2} poll.reply.text2=S'il vous plaît répondez 'Oui' ou 'Non' poll.reply.text3= ou poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties index 57caf3dd9..9def3968c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties @@ -353,11 +353,10 @@ poll.moreactions.edit=Sunting poll poll.moreactions.export=Ekspor poll #TODO embed javascript values -poll.reply.text=Balas dengan "{0} {1}" untuk Ya, "{2} {3}" untuk Tidak. -poll.reply.text1={0} "{1} {2}" untuk {3} +poll.reply.text=Balas dengan "{0}" untuk Ya, "{1}" untuk Tidak. +poll.reply.text1={0} "{1}" untuk {2} poll.reply.text2=Silakan jawab 'Ya' atau 'Tidak' poll.reply.text3= atau -poll.reply.text4={0} {1} poll.reply.text5=Balas poll.reply.text6=Tolong jawab poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties index 75f2bf00b..5529318d8 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties @@ -353,11 +353,10 @@ poll.moreactions.edit=アンケートを編集 poll.moreactions.export=アンケートをエクスポート #TODO embed javascript values -poll.reply.text=はいには "{0} {1}" を, いいえには "{2} {3}" を答えて下さい. -poll.reply.text1={0} "{1} {2}" for {3} +poll.reply.text=はいには "{0}" を, いいえには "{1}" を答えて下さい. +poll.reply.text1={0} "{1}" for {2} poll.reply.text2='はい' または 'いいえ'を答えて下さい. poll.reply.text3= または -poll.reply.text4={0} {1} poll.reply.text5=返信 poll.reply.text6=返答して下さい poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties index dae963e3c..61290e601 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties @@ -354,11 +354,10 @@ poll.moreactions.edit=Editar enquete poll.moreactions.export=Exportar enquete #TODO embed javascript values -poll.reply.text=Responda "{0} {1}" para Sim, "{2} {3}" para Não. -poll.reply.text1={0} "{1} {2}" para {3} +poll.reply.text=Responda "{0}" para Sim, "{1}" para Não. +poll.reply.text1={0} "{1}" para {2} poll.reply.text2=Por favor, responda 'Sim' ou 'Não' poll.reply.text3= ou -poll.reply.text4={0} {1} poll.reply.text5=Responder poll.reply.text6=Por favor, responda poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties index 4d4d290f2..bbf90d711 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties @@ -353,8 +353,8 @@ poll.moreactions.edit=Редактировать опрос poll.moreactions.export=Экспортировать опрос #TODO embed javascript values -poll.reply.text=Ответ "{0} {1}" на Да , "{2} {3}" на Нет. -poll.reply.text1={0} "{1} {2}" для {3} +poll.reply.text=Ответ "{0}" на Да , "{1}" на Нет. +poll.reply.text1={0} "{1}" для {2} poll.reply.text2=Просьба ответить 'Да' или 'Нет' poll.reply.text3= или poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 1d0a36b3d..90a99492c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -360,7 +360,6 @@ group.name.validator.error=Jina hiki cha kikundi kimetumika autoreply.moreactions.delete=Futa jibu la moja kwa moja poll.reply.text6=Tafadhali jibu poll.reply.text5=Jibu -poll.reply.text4={0} {1} poll.reply.text3=ama poll.reply.text2=Tafadhali jibu 'Ndio' au 'La' poll.recipients.validation.error=Chagua waasiliani wa kutumia risala diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index 2592f327b..e897b7d17 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -142,19 +142,25 @@ if ($('#poll-keyword').attr("disabled") == undefined || $('#poll-keyword').attr("disabled") == false) { keywordText = $("#poll-keyword").val().toUpperCase(); if($("input[name='pollType']:checked").val() == "yesNo") { - var yesAlias = getFirstAlias($("ul#poll-aliases li input#keywordsA")) - var noAlias = getFirstAlias($("ul#poll-aliases li input#keywordsB")) - replyText = i18n("poll.reply.text", keywordText, yesAlias, keywordText, noAlias); + var yesAlias = getFirstAlias($("ul#poll-aliases li input#keywordsA")); + var noAlias = getFirstAlias($("ul#poll-aliases li input#keywordsB")); + if(keywordText) { + yesAlias = keywordText + " " + yesAlias; + noAlias = keywordText + " " + noAlias; + } + replyText = i18n("poll.reply.text", yesAlias, noAlias); } else { replyText = i18n("poll.reply.text5"); $(".choices").each(function() { - if (replyText != 'Reply' && this.value) replyText = replyText + ','; + if (replyText !== 'Reply' && this.value) { + replyText = replyText + ','; + } if (this.value) { + var choiceKeyword = getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6, 7))); if(keywordText) { - replyText = i18n("poll.reply.text1", replyText, keywordText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); - } else { - replyText = i18n("poll.reply.text1.notoplevel", replyText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); + choiceKeyword = keywordText + " " + choiceKeyword; } + replyText = i18n("poll.reply.text1", replyText, choiceKeyword, this.value); } }); replyText = replyText + '.'; From 6c763c2b9ec9ec41c85d721b2e542279caed1021 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 12:24:34 +0300 Subject: [PATCH 0138/2668] FIXED CORE-1803 - Generated message for polls has extraneous whitespace when there is no top-level keyword --- .../grails-app/i18n/messages.properties | 6 ++---- .../grails-app/i18n/messages_ar.properties | 4 +--- .../grails-app/i18n/messages_de.properties | 5 ++--- .../grails-app/i18n/messages_es.properties | 4 ++-- .../grails-app/i18n/messages_fr.properties | 4 ++-- .../grails-app/i18n/messages_in_ID.properties | 5 ++--- .../grails-app/i18n/messages_jp.properties | 5 ++--- .../grails-app/i18n/messages_pt.properties | 5 ++--- .../grails-app/i18n/messages_ru.properties | 4 ++-- .../grails-app/i18n/messages_sw.properties | 1 - .../grails-app/views/poll/_validate.gsp | 20 ++++++++++++------- 11 files changed, 30 insertions(+), 33 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 7d9c56eb7..4314780d6 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -420,12 +420,10 @@ folder.moreactions.export=Export folder #TODO embed javascript values -poll.reply.text=Reply "{0} {1}" for Yes, "{2} {3}" for No. -poll.reply.text1={0} "{1} {2}" for {3} -poll.reply.text1.notoplevel={0} "{1}" for {2} +poll.reply.text=Reply "{0}" for Yes, "{1}" for No. +poll.reply.text1={0} "{1}" for {2} poll.reply.text2=Please answer 'Yes' or 'No' poll.reply.text3= or -poll.reply.text4={0} {1} poll.reply.text5=Reply poll.reply.text6=Please answer poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties index 0c6fd4be0..93519dcd7 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_ar.properties @@ -353,11 +353,9 @@ poll.moreactions.edit=تعديل الاستطلاع poll.moreactions.export=تصدير الاستطلاع #TODO embed javascript values -poll.reply.text=Reply "نعم {0} {1} " , "{2} {3} كلا " -poll.reply.text1={0} "{1} {2}" for {3} +poll.reply.text=Reply نعم "{0}", "{1}" كلا poll.reply.text2=الرجاء الإجابة ب "نعم" أو "كلا" poll.reply.text3= أو -poll.reply.text4={0} {1} poll.reply.text5=الإجابة poll.reply.text6=الرجاء الإجابة poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties index 95c913dfc..686b08a3e 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_de.properties @@ -353,11 +353,10 @@ poll.moreactions.edit=Umfrage bearbeiten poll.moreactions.export=Umfrage exportieren #TODO embed javascript values -poll.reply.text=Antworten Sie mit "{0} {1}" für Ja, "{2} {3}" für Nein. -poll.reply.text1={0} "{1} {2}" für {3} +poll.reply.text=Antworten Sie mit "{0}" für Ja, "{1}" für Nein. +poll.reply.text1={0} "{1}" für {2} poll.reply.text2=Bitte antworten Sie mit 'Ja' oder 'Nein' poll.reply.text3= oder -poll.reply.text4={0} {1} poll.reply.text5=Antworten Sie poll.reply.text6=Bitte antworten Sie poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties index a16a9d1c5..113819e4e 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_es.properties @@ -353,8 +353,8 @@ poll.moreactions.edit=Editar encuesta poll.moreactions.export=Exportar encuesta #TODO embed javascript values -poll.reply.text=Responda "{0} {1}" para Sí, "{2} {3}" para No. -poll.reply.text1={0} "{1} {2}" para {3} +poll.reply.text=Responda "{0}" para Sí, "{1}" para No. +poll.reply.text1={0} "{1}" para {2} poll.reply.text2=Por favor responda 'Si' o 'No' poll.reply.text3= o poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties index dae1391e1..af0a0b25f 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties @@ -353,8 +353,8 @@ poll.moreactions.edit=Modifier le sondage poll.moreactions.export=Exporter sondage #TODO embed javascript values -poll.reply.text=Répondre"{0} {1}" pour Yes, "{2} {3}" pour No. -poll.reply.text1={0} "{1} {2}" pour {3} +poll.reply.text=Répondre "{0}" pour Yes, "{1}" pour No. +poll.reply.text1={0} "{1}" pour {2} poll.reply.text2=S'il vous plaît répondez 'Oui' ou 'Non' poll.reply.text3= ou poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties index 57caf3dd9..9def3968c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties @@ -353,11 +353,10 @@ poll.moreactions.edit=Sunting poll poll.moreactions.export=Ekspor poll #TODO embed javascript values -poll.reply.text=Balas dengan "{0} {1}" untuk Ya, "{2} {3}" untuk Tidak. -poll.reply.text1={0} "{1} {2}" untuk {3} +poll.reply.text=Balas dengan "{0}" untuk Ya, "{1}" untuk Tidak. +poll.reply.text1={0} "{1}" untuk {2} poll.reply.text2=Silakan jawab 'Ya' atau 'Tidak' poll.reply.text3= atau -poll.reply.text4={0} {1} poll.reply.text5=Balas poll.reply.text6=Tolong jawab poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties index 75f2bf00b..5529318d8 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_jp.properties @@ -353,11 +353,10 @@ poll.moreactions.edit=アンケートを編集 poll.moreactions.export=アンケートをエクスポート #TODO embed javascript values -poll.reply.text=はいには "{0} {1}" を, いいえには "{2} {3}" を答えて下さい. -poll.reply.text1={0} "{1} {2}" for {3} +poll.reply.text=はいには "{0}" を, いいえには "{1}" を答えて下さい. +poll.reply.text1={0} "{1}" for {2} poll.reply.text2='はい' または 'いいえ'を答えて下さい. poll.reply.text3= または -poll.reply.text4={0} {1} poll.reply.text5=返信 poll.reply.text6=返答して下さい poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties index dae963e3c..61290e601 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_pt.properties @@ -354,11 +354,10 @@ poll.moreactions.edit=Editar enquete poll.moreactions.export=Exportar enquete #TODO embed javascript values -poll.reply.text=Responda "{0} {1}" para Sim, "{2} {3}" para Não. -poll.reply.text1={0} "{1} {2}" para {3} +poll.reply.text=Responda "{0}" para Sim, "{1}" para Não. +poll.reply.text1={0} "{1}" para {2} poll.reply.text2=Por favor, responda 'Sim' ou 'Não' poll.reply.text3= ou -poll.reply.text4={0} {1} poll.reply.text5=Responder poll.reply.text6=Por favor, responda poll.message.send={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties index 4d4d290f2..bbf90d711 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_ru.properties @@ -353,8 +353,8 @@ poll.moreactions.edit=Редактировать опрос poll.moreactions.export=Экспортировать опрос #TODO embed javascript values -poll.reply.text=Ответ "{0} {1}" на Да , "{2} {3}" на Нет. -poll.reply.text1={0} "{1} {2}" для {3} +poll.reply.text=Ответ "{0}" на Да , "{1}" на Нет. +poll.reply.text1={0} "{1}" для {2} poll.reply.text2=Просьба ответить 'Да' или 'Нет' poll.reply.text3= или poll.reply.text4={0} {1} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 1d0a36b3d..90a99492c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -360,7 +360,6 @@ group.name.validator.error=Jina hiki cha kikundi kimetumika autoreply.moreactions.delete=Futa jibu la moja kwa moja poll.reply.text6=Tafadhali jibu poll.reply.text5=Jibu -poll.reply.text4={0} {1} poll.reply.text3=ama poll.reply.text2=Tafadhali jibu 'Ndio' au 'La' poll.recipients.validation.error=Chagua waasiliani wa kutumia risala diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index 2592f327b..e897b7d17 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -142,19 +142,25 @@ if ($('#poll-keyword').attr("disabled") == undefined || $('#poll-keyword').attr("disabled") == false) { keywordText = $("#poll-keyword").val().toUpperCase(); if($("input[name='pollType']:checked").val() == "yesNo") { - var yesAlias = getFirstAlias($("ul#poll-aliases li input#keywordsA")) - var noAlias = getFirstAlias($("ul#poll-aliases li input#keywordsB")) - replyText = i18n("poll.reply.text", keywordText, yesAlias, keywordText, noAlias); + var yesAlias = getFirstAlias($("ul#poll-aliases li input#keywordsA")); + var noAlias = getFirstAlias($("ul#poll-aliases li input#keywordsB")); + if(keywordText) { + yesAlias = keywordText + " " + yesAlias; + noAlias = keywordText + " " + noAlias; + } + replyText = i18n("poll.reply.text", yesAlias, noAlias); } else { replyText = i18n("poll.reply.text5"); $(".choices").each(function() { - if (replyText != 'Reply' && this.value) replyText = replyText + ','; + if (replyText !== 'Reply' && this.value) { + replyText = replyText + ','; + } if (this.value) { + var choiceKeyword = getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6, 7))); if(keywordText) { - replyText = i18n("poll.reply.text1", replyText, keywordText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); - } else { - replyText = i18n("poll.reply.text1.notoplevel", replyText, getFirstAlias($("ul#poll-aliases li input#keywords"+this.name.substring(6,7))), this.value); + choiceKeyword = keywordText + " " + choiceKeyword; } + replyText = i18n("poll.reply.text1", replyText, choiceKeyword, this.value); } }); replyText = replyText + '.'; From fae9bc47d4b7b48f249861ecd12606d95e25175a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 14 Dec 2012 12:35:41 +0300 Subject: [PATCH 0139/2668] Added creating a subsctiption --- ...eating_a_subscription.txt => 9.creating_a_subscription.txt} | 0 .../web-app/help/core/settings/4b.clickatell.txt | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename plugins/frontlinesms-core/web-app/help/core/activities/{8.creating_a_subscription.txt => 9.creating_a_subscription.txt} (100%) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_a_subscription.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/8.creating_a_subscription.txt rename to plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/4b.clickatell.txt b/plugins/frontlinesms-core/web-app/help/core/settings/4b.clickatell.txt index a332892d8..ad20e430c 100644 --- a/plugins/frontlinesms-core/web-app/help/core/settings/4b.clickatell.txt +++ b/plugins/frontlinesms-core/web-app/help/core/settings/4b.clickatell.txt @@ -14,7 +14,8 @@ Please have your Clickatell account details to hand. You will need your Clickate ![Add New Connection][8] 3. Select "Clickatell Account" and click "Next" -4. On this screen, please enter the required information. +4. On this screen, please enter the required information. +5. If you are sending messages to USA then you may consider filling in the fields 'Send To USA' and 'From Number' ![Clickatell Screen][9] From da68cfee5bb9e16079028b60ba63efafe9de9f63 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 14:30:48 +0300 Subject: [PATCH 0140/2668] Modified migration spec so it now runs against an existing application instance. --- .../test/migration/.gitignore | 2 + .../test/migration/build.gradle | 14 ++ .../migration/migration_2_2_0_spec.groovy | 114 ---------------- .../src/main/groovy/MigrationSpec.groovy | 124 ++++++++++++++++++ .../frontlinesms2/ClassDeclarations.groovy | 13 ++ 5 files changed, 153 insertions(+), 114 deletions(-) create mode 100644 plugins/frontlinesms-core/test/migration/.gitignore create mode 100644 plugins/frontlinesms-core/test/migration/build.gradle delete mode 100755 plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy create mode 100755 plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy create mode 100644 plugins/frontlinesms-core/test/migration/src/main/groovy/frontlinesms2/ClassDeclarations.groovy diff --git a/plugins/frontlinesms-core/test/migration/.gitignore b/plugins/frontlinesms-core/test/migration/.gitignore new file mode 100644 index 000000000..9f2a07880 --- /dev/null +++ b/plugins/frontlinesms-core/test/migration/.gitignore @@ -0,0 +1,2 @@ +build/ +.gradle/ diff --git a/plugins/frontlinesms-core/test/migration/build.gradle b/plugins/frontlinesms-core/test/migration/build.gradle new file mode 100644 index 000000000..fa9323201 --- /dev/null +++ b/plugins/frontlinesms-core/test/migration/build.gradle @@ -0,0 +1,14 @@ +apply plugin: 'groovy' +apply plugin: 'application' + +mainClassName = 'MigrationSpec' + +repositories { + mavenCentral() +} + +dependencies { + groovy group:'org.codehaus.groovy', name:'groovy', version:'1.8.6' + groovy group:'org.codehaus.groovy.modules.remote', name:'remote-transport-http', version:'0.5' +} + diff --git a/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy b/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy deleted file mode 100755 index 9cb6367f2..000000000 --- a/plugins/frontlinesms-core/test/migration/migration_2_2_0_spec.groovy +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/env groovy -// migrations test -@Grab('org.codehaus.groovy.modules.remote:remote-transport-http:0.5') -import groovyx.remote.transport.http.HttpTransport -import groovyx.remote.client.RemoteControl - -def SERVER_PORT='8080' - -// define remote classes we need to compile -class Autoreply {} -class ClickatelFconnection {} -class Fmessage {} -class Keyword {} -class Poll {} - -def getRemoteControl() { -} - -// TODO fail if git working directory not clean - -// TEST HELPERS -def withFrontlineSMS = { String version, Closure remoteCode -> - println "# Checking out FrontlineSMS version: $version..." - // TODO check out correct code - println "# Starting grails server on port $SERVER_PORT..." - // TODO start server - println "# Running test script with remote control..." - // TODO run test script on remote server - def remoteControl = getRemoteControl() - println "# Killing remote server" - // TODO kill remote server - println "# Checking test response code..." - // TODO check response code and exit on failure -} - -def withCurrentFrontlineSMS = { Closure remoteCode -> - println "# Starting grails server on port $SERVER_PORT..." - // TODO start server - println "# Running test script with remote control..." - // TODO run test script on remote server -} - -def performMigration = { Closure remoteCode -> - println "# TODO run migration..." -} - -// TEST SCRIPTS -withFrontlineSMS('2.1.3') { - new ClickatelFconnection(name:"Test Clickatel connection", apiId: "doesntmatter", username:"testuser", password:"testpass").save(failOnError:true) - def keyword = new Keyword(value: 'FOOTBALL') - def poll1 = new Poll(name: 'Football Teams', question:"Who will win?", sentMessageText:"Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'", autoreplyText:"Thank you, ${contact_name}, for participating in the football poll", keyword: keyword) - poll1.addToResponses(key:'A', value:'manchester', aliases:'MANCHESTER, A') - poll1.addToResponses(key:'B', value:'barcelona', aliases:'BARCELONA, B') - poll1.addToResponses(PollResponse.createUnknown()) - - poll1.save(failOnError:true, flush:true) - PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'UTD!')) - PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'MUFC!')) - PollResponse.findByValue('unknown').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'All I want is a good game.')) - - def barcelonaResponse = PollResponse.findByValue('barcelona'); - 10.times { - def msg = new Fmessage(src: "+9198765432${it}", date: new Date() - it, text: "Barca", inbound:true) - msg.save(failOnError: true); - barcelonaResponse.addToMessages(msg); - } - poll1.save(flush: true) - def poll2 = new Poll(name: 'No keywords', question:"Are keywords mandatory?", sentMessageText:"Must I use keywords? Reply if you want, but automatic sorting is disabled", autoreplyText:"You may be right", yesNo:true) - poll2.addToResponses(key:'A', value:'yes', aliases:'SOMETHING, IRRELEVANT') - poll2.addToResponses(key:'B', value:'no') - poll2.addToResponses(PollResponse.createUnknown()) - poll2.save(failOnError:true, flush:true) - new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: "Thanks for the input. Your number, ${contact_number}, has been added to our records").save(failOnError:true, flush:true) -} - -withFrontlineSMS('2.2.0') { - // check data migrated properly - def click = ClickatelFconnection.findByName("Test Clickatel connection") - assert click.apiId == "doesntmatter" - assert click.username == "testuser" - assert click.password == "testpass" - assert click.sendToUsa == false - assert click.fromNumber == null - - def poll1 = Poll.findByName('Football Teams') - assert poll1.question == "Who will win?" - assert poll1.sentMessageText == "Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'" - assert poll1.autoreplyText == "Thank you, ${recipient_name}, for participating in the football poll" - assert poll1.keywords*.value.sort() == [''] - assert poll1.keywords.size() == 5 - assert poll1.keywords*.value.sort() == ['A', 'B', 'BARCELONA', 'FOOTBALL', 'MANCHESTER'] - ['A':false, 'B':false, 'BARCELONA':false, 'FOOTBALL':true, 'MANCHESTER':false].each { k, v -> - assert Keyword.findByValue(k).isTopLevel == v - } - - def poll2 = Poll.findByName("No keywords") - assert poll2.keywords.size() == 0 - assert !Keyword.findByValue('SOMETHING') - assert !Keyword.findByValue('IRRELEVANT') - - def autoreply = Autoreply.findByName('Toothpaste') - assert autoreply.autoreplyText == "Thanks for the input. Your number, ${recipient_number}, has been added to our records" - - // create any additional data for future -} - -performMigration { - // some migration you're trying to test out... -} - -withCurrentFrontlineSMS { - // check that the `performMigration` executed OK -} - diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy new file mode 100755 index 000000000..7284f0688 --- /dev/null +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -0,0 +1,124 @@ +import frontlinesms2.* +import groovyx.remote.transport.http.HttpTransport +import groovyx.remote.client.RemoteControl + +class MigrationSpec { + private final String serverPort + private final String serverAddress + + MigrationSpec(String serverPort, String serverAddress) { + this.serverPort = serverPort + this.serverAddress = serverAddress + } + + public static void main(String... args) { + def SERVER_PORT='8080' + def SERVER_ADDRESS="http://localhost:$SERVER_PORT/frontlinesms-core/grails-remote-control" // FIXME check this URL is correct + new MigrationSpec(SERVER_PORT, SERVER_ADDRESS).test() + } + + def getRemoteControl = { + def transport = new HttpTransport(serverAddress) + return new RemoteControl(transport) + } + + // TODO fail if git working directory not clean + + // TEST HELPERS + def withFrontlineSMS = { String version, Closure remoteCode -> + println "# Checking out FrontlineSMS version: $version..." + // TODO check out correct code + // TODO if remote-control plugin is not enabled, inject it now with sed + println "# Starting grails server on port $serverPort..." + // TODO start server + println "# Running test script with remote control..." + // TODO run test script on remote server + def remoteControl = getRemoteControl() + remoteControl.exec(remoteCode) + println "# Killing remote server" + // TODO kill remote server + println "# Checking test response code..." + // TODO check response code and exit on failure + } + + def withCurrentFrontlineSMS = { Closure remoteCode -> + println "# Starting grails server on port $serverPort..." + // TODO start server + println "# Running test script with remote control..." + // TODO run test script on remote server + } + + def performMigration = { Closure remoteCode -> + println "# TODO run migration..." + } + + def test() { + withFrontlineSMS('2.1.3') { + new ClickatellFconnection(name:"Test Clickatell connection", apiId: "doesntmatter", username:"testuser", password:"testpass").save(failOnError:true) + def keyword = new Keyword(value: 'FOOTBALL') + def poll1 = new Poll(name: 'Football Teams', question:"Who will win?", sentMessageText:"Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'", autoreplyText:'Thank you, ${contact_name}, for participating in the football poll', keyword: keyword) + poll1.addToResponses(key:'A', value:'manchester', aliases:'MANCHESTER, A') + poll1.addToResponses(key:'B', value:'barcelona', aliases:'BARCELONA, B') + poll1.addToResponses(PollResponse.createUnknown()) + + poll1.save(failOnError:true, flush:true) + PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'UTD!')) + PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'MUFC!')) + PollResponse.findByValue('unknown').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'All I want is a good game.')) + + def barcelonaResponse = PollResponse.findByValue('barcelona'); + 10.times { + def msg = new Fmessage(src: "+9198765432${it}", date: new Date() - it, text: "Barca", inbound:true) + msg.save(failOnError: true); + barcelonaResponse.addToMessages(msg); + } + poll1.save(flush: true) + def poll2 = new Poll(name: 'No keywords', question:"Are keywords mandatory?", sentMessageText:"Must I use keywords? Reply if you want, but automatic sorting is disabled", autoreplyText:"You may be right", yesNo:true) + poll2.addToResponses(key:'A', value:'yes', aliases:'SOMETHING, IRRELEVANT') + poll2.addToResponses(key:'B', value:'no') + poll2.addToResponses(PollResponse.createUnknown()) + poll2.save(failOnError:true, flush:true) + new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: "Thanks for the input. Your number, ${contact_number}, has been added to our records").save(failOnError:true, flush:true) + } + + withFrontlineSMS('2.2.0') { + // check data migrated properly + def click = ClickatellFconnection.findByName("Test Clickatell connection") + assert click.apiId == "doesntmatter" + assert click.username == "testuser" + assert click.password == "testpass" + assert click.sendToUsa == false + assert click.fromNumber == null + + def poll1 = Poll.findByName('Football Teams') + assert poll1.question == "Who will win?" + assert poll1.sentMessageText == "Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'" + assert poll1.autoreplyText == "Thank you, ${recipient_name}, for participating in the football poll" + assert poll1.keywords*.value.sort() == [''] + assert poll1.keywords.size() == 5 + assert poll1.keywords*.value.sort() == ['A', 'B', 'BARCELONA', 'FOOTBALL', 'MANCHESTER'] + ['A':false, 'B':false, 'BARCELONA':false, 'FOOTBALL':true, 'MANCHESTER':false].each { k, v -> + assert Keyword.findByValue(k).isTopLevel == v + } + + def poll2 = Poll.findByName("No keywords") + assert poll2.keywords.size() == 0 + assert !Keyword.findByValue('SOMETHING') + assert !Keyword.findByValue('IRRELEVANT') + + def autoreply = Autoreply.findByName('Toothpaste') + assert autoreply.autoreplyText == "Thanks for the input. Your number, ${recipient_number}, has been added to our records" + + // create any additional data for future + } + + performMigration { + // some migration you're trying to test out... + } + + withCurrentFrontlineSMS { + // check that the `performMigration` executed OK + } + } +} + diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/frontlinesms2/ClassDeclarations.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/frontlinesms2/ClassDeclarations.groovy new file mode 100644 index 000000000..c3a03d0bc --- /dev/null +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/frontlinesms2/ClassDeclarations.groovy @@ -0,0 +1,13 @@ +package frontlinesms2 + +/* + * This file should be used for stubbing all classes in this package. + */ + +class Autoreply {} +class ClickatellFconnection {} +class Fmessage {} +class Keyword {} +class Poll {} +class PollResponse {} + From dcf072d923714e811434a29ad19ee768cce33495 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 14:52:52 +0300 Subject: [PATCH 0141/2668] WebConnection help files --- .../grails-app/views/help/_index.gsp | 3 + .../9.creating_a_web_connection.txt | 78 ++++++++++++++++++ .../web-app/images/help/webconnection1.png | Bin 0 -> 21244 bytes .../web-app/images/help/webconnection2.png | Bin 0 -> 24785 bytes .../web-app/images/help/webconnection3.png | Bin 0 -> 29956 bytes .../web-app/images/help/webconnection4.png | Bin 0 -> 19752 bytes .../web-app/images/help/webconnection5.png | Bin 0 -> 32525 bytes .../web-app/images/help/webconnection6.png | Bin 0 -> 23381 bytes .../web-app/images/help/webconnection7.png | Bin 0 -> 7778 bytes 9 files changed, 81 insertions(+) create mode 100644 plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection1.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection2.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection3.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection4.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection5.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection6.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/webconnection7.png diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index 483d3b707..d9e988fe6 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -27,6 +27,8 @@ * [How do I create an Auto-Reply?][32] * ### Auto Forward * [How do I create an Auto-Forward?][100] + * ### Web Connection + * [How do I create an Web Connection?][101] * ### Managing your Activities * [How do I Archive an Activity?][34] * [How do I Export an Activity?][35] @@ -138,4 +140,5 @@ [98]: core/settings/5.manually_adding_device [99]: core/settings/7.translatingfrontlinesms [100]: core/activities/8.creating_an_autoforward +[101]: core/activities/9.creating_a_web_connection diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt new file mode 100644 index 000000000..7d6cd85fc --- /dev/null +++ b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt @@ -0,0 +1,78 @@ +# Creating a Web Connection + +Web connections are a type of activity that allow you to forward incoming messages to a web service such as Crowdmap, Ushahidi or any other custom HTTP web service. A Web Connection can be global, thereby acting on all incoming messages, or can be set up so that only messages matching one of the configured keywords are forwarded. The specific format of the request that is made to the remote service is entirely configurable, and presets for Ushahidi and Crowdmap are included. In addition to the upload functionality, you can expose an API which allows the remote service to trigger outbound SMS via a HTTP request. + +### How to Create a Web Connection + +From the [messages tab][1] click on 'Create New Activity'. + +![Select Activity][14] + +A new window will appear and you will be presented with a number of options. Choose "Web Connection" and click next. + +![Select Type][6] + +In the first step you will be prompted to choose between a Crowdmap/Ushahidi Web Connection, or a connection to another service. These two options work in the same way, but a simplified configuration is available if you are connecting to Crowdmap or Ushahidi. For other web services, you will have to configure the web connection according to the service's API documentation. + +When you have selected the appopriate connection type, click next. + +**Configuring Crowdmap/Ushahidi** +![Configuring Ushahidi][7] + +If you selected Ushahidi/Crowdmap, you will be prompted to enter details about your Crowdmap or Ushahidi deployment. This requires an active Crowdmap/Ushahidi deployment with the FrontlineSMS plugin installed. If you are connecting to Ushahidi, you will need to enter the complete URL, starting with http:// or https://. For Crowdmap, you only need to enter the subdomain name, e.g. for 'https://frontline.crowdmap.com', you only need to enter 'frontline' as the deployment address. In both cases, you will also need to provide your API key, which can be found on the Ushahidi FrontlineSMS plugin settings page. + +**Configuring a Connection to another service** +![Configuring Generic Web Connection][8] + +If you selected 'Other Web Service', you will be prompted to enter the URL for the web service you want to connect to, and the HTTP request type (either GET or POST). In addition, you can customise the parameters that will be passed with each request. The appropriate settings will vary according to the API of the service you are connecting to. + +**Enabling the FrontlineSMS API** +![Configuring API][9] + +For 'Other Web Service' Web Connections, you can enable the FrontlineSMS API, which allows your external web service to trigger outgoing SMS by invoking an HTTP request on your FrontlineSMS instance. All messages sent through the API will be saved in the Web Connection activity. See the [Api Documentation][2] for more information. + +**Automatic Sorting** +![Auto sorting][10] + +On the next tab, you can configure FrontlineSMS to automatically move messages into your Web Connection and trigger the HTTP request. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by spaces. With this setting, any incoming message that starts with one of those keywords will trigger the Web Connection. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Web Connection, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Web Connection's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. + +When you have finished setting up your automatic sorting options, click next. + +**Confirm Screen** + +On this screen you will find a summary of all the options you have selected, so you can confirm that you entered the correct settings before creating the activity. You will also be prompted to give a name to your Web Connection to make it easily recognisable from the list of activities on the messages tab. + +![Confirm][11] + +Clicking Create will save the activity. + +**_Confirmation_** + +Once successfully created, you will see a confirmation screen. This means that your Web Connection has successfully been saved and will now work on incoming messages according to your automatic sorting rules. If there were any errors when saving the activity, a yellow error message will prompt you about the changes required. This will usually be because you have reused a keyword that another activity is using, or given the Web Connection the same name as an existing activity. Once you correct any of these issues, click 'Create' again to save the Web Connection. + +![Summary][12] + +Clicking OK will take you back to the [Messages Tab][1] + +Your Web Connection will appear under the Activities sub-heading. + +### Related Actions +[Creating a Poll][3] +[Creating a Group][4] +[Creating a Smart Group][5] + +[1]: core/messages/1.getting_around_the_messages_tab +[2]: core/activities/2.creating_an_activity +[3]: core/activities/3.creating_a_poll +[4]: core/contacts/4.creating_a_group +[5]: core/contacts/5.creating_a_smart_group + +[6]: ../images/help/webconnection1.png +[7]: ../images/help/webconnection2.png +[8]: ../images/help/webconnection3.png +[9]: ../images/help/webconnection4.png +[10]: ../images/help/webconnection5.png +[11]: ../images/help/webconnection6.png +[12]: ../images/help/webconnection7.png +[14]: ../images/help/autoforward1.png + diff --git a/plugins/frontlinesms-core/web-app/images/help/webconnection1.png b/plugins/frontlinesms-core/web-app/images/help/webconnection1.png new file mode 100644 index 0000000000000000000000000000000000000000..1b17a76a49e86cf65f78aed62904bdbd08c73131 GIT binary patch literal 21244 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 M`&y<%+R*R+0MB-)G5`Po literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/webconnection3.png b/plugins/frontlinesms-core/web-app/images/help/webconnection3.png new file mode 100644 index 0000000000000000000000000000000000000000..5cc35fba0f5ba255643cfa9493401163dbe319c2 GIT binary patch literal 29956 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 literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/webconnection4.png b/plugins/frontlinesms-core/web-app/images/help/webconnection4.png new file mode 100644 index 0000000000000000000000000000000000000000..5fe5e9e18be47780f387e98092e8e4298cc1e40f GIT binary patch literal 19752 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 VD5!-HzrAO6>iAh`k(q1wzX6LM`ojPK literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/webconnection5.png b/plugins/frontlinesms-core/web-app/images/help/webconnection5.png new file mode 100644 index 0000000000000000000000000000000000000000..61867b468b00c8a61326046b2ff38084bb0131de GIT binary patch literal 32525 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 literal 0 HcmV?d00001 From 7fd1121f841c4791185c2fe390947da149b950e7 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 14:58:59 +0300 Subject: [PATCH 0142/2668] removed unecessary (and pretty funny) println --- .../grails-app/domain/frontlinesms2/ClickatellFconnection.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index 8643595bd..373028dea 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -24,7 +24,6 @@ class ClickatellFconnection extends Fconnection { username blank:false password blank:false fromNumber(nullable: true, validator: { val, obj -> - println "checking them constraints..... and returning ${!obj.sendToUsa || val}" return !obj.sendToUsa || val }) } From 783b4f0a43060b91a0830939df1d7185d8cb665f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 14 Dec 2012 15:03:53 +0300 Subject: [PATCH 0143/2668] Added images for creating a subscription --- .../grails-app/views/help/_index.gsp | 3 + .../activities/9.creating_a_subscription.txt | 68 ++++++++++++------ .../web-app/images/help/subscription1.png | Bin 0 -> 20090 bytes .../web-app/images/help/subscription2.png | Bin 0 -> 35717 bytes .../web-app/images/help/subscription3.png | Bin 0 -> 31791 bytes .../web-app/images/help/subscription4.png | Bin 0 -> 25766 bytes .../web-app/images/help/subscription5.png | Bin 0 -> 27918 bytes 7 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/help/subscription1.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/subscription2.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/subscription3.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/subscription4.png create mode 100644 plugins/frontlinesms-core/web-app/images/help/subscription5.png diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index 483d3b707..13b516ef3 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -27,6 +27,8 @@ * [How do I create an Auto-Reply?][32] * ### Auto Forward * [How do I create an Auto-Forward?][100] + * ### Subscription + * [How do I create an Subscription][101] * ### Managing your Activities * [How do I Archive an Activity?][34] * [How do I Export an Activity?][35] @@ -138,4 +140,5 @@ [98]: core/settings/5.manually_adding_device [99]: core/settings/7.translatingfrontlinesms [100]: core/activities/8.creating_an_autoforward +[101]: core/activities/9.creating_a_subscription diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt index 2c9962f22..2ddf4e2df 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt @@ -1,36 +1,42 @@ # Creating a Subsctiption # -A subscription is a type of acrtivity that allows users to join certain groups or leave that grouop based on the message that they text in and how it matches the set keywords. +A subscription is a type of activity that allows users to join a specified group or leave that group based on the content of the message that they text in. The subsccription will matcj the test message against the keywords in that activity and choose whether to join the contact to the group, leave the contact from the group or toggle the group membership of the contact. -### [How to Create an Subsctiption ] [] -1. From the [messages tab][3] click on 'Create New Activity'. -2. A new window will appear and you will be presented with a number of options. Choose "Subscription" and click next -![Select Activity][9] +### How to Create an Subsctiption +From the [messages tab][2] click on 'Create New Activity'. +A new window will appear and you will be presented with a number of options. Choose "Subscription" and click next -**_Select a Group_** -You can select the group that contacts will join or leave +![Select Activity][7] + +**Select a Group** +You can select the group that contacts will join or leave. + +![Select A Group][8] When you have selected the desired group click next. -**_Setup Keywords_** -On this screen you will be able to determine if messages will be sorted into the subscription or not. -To disbale automatic sorting of message into the subscription, please check the 'Disable automatic sorting' in the Automatic Sorting section. This is the first section on that Sorting Tab. +**Automatic Sorting** +![Automatic Sorting][9] + +On this tab you will be able to determine if messages will be sorted into the subscription or not. To disable automatic sorting of message into the subscription, please check the 'Disable automatic sorting' checkbox in the Automatic Sorting section. + +If you want contact to automatically join and leave the group then you need to have sorting enabled. You may decide to enter a top level keywords(seperated by commas) or to leave it blank. The top level keyword is optional. + +A subscription needs keywords that will match to the join action (Contact will join the group) and keywords that will match the leave action (Contact will leave the group). The keywords for subscription actions are not optional and need to filled in. At least one keyword per acton needs to be present. The keywords in a subsciption, inclucing top level and subsctipition action keywords need to be unique within that subsctiption. +The top level keywords if provided needs to be unique across all activities and their respective top level keywords. If the top level keyword is not provided then the subscription action keywords (join and leave keywords) become top level and need to be unique across all activites and their top level keywords. -If you want contact to automatically join and leave the group then you need to have sorting enabled. -Therefore, you may decide to enter a top level keywords(seperated by commas) or to leave it blank. The top level keyword is optional. Either one of the top level keywords seperated by the commas will work. +A subscription allows a default action to be triggered if a message matched a top level keyword and did not match at least one subscription action keyword. -A subscription needs keywords that will match to the join action(Contact will join the group) and keywords that will match the leave action(Contact will leave the group). The keywords for subscription actions are not optional and need to filled in. At least one keyword per acton needs to be present. The keywords in a subsciption, inclucing top level and subsctipition action keywords need to be unique within that subsctiption. -The top level keywords if provided needs to be unique across all activities and their respective top level keywords. If the top level keyword is not provided then the subscriptiona action keywords become top level and need to be unique across all activites and their top level keywords. +![Select Default Action][10] -A subscription allows a default action to be triggered if a message matched a top level keyword only but no subscription keyword is not matched. +Take for example a subscription where sorting is enabled and keywords look as follows. -Take fot example a subscription where sorting is enabled and keywords look as follows. Top level keywords : 'team, tim, tom' Join Keywords : 'join, in, inthere' Leave Ketwords : 'leave, out, ouththere' Default Action : Add Contact to the Group -The incoming message will be mapped to action as illustrated below +The incoming message will be mapped to actions as illustrated below Incoming Message | Action Triggered team join | Joined Group @@ -47,12 +53,34 @@ tim | Default Action tom | Default Action -**_Send Autoreplies_** +**_Send Autoreplies_** +![Autoreplies][11] + On this tab you can setup the autoreplies that will be sent to the contact after they have joined or left a group. -You can setup seperate messages one that is sent when a contact joins the group and one that is sent when a contact leaves the group. +You can setup seperate messages, one that is sent when a contact joins the group and one that is sent when a contact leaves the group. Setting up this messages is optional. **_Confirm Screen_** +![Confirm Screen][12] + On this screen you will find a summary of all the options you have selected, so you can confirm that what you have created is what you would like to send. -On this screen you can set/edit the name of the subscription. The name needs to be unique among other subscriptions. Two subscriptions cannot share the same name. \ No newline at end of file +On this screen you can edit the name of the subscription. The name needs to be unique among other subscriptions. Two subscriptions cannot share the same name. + +### Related Actions +[Creating a Poll][4] +[Creating a Group][5] +[Creating a Smart Group][6] + +[1]: core/activities/9.creating_a_subscription +[2]: core/messages/1.getting_around_the_messages_tab +[3]: core/activities/1.getting_around_activities +[4]: core/activities/3.creating_a_poll +[5]: core/contacts/4.creating_a_group +[6]: core/contacts/5.creating_a_smart_group +[7]: ../images/help/autoforward1.png +[8]: ../images/help/subscription1.png +[9]: ../images/help/subscription2.png +[10]: ../images/help/subscription3.png +[11]: ../images/help/subscription4.png +[12]: ../images/help/subscription5.png \ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/images/help/subscription1.png b/plugins/frontlinesms-core/web-app/images/help/subscription1.png new file mode 100644 index 0000000000000000000000000000000000000000..39eef883f05d32560bb471b17304f242f292a415 GIT binary patch literal 20090 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 NWq!o0>{nOHzW}fO=kovn literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/subscription2.png b/plugins/frontlinesms-core/web-app/images/help/subscription2.png new file mode 100644 index 0000000000000000000000000000000000000000..0eba47467fa55133b5e9378e7d632ca79c651891 GIT binary patch literal 35717 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%0Aio0*u{X&zcvNvw0AE+FwUqb!X$_ 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 Ef)(G8Hvj+t literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/subscription3.png b/plugins/frontlinesms-core/web-app/images/help/subscription3.png new file mode 100644 index 0000000000000000000000000000000000000000..271a6c62ae915212ed90ce06cda75b9b74956114 GIT binary patch literal 31791 zcmZsCb95!a^Y6rVvaxM!w6Sg5+1T9h#?HpJZET!uY}>YXH%?x@KfL$PyXVZEK0Pzl z)z$b^RaZqQDM%v0SKbG zFvVumL+&$t7cpteb#%Asa{n_ehGt{bP0LH5D-!~ZXJ+b}vn0~k$a+O0dQ0=-TIKkgHc0YD4@ z>RKlG0U!kcgdhQc3;%)C%T`+(O%CG}r4m^Bsl@FAj3t@?!UVIq_HN^-1UHJfn>;MFJDZuuzk?Ocu_R8lYV? zxHE}iAXw}CF=rX9fAUcS$(F6)(EE){-w2WrA($UuWVOQmKbwI`qA} zdg_PwQ~so^@}?@T7wrBch+`UEzqgs#)e)kgr`Qj?XYqTZi@J-m^r5;0fnh;~ra>hd zu$IGVCb2He!1oqmWk-UkqJB+V(nDQOQ~8R(^71);$yRONuyG+-V zJ$~p-kxuu2aCB0`Ap7@!gl!TVh_8snd1Tly9;Q}ND8btDLZUKSFrmxNBY_3S5`xBL z`C@ptiso@M>768Be2U6LX6AUaBf_|pe>4|U>R6LHNAL4*`f^OZv>5U($P22z=T$UF ztx8<)U$s4yl9yo#)G?tX{z{E)yB99XwsL5-__}z6!rO48Dzb0*p@;JN-Cb#&czRP! z`CU1~xuk#dGD!TvsdSJqJy219Z!c2=H+zZZ`+T-GGXu>1n-^UO>QL7`CBcBPH_I#QVe$3eB@K z?u-7HK14(27Lx%z`ZhWSeb|^lq zYM*UWnvDV+&dDMKapc&>8}i+?JJP0>y}p^2{_t*R6URXjya&sgto{YOtE=`3hKK^K z%`sB6T_j}!NG>kSy+hj;$UBu3=o^s?3tcdh3YDXLPEA4n+S(|hpQs%erf`l=h(XxO zh)7~i(VEq^<1hnW=K5pfZpNM$X_~_3{ZiYsfuC$KfEm$e@Vv`kE8>;%= z!PCoSO*$0pl_Z=PgOd()b8S`+VzqoPK!MfOarKkfy!3<>G2* zc0<|(YiJm;$2;v1|Ku@_8VoL@*2dh|p9o-B0@oG9zeT)ah0;cww-uJ#ozn?ahk_Oo zn5IevTWJ{CLzCCXoqsAm)U}QebMT#qD56t2BK{^mdM4Vax}7M?msM^I@#JOxmL%XB zJvvYlFrt4#6*qRcf<13(V3$gr{llT7B`%T3!~L6~$O^hP$pATzrbFuAsZPPVq8h2) z=?;b1cY4FZ8M>i&SEWkrhNOTFmIRf5{e2qHTSxKTx{#k@)dmMj7VP2g1A=nD4XyOy zz2wtGS!JZc|6&)06VHK;ix2LQr4pcUxqfgzUohrp z5-~ZMZ7y39`hr%LU^wlStCVIFGA(xw*~`8CoR>a$(hXyedp8N;70G{NL^myuOoh!~ zl{sxaZig+tJz(c^EhNr$w60pWT9XA?&P#n5UB@b~hwcH$AB)|#M2M%Por~fwRzH-Bb0+D3l`z zS!xz;twoPeSCX6@3Q5JGABuNfO|j07vYZR>ickGb}{ z59H%{ac*S6Nm}S%Fa8;D5@tPvZotz?D=zyJs4-Bf0pL}L2AOHF9t=3_Xsr(`t^JE8 zh!#wIu_0`UzlsZUQ(HXZ&_`CgQas&#kex-#?i$H#&BTk)H%Cf0PZ#E-kT~we#MEe+ zU*WBc?B=S)NT*$v6;+BY2~}x%PEdq;!jRPL#gd&sG$hcacR;(sA|cQ@o9{}2+tyJz zAf3g%diOT7%bNS=Lty66)TrdeZ2VGBD$3G>BU67fW-EjgO$62uKU%5jc%wGzgiJ?H zZ`8r|pjNK)?LSXafnc7$hKD^X+XiiIde>sv8nY86^Hz*@H7z_WsF(H!E;<((?l$J0 ztZR%Gjp7z=s}se|wthAi^a5LvKk2K3j$0n*x5rxTlRXMG6~n_Yb?Kd$8Hw0ZYp*3N zCchGi!0w`hW^AuK#$6HxbvHXxgPw;yawcluix;h{880^VS9t)?R6lR-<#ATZdCQm! zug5qq8sde6$6Td?uS>GSHtm(Upc5x&)a&@mPo8O;{14!HDn9OyFa|Ak_AE%2wut`8qu((gSsOidnr1T?kNa7+9S$O z2c$)u>1NOWOmU(7w=53S*jRJ7b>Haaqb?Z@RlZtYOMWnNqo`~j$d zJP*eeSp!)>>;@iH1U460hz6|7z7=Nvp6jvZUP>$o=8jWCLl*|<>SvOhoTPY3J@el> z7r(`xUhti>z9fjYa@r$+o4-f+y4R=SKT>vo5|E~ymK(ARO&aV72isK*&n zmU;Zgd!3-!v%4>+p}~P8IBD>VN5$erA9K&o&zI}1yO%#+ zA8-GjFYn5u|Ka%%Ux3RIQ{i^`N^c!*0Cq*US zaOCSTW&!Pr^x~Q(6<1||YHsdKIC$U_S6;N_TegJt0v{-qBkT(P4q zHcS%lqN&z7rB0pW=&^FbNigWQ2rWnD7RM=N`O|c&dpXnCW;knS+%Ak0d?}(e6D7ch z5U-f|+tM@VhOpT9%Njb<7a4=k!SY3bgCz}??fv0YdCJ9bmJ&@o*(v$!`?3!l>aW<^ zF9@{YLYVU!uNC;eM^>zNmV5@6ehALn!uOQ*a*eP+j-5)&$QPP{N-DrjFe-}ch5h7d z{yA#yv{yqSY4(2ApJRwY{)a0Hw|)s2Ac}l8^b;06r@rzQ#%zZpGPFEI4>OSExnr~( z%J)u+P8gPa_m?$JXfQfB#I2Pry^Qn;3_1>&kyk%9y4kuK0{Sxz{yPIEsj)5QU^piF z5Z=3u#dWW@x8{Uik06tmrU zp|GUG!^4S*i8ppZdxEhl@DA`Iu-A}~^12RY){~J_a3j6dDSQ>`IHn~gsn&i&DpD&o zTF8}ZNbuBYoF!u_(5>{bwd*oUUl#(`zHkQ28n6sRSLn-_yBbvL;DsqQ5w5=ys4TH~ zCpp~wW`P&0-g6P%7Xr=CV4*MkD%~fNh6s(_koh{}`h~qxV38gA1EE-jcKZG|ORxjJ z7_GWG))s0oDifF(V;hGR*206I6C{wz)Z@TyPbm&mNi5EDXv6_(%~{Z&y#xeG;3GH7 zJiQ|QTp?5EizSr7z)P$d{S2)>`YX#I74Ta0?bk!^W_t>SMZ4-QwQ1@2ad5?+LWd&J zVW-vbTIL+AQ(TADFsFXVOzXKDhrcSR;)R<05OJ>5P#yJOZPQJLEucZ(c|eA+$JiDT zR(7)G%#+?gORlH29N57m?Gh!wRVbT6<-u&iv|nxg^VY z?%M|M$Ne$H=zS+mBmm+EQ)lgN@67>#3%E~}0ul^31zA^A6L@rx3IlP&IHI3ME>7Y3 zruM_82-3GpW0!^2I*9-f(CJGP=!jU=g$f&Ms z$<`Ac7t4feBu0+R3SE;=tTUHhR7o zU%s)>Y-Y5?3iXZ1LN`SmB-qhXv2m!F(K90`rDOPvBBHh?ppqzLL61xrkqp3@iDrP} zSjW(<9P`Vi>DP;x)|S}kN|514oySwXM+KrqWRt6t5sy)G4WIMdj{o@QY~AnXcqgp0 zJ$Olk7bw#IOu!&))xI&N{;A6LF(kCp)mWRSbUmkOcJQwaC#;2?SD8#UNlDFkTmSnH z%6#RKSdXkxb!8_u?cKckR!;wG72?7AfVO019{9#0^mH{6)uh;8013|HrB*Xrqt}mL z$!5X{VtFGDx;*FuTJ5q2Y=(gpGnft0C9f3e1^K>q-9616RGP(csw!>YUBCEPs!kfn zkmZ}f;PLo)L-(-NjgkhVimbOX2E`cJ+YA>*HWvS`nx7SHO}B&<&RRCWpH^j8{Bz7| zM{S)ocCOKAuHzkPuVU!f%a*#8?JI7>!ZCcpk*k%Y>41pa?dS3uI0dzHwwUE|6r(lC zX=4+ZUo+Gz@a3@^c)hU0;%FRfPcOHcm;M)(7{dvB6KkWxSL)Vc)i_y%h70X)+Dp`c zC^?JN*xha`@0a)Yy+gCfEAcA9^Fpt-ztz61b|wMuzR9>in|tB>I|ww1@X7jGi!HBh z+VaZxNLtk!u*Y=q4#rIhyqxb-o|}ZKCDDff$kFgelf}RRc&?O8x(GNb8tZF#62bOA zUeZ`9T$oAFN%)di;mQLVn_q64+qW*#1VYwBcr+k9xl6U3jusNt43qDd0Jn9zX#pFv zpJw(LoHlfPS}GA#{tb;e&nW`t;GJbhYQT@ezRbL-9SFywF*<9QPT+GJ%-1w3v{WtK z;;%_W5D3KDs&A|6=YzHA6UTU^A#-$!CBfl>5Fl_qB>7xDHx$PMZILNX_y`1fmr*`{ z1*yHQ0x4j%HTf&w#O~Jt^c) z$p37;^I$pkIUQ=He}BGw9j^`RhxhL2g8&G$1{)ao0_e%Kry0&2va>CuNnw6x;?q?> zvew(1SuYsP<;WwrwN4%;GRVIqT9x(>3ZYW-y!cdZd2K%j&8ZvCS|Jz?J)`*`pPRpa zBPvY|s7CpeJrnpwq2ZRS5_RIvu=Ip%vm44cxbAS-^-Ts~#-k||YG@mg;nJLxjbHLH z&v#}DV7bb752KM}3cUHk&n`vretQ$rB0BaHWoVUMV9b?^iJj!W^s>l-6**vB} zqH0R%hYLz~7Y{O$CYbNMwtgATt;K8#TfG&!(?iHd1EWPw6+}*d7w;@R;f>ud{jT9c z*lFoMGU_UXugaNtOus_}U=zQ>(VL9xPDj4{yN<>l$=q#Bp|f(t7jolSeI%tsqmWKK z>xBASTGTzYJFb;T3?8qen`*vHAze0MJ=`rv3d1S*$(!Z+;dmOWxiaCULo-99@x@m%V`3D?^$E5hA$hX!%} zJz2#JL49}l*^XTLraw9f1sl|i?13Z)-BGpuD%7Xq(|5yXi;lo0n*z_X^4HPV!sgeV z(X-0OAJdOpF4&y1V;r2U)ngvjUCC`S)Ze8LsGzdE8W|5Z7Yhu)p|!m&ipfPuA7*~6XH|R<4=x>LC~YcUgB!( zd!H6gn{7o7zUhHLwOAg0dp=DsKgA8Y@_{DijOtn8FkM-=<&E`stGIxYRgZCX`@+|U zG&87e)YqDZyjvt-sNRRZh5p4;)QFS|G8CIf2wEy^7##;(cGQuDoqpX;ydKlvZ+rXN;S|MRF3dE7V=tZ`T`A*UG|=q0Bx~n^ zvEcNm%XlM|eEU14keyEtarM|t*rXg^!=o30ye1`Ku7mB;{Hq@gIc}YJ>Qup!{Ah~_ zU#gq~dJ36JHy3DnNU#&>`Z`J;3M3#kEqnKr52lsQFwYlF>M@m|JZ_2>k;@*&V|#}) zCND5G9Tk!OZ$^)I$1;~e^&*Vy*5}wS*~jY1*9pTu@FWUOUW>NF5U!*=dSep_Dq==ZDprwE%< z@MjtwC7^Kh%m}`t_v44}UpsOyTo@RbV^L60dBs>{xqWXSi8L@b$brU7U;G+uO$hvP z{a2TC58()R&0NV^kSL$CP4_-=s7@)d$uYN@dAc9dj7)jt?1W;asbp_4zg+QfBPzZz zpDT+h0|{sOmIEJEzK{*PKj!+u$X%HchHl_zK*pp~l!F9P)P8Yqad1mx)=-}9G~MmK zkCqi(m!# z!jdbUrCMsuw_ogg_!Hg3FspZAj{B#V4zMZa-=!N?5`D{6id{!WHcc8xP8AbSwdxVS z)u6Qbyq&#)HOEzE(!X$Mocs%F_7^Ex5wfyqTqf6=LKy~=w>FD{*rdA2{djwuR(+E_ zzS!B>$%5oAt3L3s$%;ng`%Q2#7mrFT3j-$yG5+ll=?y$ESu~K8u&9MVFHQKiC|sJ4DnpX3;k=Q^(7D+=K)JU zxd@k>2#%>)FzYO_8!-@LL*>#P`dOX{1Ia1g^(q`pVzN7MlJB7IE41b9WB9Si?L3P^R^dSDG>}XmnHJGfPRap$ZzYoc?>>%$J5VC4geliwoVb@-QPK zsk86t&FFWx$oowWx$)=s*F+8om!^8oR4$VrKeb z@GhS97GsZUto2vCqqKH=rv8%^p;U`rwoAP+m7?qcvylL;0L~`{| z=pe7cHdRM^yZgOgn(#)D}v`#No0F1Jqh zKhURN;9M36)2nuhca8!lE^2te2=^?N^2Ju}^st$Eg8Jk+wpD~7QTn~7TVVSTEI03U z{AX&hZ7>+p{~bHb437J1Q`2O)gXI})Sh+9j)K4m2K4}AmI@QeD#&{UEc`Z?knSJtI zmQTA8&fYEP-@oAnhtRxojPZxxlT- zD7L2a*I=gd2909~jD-u#;TUrjUDNo_NV`uX5blbWR|q8cnkY&=P9u=dIGFg|<+tn% zUcyGBIzkvdf-3W;^a!RCfYDqI#i*w!_g#Gi$V)*Yq+Xia6D$Xn3-z}c8yjy^LUnXUY$&Jp45{^(Rb zcu}W?l@(5rTQjzvM4LAPe;kan;TlNQ9LdfJrRj>f^c3?`MXsv8FnoW^_)bg;5s^iL z?TKIQ`4@vHcjNf-lVW)i3P}wur&D+ju9T5=^V0% z$|8kTb7C@3l0svyCFaa4#jQ-afz%)+J~;_4O2?`sVxdeSd-)qA(`m&XrNL%4n@`^u zQG%|nU(dR^V;hGJ8%+ho zHWGnBJwgXjSXgLt9TA|4AsVK*xw`OiUrm~|V0W4rp3p()kAI46i+znVrZ(%@ceDD+-Q+ShIl5kv)+qXgyJA3fOw~Zm zHh1#9WO*V>h?1Uyfx${U;5ZRky9=`cJP%+^HFAW`|R7b7~{2FF*A6qUldovE0Gej>U{ikg^4FqiF>mvl~Kv zHjxJ#&OeTU6ha+5jhm3G0Tv@}K#Peae~_T1gvjdL6*qAb=bB#Y<_KPH^gR(ds|?q~ zXnDC^d&xWllD#t0sTe&T>dW{cjbdQJ{xjM>)_QY7@h4SJ521Mup&xhuCa2^+Y(>AR zsI75RM}NyXmO_&J5gStVMKxzhXP>6#Js(bu`s<1+m4s6lbM|BbK@^U*QN5mmJ6(&_ z7iSAW)0bE*LP>|KGq6vhm|)7QcZb_KNiInfMmc0@hf?ZrT&cY)fk7NtH1}i@*4bK^ ztQoQeKeA~Qc?DWT6!XoH@8O~f(-tVu_7B>spxbB_)EG6Jr7m>8X*VDAVvgcNd^!?N zK{Jfc2|2|@v9j;5RVpL5;4wjQ#jQ|YirT)c#!eHk%#|WW-@q#M2P~ih=@85W43@-t zwBYA_WEW-8%72_`AEvX=t%D_-=S)~T+@JyEW=aEm$)#p zSDK42)wivaAKITTj>gzUH@F)qp zL2(Qx;%;ziyQ;^R1`=5*IBg~Q?dvHlOjMQL5DZh6*MF~lvHENVG_hEzDZOd!pUiTP zq-<<&BuijG`FiyEq!wMF`Sal9v!kDXK<_44B^tH1v6R7Q-vJ{kAWQjpt~GTk=bKH& z(a6Zir=xY$>vLi-+boHr0i}w$ey9R@*{&AXQ(IeG)%v=`f};>~*4zCWmxzeU2K_%145Vt9yVl`xEn#o^!g~o}h)D3w z`Cx|{=I7B*_nvire*Vq*`LC~&ELOH-^8z|T0v@&PTG!tDTcUS(6%Vz4{_1xdQdTcK zquh+}E~j2R&I~LhXnKFsx4W0se3!L+|CoD?T^Lq*mPW=-Kx@qiF@=D+Q{b-c!;OO( zB1%|fe#_Cc1r=x7uyE>dyaM9D#^b5Pamv)cfB!6|bL>90{}mnXg+x)qC{p$1E24Cz z`Nd0phnicLz_;4I{m}I|zGd>C5jH4){^@eLTqm=XadvQxaq!5zl?;(NGUs|hgols6 zwmF+nTxqDv+W>~|S>xq~w-X{K7m7Kqwqlj~lhfRKZ~&uuO9-P7y%e(DKrFZbH@15!UpZTzR36r1pJeo&7L z4=qqhitCxi_%Q#m$|I>gw~Qu3MOIR@&j=N|Fg?RW`7UDSf;@o=yO2fY#IkoP83A05 zeSuZjF4FOB8ozIJRMu|bdLv>tGN{oAF6N?X7)(*R&SP1LA&&z zob8n*p@GL?xt_zA)7G8aOu2;5nj%jriP<3Bjq&ZRr!e7RkMyKxpQ|mlqrpfsr^Tv- zw%V12y{zH<2C#Bz+7GGcsi0&Ca<>)3E|h$+%^pDG^JPA!gEIh zMb;YqDSn$%OtuJ`1h@$G^2ijlCb`Auw6iK#|2G1C{9nkt_%Xxiyd?DvOO&dT=55LSX&^Knxp$qO z*bX}ZI(%J5fqScJ4R7?5@2ZRM-^9Nl;|+#ih8J-*MxbYI#cWYw@unicx>k~v?-vdj zXLf(QYqAge4MNPH|Y{w=E{jbCcar|yk+mY$$JSG11N*(c$daJU$sUp<}jtB|1- zv|FHCucJo#Gm9MS{tsr>86uy7ZH^Q@3xwtV^}5ZTpS#R#eo zTy90GY)-iZp^ZqImpCh9jsz3b2%QMsIRY9R%rTZQ5sJ2K{(-L#nlyKg@~^MCc(DlI znIxn(Je4F(%lNSEQW9JxAOH!P=^Usvt#v&4dUJv29ech2#- z>`yXc3qp;Jg8v-z5^vO_@(I?rJ)$b+L-jc>C~0s+&88xoD>7L7At&h3OpGQP?tpG! zJJ)lBnCxsvcVDSoc^$QB>h@`c&NXyvP+yCwd;jF{FALSqx=E5<**AuXOk+~*D6wlbDng^2N=1N1hd#Is`&RCx2~pWD#qXY)o9LZn6SvK)_;~ zjEP>L`I*YuhTM_SE4P_;LjXXRa2K^24W+rpD#h9TBpq|-w@O~hDCD((X)IM`Y>x%y)|eUK;`uM_}2iPkDGN_^G<+yZNrsh1P*HfBdx$Eh-S0FLn8=PPO(t+F2+3a%tZ5h#IIjB}9z#m%aAz9~31sy- zQ`c*Un~fkxGz@+~&xmz}H<}CYCuNFgFFKdM`~CP;Dx`E32DwdhFsiCV%0IN{BS3sZg1=heOJeP#c?_nND){bd0tUTrA-&y))Ek zrt^VIT?pQUgEQ{}Li1p8ZFgcIl5tlv%^w|s)QCOFrfLVg%ge7k6Ly*kK~d{IrK+S+JlNvwRn)C zozF3qQPqG2Ybi*qnei08>mAgr9>Hi9fPh#V%>{*;5?o_bn|fyS=v9otce_*on?S*o zGD0V>Iqj>ArCqGg7+vbJ4MI@8=~c4`5)I>so{ch%NKQ_^e%c37{*J#nOI8=x{|Jtw98EaU!62S#?!m)icU; zxErc|@XJHmwmEjUWC>-w3@~}7fx@R*a=XYwE%dTp=&HLtOg_ucE=A`?kAx}e_H+GQ zrpx0;H2+s~*IH9U%EhpgVKmIZo7L!uiZ1!`BKe2M44ZDCJ>_T%O9IycUb>M<{pz&D ztb-28u#`w;vpz8(rQWV!b^Wbr1|J z#3|ze+K{atn~A=!-81h8M!c(=;V}1jz=9oV*X2+)0<8;Tc(^Wy0Q1VPL|T#wTYe2< z^A*;hPOQ9KK@BLBkU*lG6QVX#qPb|t-7K2Yy*^*0xGKYmkhar{BCZx(&$Q=e!Ew(# zAf0Ij?1%T8==G4qOf7g|UY7{ZC>Va-*yrGqbfF}$`Fzhrh#0m0gT_oQ4mJA5Nw+0{J3m1CfY}q#7Jwe+yWg?VwAX z;R+nZV^?{IsI5j%qsm6xH!MIii>IoqIPRm-MKE7p)QO{9O%c z1ombgro|pTc56o;rLt~MjlQ~O-BNl~13-Iaz%B{oAH4N#f4>l0yDl=r~f^twdM3Jvi2H{(unHrRo)0O3PzEn;Q zn35)~C2AR9Py8-?(xGPkm)8&<4KCr8EA>c@0ePFc`E5ZRC-gVaX%v^7DESX9ZX})3 z8`8|2Qc>u;REfnHgc?JioCaB{Q9J7Ig~?=jmTdYkG;~;4Jjl^GX7#t}?VP)Sdy8{3 zy!)ZklssNMVvsGrP@E26K%t555N&n7g|VnF3cI;D+zxA>+3g{-M&UyEKvo zADCrU%XuM^OF5(tzgZ>V1*p<#`n2*tJnw?YgI)PsJxFNAi=&W! zr5W3@)~uuSv)Cdg#ggAJJI9}?wb#75O(jcY7Hi80lM}Sw+mf!Ex)+nbLq&_*`|}0L z?xi@>e1{naK_oe4FWoUuO-F~NBW??_alT;DIzE;##f=7m!xi$z|3(l0?Sd1!8wPS# zQaHyznunXvYgWk~_a|YQ{LVWY?~T{BnEJ2N zaUH6`;0bUwpxAzBkr=yDt29A&I))lQlI8{B4`6-!#;%sVRE}DnQ`2%Z;6}Ln93Zn- zJ^*X%%BY~WLvIWf?Pl+fWBebM^(MBop?QVM|L(pkrTBSz_-b-oGMp}YYtp{SzbUpGz)COdMO52s`mU)d^o*`fis}QG_LHzF zsO1)Jn>e-D-_UlGiKb4AN)b~^WSd<1(I4o)IR`@Pe_x`I+e&Y!D2)B9hX{7+QW{5D z^345|97ED*BGlZ>1FSC8l#h)u&XFW?929G`ul+|t;B1C~Sa7V@4(+O+;MFKITMdH9 zcu!r0gVJOUA?|WEhfu($(3Q#HU-`?t`Ji?5Jv%NYK1R0)*VGWj!Em}MnT_b^ln{Yw zR2d$Ch64IaZ!eIy1<)wbuyC{dVuOgCfgZ%HE+e&aP6vdctTL}NcMdBAzxf_R_FjVG zoq2ohKX!G;jz2)4budu+mL?Imw@s1DR!2EB9#s4>A^}mxZKoBB;Q1mSK4mMy!@LxF={|R&zK!iMb z>8_|~vFl%mGuO^Jjv6FG{G?KL?$xGOVue={T62EZ&J_7s=>!PPvtuv(L zR9TP#Ac2Av`H}v!2qJc$#A&hn6SJg=tXX3;SO;bhL zPN^e@l8k*1lEGEbDF9+R2V`9ly26E=?v$*4%|-E{iIXzVi7_uIITf(Q2?eMmnQFva za(pV%I)`&Kg;6VTCcnC|&= z-*WL(M31*as0GcFg0788Gc}y=ct+MtExF4$z#R4ZXllF0D%gdm>939Psxmhws#Z@EeApsKYkGcf0}J*{ ztySEVnMOQa$X3-Lm&qvwhbJxO z`=Dm~*7f4-;CLcTC#T~17S-uJ@tNbrZb~pS2KWqqfz-X6E`Mc3q|*){MRy?_EdnfOJDdi<7qK z6nMTZ$?Dj{GD;v1QhWj&79}l zSNThNF?3j3$mLV-CT=mq__{X7&jakeQP~xe8b(th0Ecu~qItc`+$f|&|62~zkCeYt z$z?87nqmeP7b3A?VsjlZ>>I*ouVLKLrYIPGf$XTTOM>rDKkUF^gXQvPdB6KtsQqmJ z-7$uY1RyLU)EJEYf|3ms2kD`JdRCzh+VaImu^_eK8#iw!jB81lql^%TW9<}ieBwev z_LXf@0%0SK%Xf}q1pC=$H*Yd@n8?}E7bCx%Z|)~fo$ijtGh;4#>BFsSQ%irNYNH4( zS(3#l2*6k3VuToUz91a@Gc0fSkRq)VTOyl9dBmCXR5zxS&q)#Yy9;vesMMAFAImPa z6ifg~svin|r~e1h($nGfQLX9c8dJKci8Fr;`X}7%vx4pw0}g?kl0TsH!T5bi<*D@L zWTCDm7>(Qm6{vgC_q5YaZ&TXkMm^FWcQ$@VgSzpgsypgCi^iVV1kox1@BV@*@C?i{ zT6R1uG(zO%ODWbn@~+Jl*%1;@eLU$DhjEyca08QuPh5dl6A0YDm@~Ji=&7f{)w0ka z-!JD}uv;rZ=(JKKA>O$eNysmWAL&9QaUYPVuR?a?hwKwEIjx$f)Rpl zm%NffPRRGCXp8B<;sf<BuRTxB!T07;i=d=zL6KCQFYBxGu8pHtKk zDv;2KOpN=ieR+1oG<|JsymB(jP=kA)bjXFgj9+d?cY#b=80@ojd{=kL9XLcUEEz}k zt$08vYSVU2{(W)apRT^;wHMf>JQwCO@z%c`;3>`H1V=QmAc^ARZ|72Un7=z1Ym3xT zZR5(a+9_~(JRGAhLxYQ**Zp*M%6>*qBnO|OY}5F+y>r<%oZ2Ng-!b?|4=U`ZtJGLR zB=uAmXrZMG(xAVKjwhd=AtS-@rFeJSb=u>8B{oqxDs|yz-4(pp5VXWI#u>gHcK*XA zhB`;7kZzJ9v_mjZ{6&Od&Fq#c^~9t^uKiEScjrje_7fB8j{6jqG{ctD{T` zw9s;4t+1!Uc{9Z$nSvgg-MLSPyH`I_h?%Fe#c)tw@(@&5ItVa$4=&c^z7S&)}^eQT?`_9})~oq3(6 zdh?BseFz)TwPSP81Kf7~i+;5RJtz|pirLE5tJ2J&rbK^Lhlt25+2|RyqSd^JP9C|~ z`=e*~T@#{=;OJ^{LB`lZexDD-!UPR&t<{Pmz_(e>ZY(17zOVfDUUxs1GrOWv>sHDlM zs=kbr=dBFX;d~~Pz=8pv(d(|hzKm#){*Do1B7Z=iDIp_fY;S&_z8#qYXg~0kwKa5p z5=a1KjC1O$6A1O67XYEpZ-L;?tM@Z&1qdHBY3KSpwEFBJkT!iB|1K7%2#M5>iuCze zuMx}2%8HhOK?>}ih4A|$!#FyU5i2V2nV}(u0lfA-?I-qtP(O)$vI6{1p?8Ab93eYm zBjZi;Fqc%!%bK-t z>6pKRbck}Aw7~Fw)bnU*pNKO=QlliJ{+W$pcS`tTReHt7wHi}Q7&T6*%v~N}(LtxPnsOdgl4$E8 zf>jxZeP4*2&cSN$lUI!o^q^Zl8TkR0-xjE*F?@A**f2*EK~tNybMhB_Z0h=pHUGTs zP<|36CP_+?Zf${%ifgby{=YousO0*MyZtc&_Oxh%` z^0-t;3iU7eQ~?OaS0W5cSpL&Sp43No$sBPWG9RysH{xI8*G)BE zfef4fjAFlft~Vjr*(r3$ou+p0fa`c^`sR2w_}6HhPASsQqmtPU_jvyBv6il`DRDcm zGN?RfnvtRi%QoJbO-GS}Q+7nKVOgzd!EDygZyqY%Z4DmU7&JU$S_@OVp1T8ru$unZ zMabJ}uE%VD;Pozr=}Hn-f7FT=91G&3Ehb1ECQo{^5kOsO`$h>WCn>yyxA6$XtUhe% z{X6mI4~@7-S11?rZyVX};nyw|szew2$M>hw+Zo&KY_vI)C0^4e?t?~#0TLb2 z)u&XCpI*;muwJ6Sgc4)V{eN1L>hw&;)`e6sH7jegv`(R*-P9P3L=`LrNb|V;i{_H2oz)VG1faMf@ zo|X`6rcn7-hnpUDvRX{yOxFK(%F$935`W5|Y4|Z?s4i!O3ciU>IJje2OyrIj0s~!T zRpuqm$B>4oY2{wT@tMDo(7~0V0PoTB>(6>ZSPd|Fb&r!ie^~r+;$#>lxIGql`0UsXbBTU281nEW zh=kp;jv13(q8{xuEnVO<8L@QylY%2TF)fdp8rZyhWzr}C8@eIq4(%i4Tkp3wfr&1X zLL}>hh`LoCq=DfizeoMcKsUCO&@5h0TF5vt8 z$NWFz7QJCI57}k7&3t6Iyy8wND-=n=QnT?*6mlcfuX~(b-FM(0Tzww^v~@u_xbbtC zBVa;ZG!>t7+7c!J$nu`g3lP0vy_su7@q@s|`n*Zbl_xMR4g)8^O`dcvf}2&ZLN|t; zrDL?iRE~4V^01!nZmzvQl_U`glAOX_C$ z%&>yZ>BZu}KC z#U?cDCQ{(O6m0#|g}AqC=w^+8e*ZXKaVENUj}Y1w5k1@}83`#VquN=g zGCju-6Js_3o3*kKY{VTFrP(}c+}2icjpRy&;GUxA-80_$cR1kx6!unObp+kE=vuf3 zmmmRxLvVL@ch}(V8Y~bjcyM=jcX#*T?h;&r-Oj)F+26VMVc&;d-K(X#x~r;d)|g|C z3f!*_6T6{9aZXho^J9G$8ro6buRl!Kymfw|Kg0cleAYcO z3mBV4xZ_PI?K@-N++O?4#juJ9vS7J2gw0GPMsfD&>pHv;K68nCe}+FYoxqNk&Jjrr z8P>0tSW?_vR2}=zGu~}~g(SV7b4A2FzBrAKxs0f*W6`W_YJwGDL7$wOGU)Jve*e(i z`cgZYL7Nj@hp}d~Um%<5Dm^|WyG*#`jw&v!riv`Ozm7Va9UOZrU_>0HfoI39*OU)R=Qs`eA zNI2ay3jt{(${(s;9vyX+cTy%o$;ilF5Qx%)pxiarsr8M0?vM($e?W1&Hy07^b#Xxx zYnFKRZvQ)>gD2GTGv6-fi*i9`d5{je&PuW!ei>OaelQI>0lGo<3Oy^$ z1xX=nxpX(Q41O9-O+o*pG}9{b1=zX!)<2K_z`v!RtDlRNK-*crr6{trtn9^ zp&x$pH-`Xi{jM?5)6=_N0ZjuS$$u=R|1p{VmyPZr7)X$RMa7pD@TMt1-unN!)<+XC zoGh%YatSa032pEIcS8L~*CP4fHd>nN$|g5g@%*RO^buWpKBn@n$`1|_EYPvnUinqrYh{Vn(6fCDBT*je zC%0%_S7oG6PXY82thAB(Uo>^ZnU7A6XYX2sNABL+b+y-b zCu=TnoFZ1)ITR6z{jd%u*y#7tY6Jt;rXu$b@l`RJ6XixaWyz;?m9dta&X(X~q21B; zrT5{jP}vXKqIm(`R5+^l$<45SkaVKY_@t-4Mj zfx#}*g!-c^yzz7KB8g{x)z4K1$gJuf8YlI#4jwO^R%cy&eBS26sd}j&uPB^JVZ_kT zTn{>p9E@k3H)0G@J{r&r(}O@dYy!!sAd|8YVr6P|Q3P7422$*zrDdbKXfJv^nv-1Z z#zvh;(%kx{)$*>R%x3pL8^YODd36urYWZ;!R<#@hYjz6{#`V9s%gw}2WO*>>=O3lT zWM7wHz0deIj?Qks4tt(_HGvi}feHPR)bB#R<@}rHxjjHBVpy9rBi>%~FXRTl_f+;n zoDf;j!B{Oas9OVGWbEX@FTOx4UzKi@5&PyZ zb83aSSm{r~d!iB=oPvvm9ttrRiU=t(gHbEf5+?05F>}U``9MgU8>oKa>G6l;4S9%K ztl29HO(E?Z;)8xNegh41$7`~m*;C0#-R0Bn(0lVbJu*$IdI{FJWo^^w08ik2AQk6ez zrM{YHc&yQ2%8N8Ko8t14=`LALVfu^ zPbYn{^OHsmX6|X@bmO#AzV2xJTl|cV1u2mmLl|q;1<@UsZ8+wM0vZae*TPl7KuxSm z6D4MY=-Q1;kHbTUVD>7$mj3PYyl+;Kx2um9t7ppWg-c@*4#&YOMs3XH$}c@c{^Xxt zrDMqt(P6Aj4={F{jrdp<`rGz?Hj-dIjIh=1X;~*98zq6vH^J^Db8PD2HxMY*%-noG zcxFcFDXM2}ZEbislt2&UZ>6y~^X~0AaBxuAewOtv{Q(JS*muCV=Dh=m)@b@inwtVp zVo)X!(Fl^0ldFeB!3Tlr|Ly-@zcK&c?~nm75CkurCoJF<3b32bX!}&s~J(!ze1`BRK-=qyk6;A(dYgJ@29I*VpFO=%-^C~o;0MF%Ct_=X&vKaDgb$2a-;Hv`Ic zYy0_M*epbOY7$V3ZsmT_mv{21zu!JW*e{wk4Gh5@Sd8DwvDs*l=W~b0~Fjk~! z9S-sXMUYXjGaZXk%F1S>&byopx}X><_lkZlfo09rEnti4Jl^jadgx&IgXX*U=gFxh zomWA3DTC7a3MU()-x1J*sx2dvnia3!Qd$Yf`&K|jMd;$`?C#o5dHoX>yAO^;a2&-0 zvhm&m8(B776;1QO9PdvS-UkMSgOUw{p3~9SGOGMtYvk`MYGG+2cX1Ory*a+T^NV zIh@~cE(smPHq^w_Sd=1q#pB65wiIA9UJA0YJYI=<V|LuO5Gz)we^brsDTie^Pe|*GE<8cDM4V{?@Y=LGwvUm9kzV{!QjmZbbu!GkD30^+FR~EMp?U0a5 z#AlwMwspG>eF0x@8!$(fy?Pl|9kdbd#`-!n{7FAd_hoK*Ib%k?2?lP+=do#;#_R;+ zdp87^Z_c^bRdQG<)AH6R^0vjFN?|A|T*5~xzlqxv2yv8o(l_{{sX5J(a6$=D?oy|F zD~i-5#H?M^aBepD#LmwB(Ac;lkTo2{l8K#_nEp~ydzG0~#gsh|u$xO2nP z>Buu$u}pqvB@&4`Cxli_hh5KYS?MQ(wlE2Z2S&9Dg{aR_TcF1=Il>1e^wZ%g(JaYa zX#*dmgGd~#NZx9=lilKeALQ&nAFGEal~EQcHhnhM{6l!WTxMZea&00mrac5x9sHwW zH<@p(V1GpOhjT1Jing+Aw0+mcXScV~pG1*+?5N`ANOv{}IK=cAWgB8hw0i935HEDK zO6D^8g4;;Vh^UEb9J$i2-uwUcvgE@9qb{2>*}$JDwmx{9Bh3wB4PHeHZm6WS9cRpM zl+@cZBNCOy2cDs{(7C}LIVq8Ap3qlsA#pJzgK@)?Vo1z-WX2Wi`U!=xlVg;7Trh}? zi~3Bt=7$qg(+duW8mY}?Q5?-T*=*nim^3$U9=<)iZ#;}s$|w*8C?r|iee)bMyN}$) z2Tc=MeX83XivHB~^o$Jp>C3ZX)d0$#J6`MOFk;jUpZcos-d(BjfUumvCF7N7rCDCf zT(H+2z=mh5St&7R-(aZ~Dp8CRKLj#Fo*Z-EBtXUX;QXF~6zhx=wX0-+L&t!Hvv?Ey ze2T{tC&}=o1e3ly{;ji9i{6;1{1D;!2Qpl06`m4U7~Vb=n^c$qcL&~>0uuHo>f`5O z1ZpCplzfO9YP`|5kU}F>Pg8x6MNoMrhgeLy3^B@`G00&H9f-})N4%FB{fLx-gO3)Q zz2$q!ukT^G@ujW<8BhOnr;|5qQ}|6B4~J7I8*Xwzig&aXlHy*^9OZR4oodQXW25yw zC#^?KW*n-a0y%t)N=jK2l5}$#$a-;=tsM$jvky zNk1If_!Vts$TDr|DbuDsWjY(~Im!r`Z|b zc885~Da9DK3p|@-+fxT=Rq1TX7|Uj$U=OiGm?5OrJrX(7^r0AG%pD8;Z{5Vqxl_`U zKqonE(2g~m;naK;`)-+)0ii@Z4bS?&qthaRp8MzT{P$ zr?}aZQQ=s(6Oae;N|g=h^)cy$6r7#N6YBbC1X~ERHZ~IGwZvygB}Ic!T@E2|s>q4U z5yM8?l{VaE5A>z%?_FymcXVm|EWjWJCHU`H+!=n@IE&T(qM{p)RPRbAjRU>#IC~%d z)J&{@5s@86hw`_KOD!;#Q>GeJjkVIziL47AvG#ABauaoyOCDS?jY~Dh4&AT53V)pM2rwtvLei%fYtTWEC7Wc9O3o{+t>8#8 z=i!&C?1FDLGdA8C$YKDTR~{Y~9+G1gf8M`EGuipg*fnSuVRQrPHs3EM3pmuZ=ml;> z3gJQNRFsMA^;9s5pXleAok!Y{yQ53SJ_JYfweHm+xOmBxS(da#rxFhye4145X2cu$ zvY|%Xm9-gw4~I_n4SnKkoFgJCsgkQ_ zKp?!)+|yUbSoC92uIKn#`q|$$+VKr*YgV_GiwYhJ2M?2U8?;fe88X;5-O9Q;X@&B9 zu;066VwNHjKW>AGN%K|$81Z|y(8-24#H!P&eh~Mn^9!HLVACvjN*&_-YT3^Z9Iz0M zj4*Q$=$4S;u^*;PY8rpEh{SBwt?3YQ$eL(ULybM&$W1LHT8?XNJ=x$vP6?K$u5KCO z(@fwm)bTJ!N}f@7+w;kK6t>aU)v8Z_1h1cZV?!vkMnv{=u8$RS^?eCuO;K-5`co1| z6-mpa^scDN+V$ zXnOs&H?i={(lJ`uMZTom|GL}FGGH7VgjA|Z6A=+X=0DWMzo^q1j}Y39?nngU%!1xX zZrvt$pPQR&+Guxu_};dsEHuo%bRkt^>l#LGp*uX1a3&{)aHVC2Kig5EYN}uu3agAs z-gZfHoA^nSj$;mnguh#uo>Q<>>^THgUwTvDr7^J@nC&Fw2!L1L;0sVH52I3`3| zu?n&cPf@rD_-nIp(j@3wIj)Cn{)E`3Cr+*pd%Re<0`T3&TWsH>*r>g4D7wlYzGE*1 za0)m)Kp>pwWRSifX2%(8E$BtA@3Ur-XI?av{g#;>gBE-YBNo1&E0n*W zT|s{q-q9JptVwz)0tFTNw=KZ~%4M+K3J|E*_G5iH-kc#9EKwM@iK*Z9?*fRAU$X~X z-PHus{XB4_kNTLLo2M`2u3&-S;k?C*$i3CV{trWlFeE;NjIHUrn=RECmtDdg>W7W( zZ5k?zxD~qYQ)p$a?F)Lp?JSThlyQH_@FZ?3xLFstvXKAb_!xOEYc8TZRCK!Mh`XKh zqV94LAuT6A*FONaN$)tbTC4na#3n3{bQ7tjHs`06leUG~t=r8$^zvX0k7cXyHFT(7 z&Gqy&+N;-2WbUI*dQFY#@1X5ECKa~l_x3wR6NssFYl&~)OiD(}`RK?>;GJvmNX!<0 zZdbb%`Qna!yJzBP`;y@&CWf}C-@NG!(=NG-I7zT5F&@jq(P$KC za(PfDuEOT@-7#$<30q;QYIy8w6U?^=V^zwuwVST@)%Y)1l2$F*BwRD1ti;`k{51JM1WDi*1uCjhOU~Ycf6)wd&?la?hG6G@*CWUuL8aoYx=Iw7~JS3|5aDccwIRY3lKK(jt@UA~*`E>#r`l+dW)7y+b20TQ+W zZEpcgkSGWgW12G1T?_u_Y!(Etga78R0bXa|7%_lx{+CYTe;;xHAk|Q&zbKN}|FnYv zrD6a7bK=(cqrE~1j`QQ_2*fjhi2c$cPv8N`!H3=b};e)D*= zd!$LLH(G?9UCzFnFOvr^oaVzo^j{|66uR8*1EAq{-`9^mv?sZo%%opW6Gg^L&HJ`l z5o{?^8*u`LFOQso1>XLrEkzjfDvKmeUMOev8J|FKJyFdSgqH8AcEM*y?l z-rinsbI;@70@4dXA=K8=T7Ge$9nQxUz%M9$QY-tCD$PC!>nZfpbo8SOhPOqqb6A@f zo2T(k*L#!sWMs(GmZYNW$b>6S#jo&SXrZlO&DMO|7i23YJgmUb%OKUJR)i_UVR|J& z<>$X7DGsNqjn_Zls_ttXMdV7qdDk)TJ4}ZZ#If zse%1GDf`HmcU-V`^$EoIYvnRHSGR>vEWvrK^xF@4`K9LD3FQ(Ow)tVQ2)XHyR0Xrh zVc`O0t?<655l<}YuyS^{2C}5RU`^U4ishq)K?^S>8oB~pJkyICte)%Jbb9*4uPwjs zXj96KxxW7Bcp4uxpcgiu>p`qP;i`A-%C68!y-rASg$tGEDs3i~Q5wwA=a4McxScL1 z!%CvBb}u@7i~E3qi*#Vmo(7a1lGmHL7Pc!$qf*!Na;qm2pX2_|W|n-B0DxE7Z*~HM zAxL*wG3DQIf1tbZe?H=SwjnaA(^AmF#KN`b8Bas{#~($7L|h}GQ~CMZl@vm!j@F(; z4?&QD$nc}8t-wz%f-|+F;%8X0kIIhJlcZwipN$fA;~(Lyhr<^q0Xh#EI)7p<%Y$Km za6&MZcA$;tr+KzHY8Ho~371OBZ$9P6-#tAcMX3i^a-|+zxnE;{MczRB$6b zF4EhoA<_Y0>m9*^*uYCw1_G`p^T1!FcaJ|CeDhFeD-Ea1b>;@A;A^!GuZQ8`r^e}0 zR!^{1Og1&dZx7zn&#*JdPA1i+$qugESe$ApK8AYF%m3U^EG4Ot7eE>6Z-oEK#kS`-P zM6ji25&AzZtj>0|k;8ri5Jlew+Nt}+nvl7G^0X=FujJ+H^8=6j1(Y2t?GuchhN&&U0ictr7V|)C~H1J{64JstZ(q_VI?FtLz3d!pThS+Y{E(;O)6NPzsW@H^qV4X67Af-V7RC+~-g z4!}JISZ?<0fFIH4?d54Co-%+XmCjPcG3ta`m6%}K$&~M77b=B87?Gl9!(BSv9A0khlMv|C zR!+LfO`s7djAgh}AGGP4$d|uWF`nDF0*59NyBP5Fv3LrwiE##IFsC;f_L5;FwP`)- z*zBoqLeOymbt*3&(pypn#AGnvKK_O~Rb((6qa`}VBsm{+}cG5Z! zdVGue#N+LblqQNfMS(rmyC|ml^(0@0C#JPq zn6l`5556SsSke) zRH;gn@CoP1N1qp_LHkS6*hs4!1;!lfx~)H8w~K>^9Bo#KBE-tsY;x~Qu1UV3ZpuYEfWloVKTN@P2nsUGU z=>fJY(%-8vzMrv1JI{P`dI&H`L;z5E2kWlQKR8nX@4kTA3jMwi^xUs5bWrF2%ZYgl zbmsm8##fsczy?SdSb~7%|8|KM&K)~&p1HMs?=j>h8Ve?{KHZ*Tzv~s+jBRlGTj=U^ zUzC2ko6)I#-tNcxR;MQ2X06HTq~3}Nxby_8maH4JZ=QGwP+%bfSQ`ebi79SJkzUqpsw8Pf4o^SB;u&VbT4H z?UInu5U%W9(Z=_ex4o30Tlv}7(OK#*OBiuI9_(*{!LI0BgRJ0j$RA3DD*Y}CZk^tN73e?k z5=7Q(LMzRr$e>cfZUffd5iuxaJ)ZwayicPmJE}{{iF$z+Spy`pK&Djydjqy?JK2yOA z8YqsG46g_^M3bj6T0Tb!f!*$$A%goMEVo%&8^SxldERi-du!7>f^E#K*w%wZH`wNO z{ZdYHHs53~`5<_gi^B22B>Wqtxg8Vfs5y)?5(|hAnyb1k;89f=Mh!dS=0M z7=(98)AvX`ctr2lP8e+X%ZOG$rDuY`QHrahx)u2?pfx%`sF zqo{rgK#Yse&_hJxGl+>JFi*5-r#i=X49fQaDzkcykqiSZVYEJC7pc<(l2Vlc2hA|4 z&L8IlF=h!C*tZ4~Q4!G_F+B@J>qwWk6`0##vJ_#wKUZca8yN9f-hI0{X7f!=S?}Qi zqr(flQ3hRp_wTafp!jb=0}CKYm#pB zfOmIyeLzRPW=<9sa3GI~h?<(3zP>)NJH&W`ATpJ|E=YOjwt z@5cm5G1OdQ&|PBuW-c7%bVJ1tG;1cfB9Lp{A`(%J0}R#a)}PRHHq>kjIJ<4{*LwZ} zNs%M*GEjYRZ0;@GMQ+1`ndSL+d=SKYvXRaa66W6=Bjojkc(Co>S{K&1iDXA2ae6=?>NUh)8OIZp@xP=cbIrUY%E$QUw0LpAOZTanDzPb zti11nG^kipM7*WZ%IY#U8~jbtHIj=ECL07g^^hGSK9UC)Xs;WgWPT$;!G}2XSd%9A z9i{3(5!9g{*pUR^=G5txoP8|A7bs%OUPWwiH#QF>MsbAnIZ-G6sma%ja@IgCGl&2K z=f#M9D}D0R5l#Zx^DlQekmPY;VPR%QMBh=aKA=kk!0l$0teDyWF2t(v}T zn)+cI4l=lP`8Ayw>vBb~_z9mHd8R+nk5H^nXj8#!^Q74^TOW0k6o%a|F5X|3mkc?G zqrPq;;O5KadxN!C6NF1vuq94Nw39qB9cW5|w@bTNwFFa!wPIM@6kwd*)wf) z0^05_x}$Mqds?N}*%7~-vJL(Da?XSAo%8KbWMKgb^8dWg-VbkhCPhU>qsVY1Z;4y` z`}=^mnj$_R*}|-(_z!&r2Lx!{w?ndY%Bj#&J7F`fMHT`^=z7ew7E9Vmq0GyZOMy60 zlY-N=fd>-FNj~3PWdcXx>{B$uHum=hB~VA}PT42H(;Ost#nw z=ojJ!YPTzRcR5bqch|;R)&QYh1sLadb*kgTh{9)P^8y4AP18b0;(?Zc&Vo;VnF>L9sX$v=6ist)?A$b=AQ?zjz(MH$F2z< zAvmxn+lI0DVEYF0LFaUzuLWU&Kk83e-b)X~=BproR`kcIy}%g@7rVW_A!%Nsq_WYk z%!nEgpy(lth=Fu@^9F6XqPYQM$CWP@xZ=d9F~~u4y%$j_r_^ZAGTU_syq%v<5wn?4 z9a?l_CCLa-6euv{=Iq|c(%{`AHAY4|pY|d{Z+z)oZxxdoU;sjr+?jDqzU_v;9KRw<-}>QFe|sJl6>KZTm>SEgTgDzHvI2TN^5jO$LSMTAJH8HN5OX zSbKeeCWRPn<#^6o(@RpYXIMyR^?R>$)`63xkJlB5(xoqBbc9>DpetI&*Ij3qR*quS z(7)HiZ?hgFAb?j~z;C=3F5>Ir%0t}ilO0i^ow8Tjg$tj1X6LM<8+vID3c z4dZxgj1iC^iTYt8VBuf|i)%09!PoJ$#6xBD=>3!Ob-(23w>~ZW- z0;tIe^7?TW>5^@%pUIt4ZBoC;HwNwHS4Y&%(X|eNFhRuWn&M}ei{JC`q5Fg@WX=RRMSd0KU&E@+ z8Jt&CTLM^fiOlc8>)KwOtm2qWHo7JgFj%HP>|(-u^u4t!n$jKG8MAf?o#Ztj#pqak z;;JdpnJacD)jkUy9hl*_cANceMet|r`7J4mX)ioTi7ADHx|1+QwpP=}G)7A~z8n4d zm+-9`43eul8TwOG4`2|%H#=-Y7+iOBrJS9fLW1m^O)M-d0Q#y|&RjNJNNm>;$)aKR z3R1A@R9N*7J(;uH<9h1Vzg&b_&^U`m`Ep=Y)a*+#zJ500gF%PRa4&R3?M)lx zVRr-(jOuX%4uU8^gu5Cw+H@L&zj@pZEg%l8Vm2(UBaI!F^A~lxSmW}2jAr8J=JtBH zAOv~n1Ox9nK5=EY=Mn`3Z3iSD+acm>f+gO&WVEf{H!@ zpbt#|#TXX$31ti5Z2e?2F7m6F#M_H-+YLTH){iyL#LGw}(1z8XZS4AL7+%Eju*9 zjB1mhr)wJ5uP|o!hvVPT6oWYI)EsIVM+l0SXeDTL<$-so4QY11t!gE%K0@3L`>yUs zi(|DFsT4mz5Cs^YsWjZjp!d+E(FFg9NRh>X;e<)Iao&H{baZr#B{AHnfIDAqOhBEK zTdy`r^y{<%X=H+T@B!H$y0ep%*93-R7?OXMvo(xMMXi)-_4 zzN9T%pyH+Slom#pioKHIv)8o6hXMN@O3uYU4m=#bH%TZKGv3Zx5aHS8us%?(EM2e3 z*>g?15g)_MD4osh+;T0-G5N=l^s{uj+8A16=Rb(^XZ-|d>G+G|nBXLg1vqSV1-U_5 zmb}EuWWn-IN2% z=`DKQA86x6&wiz=As6urq`DudBN!YpKiwgd$Cj6u=c{b?z!DG;2y*!GRz*cc^$sc1 zBzSeA#7NTXwSLt~EG-2nSMFw&j7LCv+EAaBSdX~6Hg||a>O3|Q{IVWAzjcAD2@L`2 z^eVU!;5AAB^ELps2O~iICX=e&=LUQU=l_LI064`znBu=y-P=vgSG<|a+Kqs*;yAM0 z-7Towi?2j1GKLKSGBhzU@$h)O-XEi-rF~C;9L6f3fdUDZfEk&Xm{?hF|K6S2?1KQ$ zMsix3H^7&#hf>$jVEF|JB>fwBA!lc2K*Ss%O}MnU$o!wZKVcV_mJ}2eHk%!HCo_2L zH`+%;Q2^^GTagOj;Z09p?v2F%#tcmqOvjOYZxI6W|3)AF4=7AePyb2M6Y}Ac87VAa zXdOZQ5*FliIhuZa^e`|m;9Xi;Qpx;xTNelfu>zd)^Ya<_qx18~yzj?TU;vxp25bsHjW;em*D$AJi5eUxI!{Zhbe#(=I8rixxv&>{_@?kv&s?@61txpuJ=aZzyKm1*7Y1sz*TE91Q<9PT3T9aY7MRk zZ?4x(?@zt^EdMNF=kxu!1&Ec6ZDMMw>)SJX@F8FifCcb5pi~Q`~klUP=4Ypz-$j? zLs5j@Z!exeK!9ivCjF`*F{r3svD46~h{|a5dpKsqLe`f=guO&BnLlwt1;_ogXjN%`? z@zt0D$OysZ%+xXh7(@))e^YiZ(+CWwL0sKvLLlNupmsdEO=T*)GxGtPoG*H(MY;&6 zoBc_aJfv{Iv`uD*Z;v+%WpZAitH`pTIcU%*&5mPp#e{6P*?-LPe^xng;eW3jL{UMK zaeHO%z}{7$u>d&&D%$_7x>H!p`J4Xh>~}gi(D1&~@(~ok1qPZLkO=V3x(&Agz@4Sm z29!Op&+`X4*ESOpGf z(27MsB3)-`da^3!xI+eUjwm>{XN7mhMPxds=!j#usaUc>lO(1&n9vB@V<0RzG1}Ax z*GeBrOF}pmQ4&EYSCq5-;m1&6cmz8911TKkD#X5ht$#otuxAEz7!RQ&E4n ztUR|JKi_+1a=ah5aJ@UP)FEP2v%42eMfta8OoCr>$RO*T>rLw z!=eP5E{oqxrxD;uW>ms#aQA#U7EPHMTXI!kc;*Wi$hfPq?wfVo6^hlSj`F84oDw7k z;@`p6@yKr3gq;PEVIbXH)tu8BctXtDo?5h99Y_n4~?`|NKVD zF^&Q}#}JEO&Z+vjC$&K5ntiRqGsUgIwwZ<^kO2eLe4c5-00sL^74wc^yT>_iJtHNh zZsqusGm8JhC;5Wqg^rIBE#I@#v$EJ%IuB1CWHmK^zb`@k*Ax7-9uKCjPKbVNrVAbFcX2_%V)l+<7z;s#|Eh6?3l76?dPCf6>OB)^&EDzhgP?+jWt+?C+ad znib40%t>`zY|KW3pN@tt3=Ap)$&BSaf*>MUK?iIR&c7MOJBgUc>u?|QJ++ZvVps}y z_#IEH=~p-~H(bKm7KOcQJeAk;)|hZ}1w8DOZOa&(#kGc#S8+2cE>%iaerKIA%5Q3% zX_5M%g8~GJr=h0FMi3mp=ro879xoE?;Z97ViGg#rWn}o#j=(78%me%owuKHprm%Fg zwVVIa5)9*OMaV%8aPx_ov9jnSn=ci5xYKuck# zDS+`y(NObK^bQv5+nUzS=o^-mgZNY0kM~fAX}(B}{3uM4TC`vXag6kAwUjVvxypE@ zcDAQqeciNAa_Cu?MNb9&t9l+C`j>9KpP2+(mN?q~w zu{Ba54;v|PX|-V_$A_l`Pc6S5eoZMeAUfK`q=s zRYPImA^L8>$p7OKnT!3V7Yw$JbpWafRk)c}(5gy5GkI?iF1i8BYF6MmYHy6sJEh^_ z6I`Zh9Jw+|%P93eG>eDHsXWdoLH?q~@ z7^0*S={`e;<*QGUY)>O1NGD1Vw+vn90;NUamn7fr0$xRJPs$5jNrClRMlyp~ z$$+=3h_H$Y_u%^~_zd5cAoD3;D2VEcFX-)y=;s~ciFg`p!$;U=-WsihoM$W9jU@UV zxx+<*%a_7(Z?1F9?$<&=B4ayJs|{lh%~4@6QfluzE2ZIH=>_?ZT&Hmd(~W@yd{RNxEyjFrIc(F(mocM0 zL&PGAMxo*q<3gz#`ePWw$a1CeYJ-lRRnq+rI!K_{V|;mDdT;bcKrAB_zhl}sJ&7Z7 z7!?Zl+0#l=O1oS4`EpfFK`+)s=NEmU2pE6Q{v zaVv^9zg^ZXPXK1Y;;qF>l+poZ|5CP=ld-H2>z~s)d+Drx=sc4HLS&E|=jwU@{t1s5 zKv(IOM*~PG)hbY+7-#+qI=65TXbq~p&iN1yWH{-$qjlzj0qVxxZLa%G4FSyTWnOc$ zp0Eh>kG&!Y^p2!JhY9q4fZS8Jb)3cuI%o@+1B@8xVFA|5%W8!QU}B=e7{*7zW=?() wPAwj;f&#Guy}smZG9Ys8j*kHXjgNz8lWQ(fKeeg@KpIF&OkT87*f8+_0a|FZ1^@s6 literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/subscription4.png b/plugins/frontlinesms-core/web-app/images/help/subscription4.png new file mode 100644 index 0000000000000000000000000000000000000000..1f1917550ce26be6867acb35890a749e3727ed31 GIT binary patch literal 25766 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 z
    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 Date: Fri, 14 Dec 2012 15:06:27 +0300 Subject: [PATCH 0144/2668] Updated migration tester to check if git working dir is clean. --- .../src/main/groovy/MigrationSpec.groovy | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 7284f0688..59b6bce85 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -3,32 +3,47 @@ import groovyx.remote.transport.http.HttpTransport import groovyx.remote.client.RemoteControl class MigrationSpec { - private final String serverPort - private final String serverAddress + static boolean gitWorkingDirectoryMustBeClean = true - MigrationSpec(String serverPort, String serverAddress) { - this.serverPort = serverPort - this.serverAddress = serverAddress - } + String serverPort public static void main(String... args) { - def SERVER_PORT='8080' - def SERVER_ADDRESS="http://localhost:$SERVER_PORT/frontlinesms-core/grails-remote-control" // FIXME check this URL is correct - new MigrationSpec(SERVER_PORT, SERVER_ADDRESS).test() + init() + gitWorkingDirectoryMustBeClean = !('--dirty' in args) + new MigrationSpec(serverPort:8080).test() } - def getRemoteControl = { - def transport = new HttpTransport(serverAddress) - return new RemoteControl(transport) + private String getServerAddress(String contextPath) { + "http://localhost:$SERVER_PORT/$contextPath/grails-remote-control" + } + + private static void init() { + // TODO fail if git working directory not clean + + if(gitWorkingDirectoryMustBeClean && + 'git status --porcelain | grep --quiet "."; echo $?'.execute().text != "0") { + throw new RuntimeException("GIT WORKING DIRECTORY IS NOT CLEAN. TERMINATING.") + } } - // TODO fail if git working directory not clean + private static int execute(String command, String errorMessage=null, boolean throwExceptionOnFailure=true) { + def exitCode = command.execute().exitValue() + if(throwExceptionOnFailure && exitCode) { + throw new RuntimeException(errorMessage?: "Command failed: $command; exit code: $exitCode") + } + return exitCode as Integer + } + + def getRemoteControl = { contextPath -> + def transport = new HttpTransport(getServerAddress(contextPath)) + return new RemoteControl(transport) + } // TEST HELPERS - def withFrontlineSMS = { String version, Closure remoteCode -> + def withFrontlineSMS = { String version, contextPath = 'frontlinesms-core', Closure remoteCode -> println "# Checking out FrontlineSMS version: $version..." - // TODO check out correct code - // TODO if remote-control plugin is not enabled, inject it now with sed + execute("git checkout $version") + execute('grep --silent "remote-control" ../../grails-app/conf/BuildConfig.groovy || sed -E -e "s/plugins\\s*\\{/plugins {\\ncompile \\":remote-control:1.3\\"/"') println "# Starting grails server on port $serverPort..." // TODO start server println "# Running test script with remote control..." From 1b731668522ed080cdbf961b0fe77774a1447658 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:07:55 +0300 Subject: [PATCH 0145/2668] Fixed git working directory check. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 59b6bce85..1d5a27c7c 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -21,7 +21,7 @@ class MigrationSpec { // TODO fail if git working directory not clean if(gitWorkingDirectoryMustBeClean && - 'git status --porcelain | grep --quiet "."; echo $?'.execute().text != "0") { + 'git status --porcelain | grep --quiet "."; echo $?'.execute().text != "1") { throw new RuntimeException("GIT WORKING DIRECTORY IS NOT CLEAN. TERMINATING.") } } From f7d49135384674a8f6409c04cdcbdd36e5f48427 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:15:49 +0300 Subject: [PATCH 0146/2668] CLarified git cleanliness check --- .../migration/src/main/groovy/MigrationSpec.groovy | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 1d5a27c7c..e2e90f0a1 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -20,9 +20,14 @@ class MigrationSpec { private static void init() { // TODO fail if git working directory not clean - if(gitWorkingDirectoryMustBeClean && - 'git status --porcelain | grep --quiet "."; echo $?'.execute().text != "1") { - throw new RuntimeException("GIT WORKING DIRECTORY IS NOT CLEAN. TERMINATING.") + if(gitWorkingDirectoryMustBeClean) { + def porcelainOutput = 'git status --porcelain | grep --quiet "."; echo $?'.execute().text + println "# porcelainOutput=$porcelainOutput" + def clean = porcelainOutput == "1" + println "# Git working directory is clean? $clean" + if(!clean) { + throw new RuntimeException("GIT WORKING DIRECTORY IS NOT CLEAN. TERMINATING.") + } } } From 8dbca396329383487d5781152a5243344e1b0306 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 15:18:30 +0300 Subject: [PATCH 0147/2668] MD cleanup for webconnection help --- .../activities/9.creating_a_web_connection.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt index 7d6cd85fc..41f72b9e6 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt @@ -2,7 +2,7 @@ Web connections are a type of activity that allow you to forward incoming messages to a web service such as Crowdmap, Ushahidi or any other custom HTTP web service. A Web Connection can be global, thereby acting on all incoming messages, or can be set up so that only messages matching one of the configured keywords are forwarded. The specific format of the request that is made to the remote service is entirely configurable, and presets for Ushahidi and Crowdmap are included. In addition to the upload functionality, you can expose an API which allows the remote service to trigger outbound SMS via a HTTP request. -### How to Create a Web Connection +## How to Create a Web Connection From the [messages tab][1] click on 'Create New Activity'. @@ -16,29 +16,29 @@ In the first step you will be prompted to choose between a Crowdmap/Ushahidi Web When you have selected the appopriate connection type, click next. -**Configuring Crowdmap/Ushahidi** +## Configuring Crowdmap/Ushahidi ![Configuring Ushahidi][7] If you selected Ushahidi/Crowdmap, you will be prompted to enter details about your Crowdmap or Ushahidi deployment. This requires an active Crowdmap/Ushahidi deployment with the FrontlineSMS plugin installed. If you are connecting to Ushahidi, you will need to enter the complete URL, starting with http:// or https://. For Crowdmap, you only need to enter the subdomain name, e.g. for 'https://frontline.crowdmap.com', you only need to enter 'frontline' as the deployment address. In both cases, you will also need to provide your API key, which can be found on the Ushahidi FrontlineSMS plugin settings page. -**Configuring a Connection to another service** +## Configuring a Connection to another service ![Configuring Generic Web Connection][8] If you selected 'Other Web Service', you will be prompted to enter the URL for the web service you want to connect to, and the HTTP request type (either GET or POST). In addition, you can customise the parameters that will be passed with each request. The appropriate settings will vary according to the API of the service you are connecting to. -**Enabling the FrontlineSMS API** +## Enabling the FrontlineSMS API ![Configuring API][9] For 'Other Web Service' Web Connections, you can enable the FrontlineSMS API, which allows your external web service to trigger outgoing SMS by invoking an HTTP request on your FrontlineSMS instance. All messages sent through the API will be saved in the Web Connection activity. See the [Api Documentation][2] for more information. -**Automatic Sorting** +## Automatic Sorting ![Auto sorting][10] On the next tab, you can configure FrontlineSMS to automatically move messages into your Web Connection and trigger the HTTP request. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by spaces. With this setting, any incoming message that starts with one of those keywords will trigger the Web Connection. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Web Connection, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Web Connection's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. When you have finished setting up your automatic sorting options, click next. -**Confirm Screen** +## Confirm Screen On this screen you will find a summary of all the options you have selected, so you can confirm that you entered the correct settings before creating the activity. You will also be prompted to give a name to your Web Connection to make it easily recognisable from the list of activities on the messages tab. @@ -46,7 +46,7 @@ On this screen you will find a summary of all the options you have selected, so Clicking Create will save the activity. -**_Confirmation_** +## Summary Once successfully created, you will see a confirmation screen. This means that your Web Connection has successfully been saved and will now work on incoming messages according to your automatic sorting rules. If there were any errors when saving the activity, a yellow error message will prompt you about the changes required. This will usually be because you have reused a keyword that another activity is using, or given the Web Connection the same name as an existing activity. Once you correct any of these issues, click 'Create' again to save the Web Connection. @@ -56,7 +56,7 @@ Clicking OK will take you back to the [Messages Tab][1] Your Web Connection will appear under the Activities sub-heading. -### Related Actions +## Related Actions [Creating a Poll][3] [Creating a Group][4] [Creating a Smart Group][5] From 3533f1ca34afb943aeb8e46d03ba6cdc6c46eb55 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:29:49 +0300 Subject: [PATCH 0148/2668] Made execution of commandline stuff intuitive. --- .../migration/src/main/groovy/MigrationSpec.groovy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index e2e90f0a1..f0914437b 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -21,9 +21,9 @@ class MigrationSpec { // TODO fail if git working directory not clean if(gitWorkingDirectoryMustBeClean) { - def porcelainOutput = 'git status --porcelain | grep --quiet "."; echo $?'.execute().text + def porcelainOutput = simpleExecute('git status --porcelain | /usr/bin/env grep --quiet "."') println "# porcelainOutput=$porcelainOutput" - def clean = porcelainOutput == "1" + def clean = porcelainOutput == 1 println "# Git working directory is clean? $clean" if(!clean) { throw new RuntimeException("GIT WORKING DIRECTORY IS NOT CLEAN. TERMINATING.") @@ -31,8 +31,12 @@ class MigrationSpec { } } + private static int simpleExecute(String command) { + return ['bash', '-c', command].execute().waitFor() + } + private static int execute(String command, String errorMessage=null, boolean throwExceptionOnFailure=true) { - def exitCode = command.execute().exitValue() + def exitCode = simpleExecute(command) if(throwExceptionOnFailure && exitCode) { throw new RuntimeException(errorMessage?: "Command failed: $command; exit code: $exitCode") } From a50087d598e8867a19269ac66448fd69df37ba3c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:34:16 +0300 Subject: [PATCH 0149/2668] Fixed checkout of tagged version. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index f0914437b..555fb3250 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -50,8 +50,10 @@ class MigrationSpec { // TEST HELPERS def withFrontlineSMS = { String version, contextPath = 'frontlinesms-core', Closure remoteCode -> + def gitTag = (version ==~ /\d+(\.\d+)*/)? "frontlinesms$version": version + println "# Checking out FrontlineSMS version: $version..." - execute("git checkout $version") + execute("git checkout $gitTag") execute('grep --silent "remote-control" ../../grails-app/conf/BuildConfig.groovy || sed -E -e "s/plugins\\s*\\{/plugins {\\ncompile \\":remote-control:1.3\\"/"') println "# Starting grails server on port $serverPort..." // TODO start server From 72b722717a199bf8be6ccf1e675f146a40359a0a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 15:42:05 +0300 Subject: [PATCH 0150/2668] BasicAuth help files --- .../grails-app/views/help/_index.gsp | 2 ++ .../1.getting_around_the_settings_menu.txt | 3 ++- .../web-app/help/core/settings/8.basic_auth.txt | 15 +++++++++++++++ .../web-app/images/help/settings_basicauth.png | Bin 0 -> 11275 bytes 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/web-app/help/core/settings/8.basic_auth.txt create mode 100644 plugins/frontlinesms-core/web-app/images/help/settings_basicauth.png diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index 72f2682d3..50331b4cf 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -74,6 +74,7 @@ * ### Settings * [How do I change the Language?][91] * [How do I import Messages and Contacts?][92] + * [How do I password-protect my FrontlineSMS installation?][103] * [How do I use my modem/phone with FrontlineSMS?][94] * [How do I set up an IntelliSMS account?][95] * [How do I set up a Clickatell account?][96] @@ -144,4 +145,5 @@ [100]: core/activities/8.creating_an_autoforward [101]: core/activities/9.creating_a_subscription [102]: core/activities/9.creating_a_web_connection +[103]: core/settings/8.basic_auth diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/1.getting_around_the_settings_menu.txt b/plugins/frontlinesms-core/web-app/help/core/settings/1.getting_around_the_settings_menu.txt index 7145926de..48c997b04 100644 --- a/plugins/frontlinesms-core/web-app/help/core/settings/1.getting_around_the_settings_menu.txt +++ b/plugins/frontlinesms-core/web-app/help/core/settings/1.getting_around_the_settings_menu.txt @@ -1,6 +1,6 @@ # Getting Around the Settings Menu -The settings menu is where you can [configure the language][1] that FrontlineSMS runs in, [restore a backup][2] and [configure the connections to your detected devices][3]. You can get to the settings menu by clicking on "Settings" in the top right of your screen, next to "Help". +The settings menu is where you can [configure the language][1] that FrontlineSMS runs in, [restore a backup][2], [configure the connections to your detected devices][3] and [enable password protection][7]. You can get to the settings menu by clicking on "Settings" in the top right of your screen, next to "Help". ![Settings Menu][6] @@ -17,4 +17,5 @@ There are 3 sections in the settings area. Please select one to see more informa [3]: core/settings/2.changing_languages [4]: core/settings/2.changing_languages [5]: core/settings/2.changing_languages +[7]: core/settings/8.basic_auth [6]: ../images/help/settings_menu.png diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/8.basic_auth.txt b/plugins/frontlinesms-core/web-app/help/core/settings/8.basic_auth.txt new file mode 100644 index 000000000..3e8cf75ae --- /dev/null +++ b/plugins/frontlinesms-core/web-app/help/core/settings/8.basic_auth.txt @@ -0,0 +1,15 @@ +# Basic Authentication (password protection) + +FrontlineSMS lets you protect your data by setting a global password. Users will need to enter this password whenever they access FrontlineSMS. + +![Basic auth][1] + +## Enabling basic Authentication + +Navigate to the General Settings menu, and scroll down to the Basic Authentication section and check the 'Enable Basic Authentication' checkbox. You will be prompted to enter a username and password. Once this is done, click Save. Your browser window will immediately prompt you to log in, and will continue to do this whenever you return to FrontlineSMS. + +## Disabling basic Authentication + +To switch this feature off, you first need to be signed in to your FrontlineSMS instance using the password that was previously set up. Navigate to General Settings and uncheck the 'Enable Basic Authentication' checkbox and click save. Once this is done, you will no longer need to enter a password to use FrontlineSMS + +[1]: ../images/help/settings_basicauth.png diff --git a/plugins/frontlinesms-core/web-app/images/help/settings_basicauth.png b/plugins/frontlinesms-core/web-app/images/help/settings_basicauth.png new file mode 100644 index 0000000000000000000000000000000000000000..63b7682862d39da65d4d25e8e29827dc38af66fe GIT binary patch literal 11275 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 literal 0 HcmV?d00001 From 197db07fb736a01133556ccca2ece4bc570da44f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:46:13 +0300 Subject: [PATCH 0151/2668] Added new debug; added new sed for inserting remote-control plugin. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 555fb3250..4bf4a15a5 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -32,6 +32,7 @@ class MigrationSpec { } private static int simpleExecute(String command) { + println "# Executing command: $command" return ['bash', '-c', command].execute().waitFor() } @@ -54,6 +55,7 @@ class MigrationSpec { println "# Checking out FrontlineSMS version: $version..." execute("git checkout $gitTag") + execute(/sed -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" ../../../$contextPath/grails-app/conf/BuildConfig.groovy/) execute('grep --silent "remote-control" ../../grails-app/conf/BuildConfig.groovy || sed -E -e "s/plugins\\s*\\{/plugins {\\ncompile \\":remote-control:1.3\\"/"') println "# Starting grails server on port $serverPort..." // TODO start server From d6373d0653f4154d691aa1514423d664497f448b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:48:02 +0300 Subject: [PATCH 0152/2668] Fixed syntax of sed in MigrationSpec --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 4bf4a15a5..042301dc7 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -55,7 +55,7 @@ class MigrationSpec { println "# Checking out FrontlineSMS version: $version..." execute("git checkout $gitTag") - execute(/sed -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" ../../../$contextPath/grails-app/conf/BuildConfig.groovy/) + execute(/sed -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "../../../$contextPath/grails-app/conf/BuildConfig.groovy") execute('grep --silent "remote-control" ../../grails-app/conf/BuildConfig.groovy || sed -E -e "s/plugins\\s*\\{/plugins {\\ncompile \\":remote-control:1.3\\"/"') println "# Starting grails server on port $serverPort..." // TODO start server From fb9e602e0d78610384c3375a531a3219714b4eed Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 15:49:26 +0300 Subject: [PATCH 0153/2668] Fixed contextPath of 2.1.3 in MigrationSpec --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 042301dc7..446970327 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -81,7 +81,7 @@ class MigrationSpec { } def test() { - withFrontlineSMS('2.1.3') { + withFrontlineSMS('2.1.3', 'core') { new ClickatellFconnection(name:"Test Clickatell connection", apiId: "doesntmatter", username:"testuser", password:"testpass").save(failOnError:true) def keyword = new Keyword(value: 'FOOTBALL') def poll1 = new Poll(name: 'Football Teams', question:"Who will win?", sentMessageText:"Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'", autoreplyText:'Thank you, ${contact_name}, for participating in the football poll', keyword: keyword) From 103a46e464da96034cc6b21dd35951cf5cecda2c Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 15:52:03 +0300 Subject: [PATCH 0154/2668] Filtering help --- .../help/core/messages/4.filtering_messages.txt | 9 ++++++--- .../web-app/images/help/filtering2.png | Bin 0 -> 2081 bytes 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/help/filtering2.png diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/4.filtering_messages.txt b/plugins/frontlinesms-core/web-app/help/core/messages/4.filtering_messages.txt index 0b1d5a99a..682ba10ff 100644 --- a/plugins/frontlinesms-core/web-app/help/core/messages/4.filtering_messages.txt +++ b/plugins/frontlinesms-core/web-app/help/core/messages/4.filtering_messages.txt @@ -6,12 +6,14 @@ When viewing a message list anywhere in the program, you can search within that ![Filtering Messages][6] -1. At the bottom of the message list (1) you will see the above option to show All or [Starred][1]. -2. Clicking on [starred][1] will cause only starred messages to appear in the message list. -3. Clicking on All will cause all messages to be displayed. +At the bottom of the message list (1) you will see the above option to show All or [Starred][1]. Clicking on [starred][1] will cause only starred messages to appear in the message list. Clicking on All will cause all messages to be displayed. _**Note**: Navigating away from this list will cause the message list to revert to its default state of showing All messages._ +When in an activity or folder, there will be more filtering options present, allowing you to view only incoming or outgoing messages. + +![Filtering Messages][7] + ### Related Actions: [How to Mark Important Messages][1] [How to Use the Search Tab][4] @@ -20,3 +22,4 @@ _**Note**: Navigating away from this list will cause the message list to revert [4]: core/search/1.getting_around_the_search_tab [5]: core/messages/8.mrfd [6]: ../images/help/filtering_messages.png +[7]: ../images/help/filtering2.png diff --git a/plugins/frontlinesms-core/web-app/images/help/filtering2.png b/plugins/frontlinesms-core/web-app/images/help/filtering2.png new file mode 100644 index 0000000000000000000000000000000000000000..761d764fdb8dbb155460d79fb25edca7ebcc9ac9 GIT binary patch literal 2081 zcmV++2;TRJP)4?5bFGqO!SVBi3|xV`VrzTI`|Fx_ByETc#?AR_1gq*VR=$VZkY00jx6Ly=)>5G85gGygBo$!WpF zeHYBxbd_?>*Xg3SjVAvGJOB`UQI)Z*xiZ?6&`|5g7$Kj9SJL;wL=?@Ch4_nokL`i8 z<2t2+EwqiBvR*;E05$BR-J!@w6vpgVt7e@+*k9(y(`%nZ24gptct@{hq1ul;iLGK4 z$6+AqA5x{(Wj-LdRGG@|3|pmgWzwniR;rAPfWeL6Aig4pAcZc~R8A8jNMT&%6K*8O z@dn==w*lXZ6vKE%yq7m`?0?#PAShiPht+r8=VI4%kW)&-aM{0m&#v&WT~l}7#ICzt z^Ki9=4)ayIdfOgt?=fGks}3{ku!2u5Q^Utq8pDS-ZKm5tfXRPmB)U)R@yzr5$Mr^u zOnyszhlPpu*4A0nBMXwkU_F#U5XXV%bNw;KUXXVlQC2&+trD^8jBHJ&XQF@{eD@bQ zJW(83^n{7ih{2v%s1em2r^L*?ixF2N3(g#74y}C@CGzr@YlE045tlF%wUb1s44%Hp zHV95zY()^2J)<&aLjN39o4}j0ex2Iae;#+xdvO`A^GZTv&DNVX-9dLfh8XOx=N(ps z`=;y8hc}EWz{Elz9|)agX~dPu-i9uJXgjp*f_B#ruzHMORzstD7pMi~PJ# z>0;YJwV+G@3@YzlKgohKtzZZc=21gmNy9G1BfC>uc5plsT zlC`5BT)XfISA%J%*N&GUO){Tpg^%;_OjZ$()a|ori8bw@T04QKe#80&YV)68yq7U( z+gKdNKT0bJYEY6P_7ZtXTvB*(7kP;?gvRZln1X!EIaBI(u)CDnncu+FcPoj^IkULSZf7l?z)5q`ALqdOF zGp)V*_`!=$((skZ#GU+awLez0cZGLtFc1g@0IqGL{~`y*a3FB`di3j7Y3pfp;r@b# z-?yIbLW_oeWS%YMOaQrwa441qfI_k9pl8@GAI_I-DI%-M&UaJi>ua%`ZaCiu>Ca|9 zHW6!A(w2KqS;3>*Q#h3L;iubwpAMPFV&Zphb1IZjH*`{kW|B`OV%%Z>6*;MU{-DE8a8 zG|wN7WflNMH|lTdou5JHl451AgFawyQ!osVGj`g z>lu;I66L8WRaFivGew(^%#vckq$y5wBWH;MdJaFLD&~geHfe;yVex>D&3$?F?9Sx?e6Uwq2avg`5=j6+L_NJ^E)~sLoxMTXfnTV+ zZ$vp$UHcFp3&DdZde+wZGOm*U|icw~(FVlo0ikd#Fd8>4%pq!i+< z_IB-4{iI$*Io;ZKwO;bAT{|{m7zUy+?1j8R7V;D+)1}M?-oTwocPU*(jo{#lM=FmH zOiVzikRgPC_`gPQm0t0hg04bkrga6Vd zpL} Date: Fri, 14 Dec 2012 15:53:35 +0300 Subject: [PATCH 0155/2668] edited help for subscription and autoreply --- .../core/activities/3.creating_a_poll.txt | 84 +++++++++++++++---- .../activities/9.creating_a_subscription.txt | 47 ++++++----- .../web-app/trial help/poll_keywords.txt | 50 ----------- 3 files changed, 91 insertions(+), 90 deletions(-) delete mode 100644 plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index 2384999c8..4b4f33122 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -1,29 +1,30 @@ # Creating a Poll -A poll is a type of activity which allows you to see a graphical representation of the responses to a question. When creating a poll you will be able to enter the question and select who to send the question to. You will also be able to set up a **keyword**. A **keyword** allows FrontlineSMS to recognise which incoming messages are for polls and which aren't. It will also help the system determine which poll the message belongs to. This gives you the option to let FrontlineSMS automatically sort incoming messages into polls and you will be notified when this has happened. There are two types of responses you can set: Yes/No or a Multiple Choice style answer. You can also set up an **automatic reply** that is sent to every message received for that poll. This makes polls useful for contexts where you want to see the response to a particular issue or question._ -### How to Create a Poll +A poll is a type of activity which allows you to see a graphical representation of the responses to a question. When creating a poll you will be able to enter the question and select who to send the question to. You will also be able to set up a **keyword**. A **keyword** allows FrontlineSMS to recognise which incoming messages are for polls and which aren't. It will also help the system determine which poll the message belongs to. This gives you the option to let FrontlineSMS automatically sort incoming messages into polls and you will be notified when this has happened. There are two types of responses you can set: Yes/No or a Multiple Choice style answer. You can also set up an **automatic reply** that is sent to every message received for that poll. This makes polls useful for contexts where you want to see the response to a particular issue or question. + +## How to Create a Poll 1. From the messages tab click on 'Create New Activity'. 2. A new window will appear and you will be presented with a number of options. Choose "Poll" and click next ![Activity Select][8] -**_Enter Question_** +### Enter Question After clicking next, you will be prompted to select a question type and enter a question: ![Enter Question][9] -**Question Type:** +#### Question Type: Yes or No: Select this if your question has a Yes or No answer. For example, the question "Do you like the colour Red?", could have a Yes or No Answer. Multiple Choice Question: Select this if your question has a number of different answers. For example, with the question "Do you like the colour Red?", you could get more detailed responses by having a range of answers such as, "Yes", "Quite a lot", "Not a lot" or "No". If you select this option you will have the opportunity to input the possible responses in the following screens. -**Enter Question:** +#### Enter Question: Here you will find an area for you to enter your question. You can re-size the text entry box by clicking and dragging the bottom right hand corner of it. If you simply want to collect responses and not send out a question then check the "Do not send a message for this poll (Collect responses only)" box. This might be useful when you have already distributed the question, for example over the radio or at a meeting. -**_Response List_** +### Response List If you selected the "Multiple Choice Question" then the next screen you see will allow you to specify the possible responses to the question. You can enter a maximum of 5 and a must enter a minimum of 2. ![Response List][10] @@ -32,37 +33,77 @@ Boxes A-C will be immediately available to you to edit. If you need more than 3 Once you have entered all your choices, click next to set up Automatic Sorting. -**_Automatic Sorting_** +### Automatic Sorting You will be able to specify a keyword, that when included in an incoming message, will allow the system to automatically sort it into the relevant Poll. ![Automatic Sorting][11] -_**Note:** Keywords are **unique.** Once a keyword has been set, it cannot be used in a new activity even if the original activity has been archived. To re-use a keyword you have to delete the activity that keyword is associated with._ +_**Note:** Top Level Keywords are **unique.** Once a top level keyword has been used in an activity it cannot be used in another activity, unless that activity is archived or deleted. For a poll, if the top level keyword is not provided the keywords for the responses become top level keywords, and hence forth they have to be unique across all the activity top level keywords. + +To set the keywords, select "Sort responses automatically. Sort messages with the keyword (optional):" and then enter your top level keywords. The top level keywords are optional. + +When you set a keyword, and have selected a Multiple Choice Poll type, it will be possible for you to set "Response Keywords" in the lower section of the same tab. These "Response keywords are the keywords that matched to the responses entered in the previous tab." + +#### Note + +Poll initially supported use of "Aliases". A user would setup a poll with with one keyword and the responses would be mapped to aliases. A response could have one or more aliases seperated with commas. + +For example, in version 2.1.3, a poll would look like this + + Poll Name : Football Poll + Keyword : Football + + Responses | Aliases + Manchester United | Manu, Manchster + Arsenal | Arsenal, Ars + +With version 2.2 as a user you can create a poll with a top level keyword and the aliases are now converted to second level keywords. -To set a keyword, select "Sort messages automatically that have the following Keyword:" and then enter your keyword. +In version 2.2.0 Polls would look like this -When you set a keyword, and have selected a Multiple Choice Poll type, it will be possible for you to set "Aliases" in the next step. + Poll Name: Footbal Poll + TopLevel Keyword : Football, Foot, Footy -Click 'next' to set Aliases if you have chosen a keyword, or the set up and Automatic Reply if you haven't. + Responses | Second Level Keywords + Manchester United | Manu, Manchster + Arsenal | Arsenal, Ars, Arnl -**_Aliases_** +As you can see from above the aliases have been replaced with second level keywords. The top level keyword is optional. +If a top level keyword is provided messages will be mapped to resposes as follows -Aliases are alternate ways of spelling and/or writing the choices you entered in the "Response List". + Incoming Message | Response Mapped To + football manu | Mancheter United + foot manu | Mancheter United + footy manu | Mancheter United + football arsenal | Arsenal + football ars | Arsenal + footy arsenal | Arsenal + foot arsl | Arsenal -_This step is only available if you have selected a keyword in the previous step. If you have not, then please go to the next step._ +If the top level keyword is not provided, then the incoming messages will be mapped to responses as follows -For example, if one of the choices was "Yes", you can enter alternative ways of spelling the word like "Yeah" or "Yeh". This could help in increasing the accuracy of your Poll results and reducing the amount of work you may have to do in correcting and manually categorising incorrectly spelt choices. +Incoming Message | Response Mapped To +manu | Mancheter United +manchester | Mancheter United +arsenal | Arsenal +ars | Arsenal -The alias screen looks like this: +The person texting in only needs to test in at least one of the second level keywords. + +This feature is quite usefull if you want frontlinesms to handle spelling mistakes in the incoming sms. For example, for the top level keyword one can have the keywords "football, footbal, fotball". This spelling handling also applies to second level keywords + + +The Sorting tab looks as follows ![Aliases][17] Each choice is followed by an area where you can enter text. You will see two aliases already entered into the text area. These are the default settings. -You can add more aliases simple by adding to the string of text already in the text area. Separate each alias with a comma. An example would be: +You can add more aliases simple by adding to the string of text already in the text area. Separate each response keyword with a comma. An example would be: "Yes, A, yeah, yeh" + Furthermore, the first entry in the text area corresponds to the text that will be used when generating a message in the "Edit Message" step. To change how each choice appears in the message that will be send out, change the first entry in the text area. If the text area looks like this for example: @@ -73,6 +114,15 @@ Then "Yeah" will be used as part of the outgoing message text for the Poll. Once you have completed this section click "Next" to set up an "Automatic Reply". +### Validation of Keywords (Important) + +All keywords, toplevel or second level keywords need to be unique within that poll. For example ,a Football poll could have "football" as a top level keyword but not as a second level keyword. Likewise keywords among the second level keywords need to be unique among themselves. +In any poll if the top level keyword is not provided, then the second level keywords will be treated as top level. + +### Important: + +Top level keywords need to be unique across all activities. A poll and an autoreply cannot share a top level keywords. For more information regarding keywords in autoreplies see the autoreply section. + **_Automatic Reply_** At this screen you can choose to enter a message that will be automatically sent to the senders of messages identified as poll responses. This can only be selected if you have chosen to use a keyword with your poll. Without a keyword the system cannot recognise which messages to automatically reply to. The automatic reply option will be unavailable until you create a keyword for your poll. diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt index 2ddf4e2df..449c2074c 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt @@ -8,14 +8,14 @@ A new window will appear and you will be presented with a number of options. Cho ![Select Activity][7] -**Select a Group** +#### Select a Group You can select the group that contacts will join or leave. ![Select A Group][8] When you have selected the desired group click next. -**Automatic Sorting** +#### Automatic Sorting ![Automatic Sorting][9] On this tab you will be able to determine if messages will be sorted into the subscription or not. To disable automatic sorting of message into the subscription, please check the 'Disable automatic sorting' checkbox in the Automatic Sorting section. @@ -31,36 +31,37 @@ A subscription allows a default action to be triggered if a message matched a to Take for example a subscription where sorting is enabled and keywords look as follows. -Top level keywords : 'team, tim, tom' -Join Keywords : 'join, in, inthere' -Leave Ketwords : 'leave, out, ouththere' -Default Action : Add Contact to the Group + Top level keywords : 'team, tim, tom' + Join Keywords : 'join, in, inthere' + Leave Ketwords : 'leave, out, ouththere' + Default Action : Add Contact to the Group The incoming message will be mapped to actions as illustrated below -Incoming Message | Action Triggered -team join | Joined Group -team in | Joined Group -team inthere | Joined Group -tim join | Joined Group -tim in | Joined Group -tim inthere | Joined Group -team leave | Joined Group -team out | Joined Group -team outhere | Joined Group -team | Default Action -tim | Default Action -tom | Default Action - - -**_Send Autoreplies_** + + Incoming Message | Action Triggered + team join | Joined Group + team in | Joined Group + team inthere | Joined Group + tim join | Joined Group + tim in | Joined Group + tim inthere | Joined Group + team leave | Joined Group + team out | Joined Group + team outhere | Joined Group + team | Default Action + tim | Default Action + tom | Default Action + + +#### Send Autoreplies ![Autoreplies][11] On this tab you can setup the autoreplies that will be sent to the contact after they have joined or left a group. You can setup seperate messages, one that is sent when a contact joins the group and one that is sent when a contact leaves the group. Setting up this messages is optional. -**_Confirm Screen_** +#### Confirm Screen ![Confirm Screen][12] On this screen you will find a summary of all the options you have selected, so you can confirm that what you have created is what you would like to send. diff --git a/plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt b/plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt deleted file mode 100644 index 6b20a1ce4..000000000 --- a/plugins/frontlinesms-core/web-app/trial help/poll_keywords.txt +++ /dev/null @@ -1,50 +0,0 @@ -Poll initially supported use of aliases. A user would setup a poll with with one keyword and the responses would be mapped to aliases.A response could have one or more aliases seperated with commas. -For example, in version 2.1.3, a poll would look like this - -Poll Name : Football Poll -Keyword : Football - -Responses | Aliases -Manchester United | Manu, Manchster -Arsenal | Arsenal, Ars - -With version 2.2 as a user you can create a poll with a top level keyword and the aliases are now converted to second level keywords. - -In version 2.2.0 Polls would look like this - -Poll Name: Footbal Poll -TopLevel Keyword : Football, Foot, Footy - -Responses | Second Level Keywords -Manchester United | Manu, Manchster -Arsenal | Arsenal, Ars, Arnl - -AS you can see from above the aliases have been replaced with second level keywords. The top level keyword is optional. -If a top level keyword is provided messages will be mapped to resposes as follows - -Incoming Message | Response Mapped To -football manu | Mancheter United -foot manu | Mancheter United -footy manu | Mancheter United -football arsenal | Arsenal -football ars | Arsenal -footy arsenal | Arsenal -foot arsl | Arsenal - -If the top level keyword is not provided, then the incoming messages will be mapped to resposes as follows - -Incoming Message | Response Mapped To -manu | Mancheter United -manchester | Mancheter United -arsenal | Arsenal -ars | Arsenal - -The person texting in only needs to test in at least one of the second level keywords. - -This feature is quite usefull if you want frontlinesms to handle spelling mistakes. For example, for the top level keyword one can have rthe keywords football, footbal, fotball. This spelling handling also applies to second level keywords - -Validation of keywords -All keywords, toplevel or second level keywords need to be unique within that activity. Therefore, the Football poll described above have football as a top level keyword and also as a second level keyword. Likewise keywords among the second level keywords need to be unique among themselves. -In any poll if the top level keyword is not provided, then the second level keywords will be treated as top level. -### Important : Top level keywords need to be unique across all activities. A poll and an autoreply cannot share a top level keywords. For more information regarding keywords in autoreplies see the autoreply section. - From 812e5c81e008f059b8fc87cb5ad48f344a51db41 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:00:09 +0300 Subject: [PATCH 0156/2668] Added starting and stopping of grails server to migration test. --- .../src/main/groovy/MigrationSpec.groovy | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 446970327..884dcd560 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -31,9 +31,13 @@ class MigrationSpec { } } - private static int simpleExecute(String command) { + private static Process executeInBackground(String command) { println "# Executing command: $command" - return ['bash', '-c', command].execute().waitFor() + return ['bash', '-c', command].execute() + } + + private static int simpleExecute(String command) { + return executeInBackground(command).waitFor() } private static int execute(String command, String errorMessage=null, boolean throwExceptionOnFailure=true) { @@ -55,18 +59,30 @@ class MigrationSpec { println "# Checking out FrontlineSMS version: $version..." execute("git checkout $gitTag") - execute(/sed -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "../../../$contextPath/grails-app/conf/BuildConfig.groovy") - execute('grep --silent "remote-control" ../../grails-app/conf/BuildConfig.groovy || sed -E -e "s/plugins\\s*\\{/plugins {\\ncompile \\":remote-control:1.3\\"/"') + execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "../../../$contextPath/grails-app/conf/BuildConfig.groovy") + println "# Starting grails server on port $serverPort..." - // TODO start server + def grailsServer = executeInBackground "cd ../../../$contextPath && grails -Dserver.port=$serverPort test run-app" + println "# Waiting for grails server to start..." + try { + grailsServer.outputStream.eachLine { line -> + println "# [grails] $line" + if(line.trim().startsWith('| Server running. Browse to ')) { + throw new EOFException('Server started successfully.') + } + } + } catch(EOFException _) {} + println "# Running test script with remote control..." - // TODO run test script on remote server def remoteControl = getRemoteControl() - remoteControl.exec(remoteCode) + def testOutput = remoteControl.exec(remoteCode) + println "# Killing remote server" - // TODO kill remote server + grailsServer.destroy() + println "# Checking test response code..." - // TODO check response code and exit on failure + println "# Test output: $testOutput" + // TODO handle errors and finally cleanup } def withCurrentFrontlineSMS = { Closure remoteCode -> From d2b8106a55d2abd7e1525026d1639b6dfea0ea21 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 14 Dec 2012 16:00:45 +0300 Subject: [PATCH 0157/2668] edited autoreply help files --- .../activities/5.creating_an_auto-reply.txt | 19 +++++++------------ .../9.creating_a_web_connection.txt | 2 +- .../web-app/trial help/autoreply_keywords.txt | 6 ------ 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/5.creating_an_auto-reply.txt b/plugins/frontlinesms-core/web-app/help/core/activities/5.creating_an_auto-reply.txt index 43ff00ccf..56e3bd997 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/5.creating_an_auto-reply.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/5.creating_an_auto-reply.txt @@ -8,21 +8,16 @@ An auto reply is a type of activity which allows you to set up FrontlineSMS to a 2. A new window will appear and you will be presented with a number of options. Choose "AutoReply" and click next. ![Select Activity][9] -**_Enter Keyword_** +## Automatic Sorting +![Auto sorting][10] -![Keyword][10] +On the next tab, you can configure FrontlineSMS to automatically move messages into your Autoreply and trigger the HTTP request. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by commas. With this setting, any incoming message that starts with one of those keywords will trigger the Web Connection. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Web Connection, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Web Connection's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. -In this step you can choose to enter a keyword to trigger the autoreply. If you would like to set up an auto reply that will be triggered by a keyword then enter unique keyword here. -Messages that trigger the autoreply will be moved into the activity's folder along with a copy of the autoreply. +#### Note +Likewise the multiple keywords can be used to handle spelling mistakes that user can make when testing in to FrontlineSMS. +An autoreply can have the keywords "food,special,meal,today" as the top level keywords and these individual keywords need to be unique across all activities. Once the autoreply is saved then, another activity cannot use food,meal,special or today as part of the that activities top level keywords. -**Global autoreply** - -To set up a global autoreply please check the box next to "Do not use keyword". -All messages that are received after the autoreply is created will be copied into the activity's folder. The [inbox][2] will still contain all your received messages. - -**_Note:** A global autoreply will reply to **ALL** received messages. If you receive a large volume of messages in daily use, a global autoreply could result in substantial costs on top of your typical usage._ - -When you have finished setting up a keyword, or have chosen a global autoreply, click next. +When you have finished setting up your automatic sorting options, click next. **_Enter Message_** diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt index 41f72b9e6..72cbd4ce9 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt @@ -34,7 +34,7 @@ For 'Other Web Service' Web Connections, you can enable the FrontlineSMS API, wh ## Automatic Sorting ![Auto sorting][10] -On the next tab, you can configure FrontlineSMS to automatically move messages into your Web Connection and trigger the HTTP request. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by spaces. With this setting, any incoming message that starts with one of those keywords will trigger the Web Connection. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Web Connection, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Web Connection's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. +On the next tab, you can configure FrontlineSMS to automatically move messages into your Web Connection and trigger the HTTP request. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by commas. With this setting, any incoming message that starts with one of those keywords will trigger the Web Connection. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Web Connection, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Web Connection's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. When you have finished setting up your automatic sorting options, click next. diff --git a/plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt b/plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt deleted file mode 100644 index d36580827..000000000 --- a/plugins/frontlinesms-core/web-app/trial help/autoreply_keywords.txt +++ /dev/null @@ -1,6 +0,0 @@ -Autoreplies in verison 2.2.0 have also undergone changes since version 2.1.3. In version 2.1.3 Autoreplies allowed users to only use one keyword, but with version 2.2.0 Autoreplies can have multiple keywords stored as comma seperated values. -For example, in version 2.1.3, an Food auroreply would reply with a message of the special meal served at the restaurant for tha day if the user texted in 'food'. -But now in version 2.2.0 that autoreply can be setup with keywords "food,special,meal,today". The user can text in meal or food or special or today and they will still get the message containing the special served at the restaurant. - -Likewise the multiple keywords can be used to handle spelling mistakes that user can make when testing in. -In autoreplies, the keywords "food,special,meal,today" are the top level keywords and the individually need to be unique across all activities. Once the autoreply is saved then, another activity cannot use food,meal,special,today as part of the that activities top level keywords. From 621b5c6e486ce6d9570273eba01b6d2c082c8d76 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:03:05 +0300 Subject: [PATCH 0158/2668] Corrected use of process's stream --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 884dcd560..40a029fcf 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -65,7 +65,7 @@ class MigrationSpec { def grailsServer = executeInBackground "cd ../../../$contextPath && grails -Dserver.port=$serverPort test run-app" println "# Waiting for grails server to start..." try { - grailsServer.outputStream.eachLine { line -> + grailsServer.inputStream.eachLine { line -> println "# [grails] $line" if(line.trim().startsWith('| Server running. Browse to ')) { throw new EOFException('Server started successfully.') From b76ae876809f756beefd167ac50b48c5d91a375d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:20:31 +0300 Subject: [PATCH 0159/2668] Fixed serverPort reference. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 40a029fcf..f2abddd84 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -14,7 +14,7 @@ class MigrationSpec { } private String getServerAddress(String contextPath) { - "http://localhost:$SERVER_PORT/$contextPath/grails-remote-control" + "http://localhost:$serverPort/$contextPath/grails-remote-control" } private static void init() { From 81956dc03015f78b04f81989d4a73f96fae7d771 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 14 Dec 2012 16:20:42 +0300 Subject: [PATCH 0160/2668] new pics for help files --- .../core/activities/3.creating_a_poll.txt | 8 ++++---- .../images/help/add_new_connection.png | Bin 25648 -> 31079 bytes .../web-app/images/help/autoreply2.png | Bin 28074 -> 33149 bytes .../web-app/images/help/clickatell.png | Bin 23886 -> 22145 bytes .../web-app/images/help/pollkeywords.png | Bin 0 -> 34745 bytes 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/help/pollkeywords.png diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index 4b4f33122..a050f8a8b 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -36,7 +36,7 @@ Once you have entered all your choices, click next to set up Automatic Sorting. ### Automatic Sorting You will be able to specify a keyword, that when included in an incoming message, will allow the system to automatically sort it into the relevant Poll. -![Automatic Sorting][11] +![Automatic Sorting][17] _**Note:** Top Level Keywords are **unique.** Once a top level keyword has been used in an activity it cannot be used in another activity, unless that activity is archived or deleted. For a poll, if the top level keyword is not provided the keywords for the responses become top level keywords, and hence forth they have to be unique across all the activity top level keywords. @@ -95,7 +95,7 @@ This feature is quite usefull if you want frontlinesms to handle spelling mistak The Sorting tab looks as follows -![Aliases][17] +![Keywords][17] Each choice is followed by an area where you can enter text. You will see two aliases already entered into the text area. These are the default settings. @@ -193,7 +193,7 @@ Your poll will be displayed under the "Activities" sub heading in the [messages [5]: core/contacts/4.creating_a_group [6]: core/contacts/5.creating_a_smart_group [7]: core/messages/1.getting_around_the_messages_tab -[8]: ../images/help/poll1.png +[8]: ../images/help/autoforward1.png [9]: ../images/help/poll2.png [10]: ../images/help/poll3.png [11]: ../images/help/poll4.png @@ -202,4 +202,4 @@ Your poll will be displayed under the "Activities" sub heading in the [messages [14]: ../images/help/poll7.png [15]: ../images/help/poll8.png [16]: ../images/help/poll9.png -[17]: ../images/help/aliases.png +[17]: ../images/help/pollkeywords.png diff --git a/plugins/frontlinesms-core/web-app/images/help/add_new_connection.png b/plugins/frontlinesms-core/web-app/images/help/add_new_connection.png index 28670c9e385831cc4ccbf20ac541513934bb6f81..1cd2828e68f875decdec75cc589cb32816e077b5 100644 GIT binary patch literal 31079 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 a02CM!c$i;E==_g6T}oVDtXjk%=)V9!gb>02 literal 25648 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 LXvkN}T88{DQlPL| diff --git a/plugins/frontlinesms-core/web-app/images/help/autoreply2.png b/plugins/frontlinesms-core/web-app/images/help/autoreply2.png index 83e4418c0cbeff8bbb1edfcfdb70e78f0dc11f72..222de228ce4f4f610379b58721cd362cfab8dfdc 100644 GIT binary patch literal 33149 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 literal 28074 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 KrOPBugZ>vL2{Q-) diff --git a/plugins/frontlinesms-core/web-app/images/help/clickatell.png b/plugins/frontlinesms-core/web-app/images/help/clickatell.png index 12731534b463c3735b5f58cc036fa6e16d0a22e9..258314470c134cc21ebab76965a6f4edb29ea0ed 100644 GIT binary patch literal 22145 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 diff --git a/plugins/frontlinesms-core/web-app/images/help/pollkeywords.png b/plugins/frontlinesms-core/web-app/images/help/pollkeywords.png new file mode 100644 index 0000000000000000000000000000000000000000..cc4c95d2d0a2b14a88ce849828b020256ec2e929 GIT binary patch literal 34745 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 Date: Fri, 14 Dec 2012 16:24:13 +0300 Subject: [PATCH 0161/2668] Fixed passing of contextPath to getServerAddress. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index f2abddd84..31f860578 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -74,7 +74,7 @@ class MigrationSpec { } catch(EOFException _) {} println "# Running test script with remote control..." - def remoteControl = getRemoteControl() + def remoteControl = getRemoteControl(contextPath) def testOutput = remoteControl.exec(remoteCode) println "# Killing remote server" From 91c360e7714da4bc7bc13ae85a41df669fd754ef Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:37:26 +0300 Subject: [PATCH 0162/2668] Added cleanup to migration test script. --- .../src/main/groovy/MigrationSpec.groovy | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 31f860578..d5e14487c 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -10,7 +10,22 @@ class MigrationSpec { public static void main(String... args) { init() gitWorkingDirectoryMustBeClean = !('--dirty' in args) - new MigrationSpec(serverPort:8080).test() + def exitCode = 0 + def originalGitBranch = executeGetText('git branch | grep '*' | cut -d" " -f2') + try { + new MigrationSpec(serverPort:8080).test() + } catch(Exception ex) { + ex.printStackTrace() + exitCode = 1 + } finally { + try { + simpleExecute('cd ../../../.. && git reset --hard && git clean -xdf') + } catch(Exception _) { _.printStackTrace() } + try { + simpleExecute("git checkout $originalGitBranch") + } catch(Exception _) { _.printStackTrace() } + } + System.exit(exitCode) } private String getServerAddress(String contextPath) { @@ -31,6 +46,10 @@ class MigrationSpec { } } + private static String executeGetText(String command) { + return executeInBackground(command).text + } + private static Process executeInBackground(String command) { println "# Executing command: $command" return ['bash', '-c', command].execute() From c20d792161ca86a72b1ad45ad945c6c03702914b Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 14 Dec 2012 16:37:40 +0300 Subject: [PATCH 0163/2668] updated pngs to current version --- .../web-app/images/help/phone_modem.png | Bin 26332 -> 22916 bytes .../images/help/phone_modem_confirm.png | Bin 30628 -> 23851 bytes .../web-app/images/help/poll1.png | Bin 35380 -> 26822 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/images/help/phone_modem.png b/plugins/frontlinesms-core/web-app/images/help/phone_modem.png index aca185a972ad922624d74882ea16fa92943484bd..cffc44f2f7c39691ceff4adc40adf73daaa21266 100644 GIT binary patch literal 22916 zcmce-bx>T-x-Ps12oT&MxO;GSch}$q4Nj2Y79hA=u;9Vn-7UDgySv*r`JJ=x-TQoX ztL|TSs%ENZO|R~rx1WC3Yfp%hf+QjwE*t;=h|*GGDgXdc3IL!dSP1YH3lMV{0BFfd ziwUc_>K`vK!-+5>_-?p-LNo2&Z4UDcYv>OJAb)>50feA{ zym(HJZ}yPPu%gQ2#JJhCmNIsDJfK_Lya3nTedyP?<;~CGs6_7o-MO2l=>a&P;DQG5 zMFIdP0LX*{00IEm2LQv-1sR$c0652eS@npZ2LK-sAOr&dCu!*K0ib+h&0|jLJ@CnD zMhXOsgZ{aHc61R0bi6cgjlJSu5+n2&;=C%WQ|n?{o~pfdU?7P@aJ#^926kor7V=9L z_2cGbXXjLhNh+bKfP$U!+V;Xc!(=?o`HBGh{>Q)=XH+I7tF|@cNxAd^VnUS@6@(Cx z)^ERO&ns#eX&oM^D!r-t{of4&0eq>q@1=%bYNrYdIUIvnxC@_RuYGKKGjPej!D{x` zK7UrrV(!CHZSknE3hD^S`HUa*Hg!NwncSRgh}Lb+fJ17V{hefY|Gj(mG!&#&(~nYW ztNqZO9@`O>uceJe8rIBtX3Eq|nM%EEwCo`kYD~gytTB zNBEDw+c|qMaDi;gtsd_EbW5f!6SDuvxzE`}jXmjaQrk{8d0$qNYDc9dcuOC#K)SG8 zbY&;C1$GP#z-9d6{@Q8c+-21H`c3;mCa8llaF9AQo7&RO+#JYZAH9@2MnS3SldgR% zb8~*Pr!-!)TG5uyQBNC?YsMzP`+9XFrIqB`CFq|H;%+)!&Iy);e9mOI^T zx!yAX7mOv_{uK!1rWNpH28tZ{)2dur@);LpuMfps~%cRBG%LP%)ZVyaPT36=>!RFb4?*&CEv|Wd(ol~IvebPj;TZDBe zKjGo&TMfw;@*mEpY>74EHYFqzw}D?V#Fa5>+f!Kq*1NH-HRd4wxgt{*dJVU7@ICL4 z&gUYH=H+(ejyxMIB5?0PIkN(|0eXC5$?u5w-n-8lF8lmqafn1QFk3Y9S+4h$^AnR^ zCnvPmb%8GV=0J|WARJYN?^ah`P^}qPS8!vD_`Z%YJO?bvg4UHZkj2(iQlp}T`v^8@ z?Qm7j*GX8KB63s3eFeolXSUS;?7~7mYMX@*qD4i@nCJA?K!bSZ3g5)zB4#hxD~UEcyx|B>X{$Ok26 zB&YWz3vCt#qwTOL0n5@)yNMm%hb}OTD4{oKpy%40x87JwvNZvM24CO69iFIn`ZS5t z@tFnqg#C;t2;BIl)gtFkB-`qsH4+K_H8;TqE(YWJgXw<-KyBLF~B`Lnx-s{St2t4Y&Ic@Z@H*?Bt6L=R~(BIGjc(u$lY5 z4HADaJm@*w;w-pgqc)7?;*IjubDe0ae%Tkb&-{FGyz%w2_GSC8F zQve0v)W5OA{_9t;a`r`KoYhuF2Y0kt+RXS|dPDUD0XQn0K>!^~F8{8+|Eg*p;9r^< zJTwyvEBN{3jsLjkc1!&pxWD(jc7+FgAAomrt zu}i`*})UC8HWXlx^Qh>#AuSfX-&&ifwGzuY`PSMzl zrjFAgJF;1$QX*QFXT)f8>^UCCFsDK5w11UaA{q7KQ+Ib^rLo79KIiEzq6aq8=EGb?D1ep0>%l2?iE?M4J=*;n_yi_Q%;RKCcnWK ziYYdI;y=^W6V+nOjeBoE+pKM~l=Jo^Cd|F~N4orO>BN#I_3|n1V6zO%so6{xCg1}} z0Faty61h0$>@4p54B@$jzL6riQ$my&FI!s&v-Y!R!<9Xc{^>?7Ym#I7bxFmx-ew9U z1WQr_gVGoHVcm@Z`nubHRL=YBH?;KGEtr124%@O_!j|!dW-DGr!cq9Xi>*MT5vWhp zP(n){oh(PGVay!IXS73s{fMj@i#~O68`?0vJ7jNkO=cvd3SYYog+r0CKyymCNa%U* zq1W!ks@tCB_3nBeMpk0y%Z^~frSZcxm2-M)Xo>*_lCkq9TkuX2~zKUNCQw7 zA%o`*ezrN@9B6by8dXn>?-v=`e5BgbkYPn&s*SYb%;3O3ccja6Qjx>dyhL5EDN5N7 zTh^ob9jo%2>-enBG9@TjH-1ZX@OcyAsz$W*NWTF36WfPQ6spmXVGEijn`u0()R-;& z$3BWh8*v!dhvF7;%Idra>FZW*RKEdhX1ct~D`wy`bB3aHvL}?Q= zioW*Z{cFB~UVy;;{m|v@?aRU4SLdqh3G<|}h(FgJ4VX!cbcaEW9uPmI_A1UFNXisn zZ>|Y4;faX$L;;+BR;ZH5cf|BiroK_jPh}sWZ6jfw2B&)z=2adIz>EqKibh<@7NI*%3ZW!Q1UDj zABTqvHf8N{-NWE@4Nq_t-fLGk)FAl;@)|ZR zF)6X^+!WzhT1sJqgmH}JW5wEl#oX`WF-x>f@}HrVstel)2);~4=*%fig^X?LVSe6{ z%``6gAQof#T3OPJKy11w*f%Ltn`LiVt3txrpIRLA2q9+Y&bW#g1mi#Yii1_;a#T1& zV$i0#`-*(lE*`i4rM&v0!bM6lgBmEq#2Sm*)!+(Ia7Cov+ojr-;SB2t>#o+b+t+Gc zQMTMP@O~K^0KeRY(B?rZA>_m4TdMl0S9FDl(gf&yzOUQ=O;isld53W>r} z5)3nG#F<$X+&$;$QpvYOajH!oQ5u@rb5Wd}F1P)?Gbc$a5`-#)oWGD}k7T=77h7x7 zyQM2@SDQSqZ*a;q#tdN6UdTFH7W+iE~4ld z@arOMg&9f#=SP=)&na#a*C8$pl2&8mEC}v>m5~c8dU~-jlC*juq-F>djOseaT+=MO z>U+4@<_-{cH#2jLVr$FWjt67gy1n4daBa$#E_UTfsy~nHw<0`$cHa27x}8zW8*cOr zs>Zg#M6ZAr<+_i_Xo;%qzp=<}lwjd6v5dHg!bs6kb&%6`_jPRT24v&kwDe2rUqoZc zAJC&Z4ViEdF4)V@Hqc!Wf|)Y~y3h4{%7`SOBj@?_L;5d5=o#$-pXse_c$#XPj3@ zD88LVX4gT?Ut(BV-I(zGeogecIVvkQJdKy%@fIR98{X^UtKkpETj@&Wsidd)hWZy^ z1Z-iAMk5BemctH2R3G%M3~n-TWfE5ueLCyLXzp(JX(sAMAPWOOR2vA@!w|o*RVk>;XJ9Dne{s)>A!VN-X6x*5P9#k6R7$<6o~`}C zi3B0qem4E|E0`e4NNr$#d$33-gf(YL4ge|?#}VaoBa3D<1R2FbTh?#|&C8BF^Y~z$ z&3Ka2t*2O%ks$eO={d#$%SUU&pDMUQ!xtb`twsK!U?xu zPaU~dZXn<9z#uW|QF<53kGC2R07_tnf74QW<>g4c=wHd1SiF4Z|B#{-_9?l~>RJv9 z`qY?CMpM3gLq0=IC5o;#r5H~6PpMe?Ji6pvYzh6I()2a=+OY6!Jq?)>_m-6f3mQV z1?+4dBR6QNQ4HE#?!?<&>SCdT$LE9vfB_Hy_~L`T=f90;a6e%0-RdvQ%Lwq-60m6l zIDp^8|GSYnb;|c}BkkD!q5ooIW8>nYk{;}Pa|6xI&G`?7)yLNHoPTyM(`R`1h{o== zypq9|5B~YV4&!OnUGJy0rz!7J98rhr+tp8v5?5hyt%LQNDfHp#>FJXa zg--1?n)>~+_!Xna9O05g!l|MG>xK~({5PHBSTi*SB%MtNmiM93y_q!}t)-QS4WB+Vh(7XED~?m zEi&iUb$lRWnQCb5C*+;_a-7z(Usm)SFDM{CddItVH0(AUQneSze>7L#o^=du{m#sN zxW;rSu}?l?M6FsSEA8jchLgIb+gHL`3`2-rkNmFn&R!lX?HW|**4kg;UR zbs1a+1)!Kmwaa!F{w8sC_2QgNXLz@#PbVy_h$xgk@fbdSH+>?^sC4XOy^NBYdiwy4~1`f zPY0kgPQ#N(&f68`)%(TdRf5c?2kg<=){7lOu1f{g`PI$VPf8EF7m7b%ysIT#{Eh0y?xzf7Zay`0v z?5xB1G$Ua{u*tt=Z(=8h3@6ZOw%uRC*Dt+@9>Uyn`)W#&qb18h8~Ej`6mpl2oY;o> zvAJ1v^gUWr@=G5|^PAp?&ksWDC-quqUz3}T*|u4%5gr}fN0%-*Y-V>Dvow-gPu!x= zpVX%!y7QZG@IF6t1mqZp$9np9fS}5z&phhuRjI}%K0_4-Kf=L-D7O*m255aJzZ-Uc z_cT?u6Y=q|+gQd0?4?rxY%1zR1wK() zIMrB5Ak(K7zDgJO+*-~^<@t? zK(W}AU8rVZKdcUeQD#1}yfgCf=HN8vo9$_pD~0>&A)q_{k>B*&?G!$WZ^?(sm%R7p zyuncM;jz)pji0{~ba?NSv>tl
    E`%Y3wR71IH|Yq`9=oYpkn`rg-@d6&v-;7$4T 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 literal 30628 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 RjptnjC@ZMT7s_J%{~P%0a$x`f diff --git a/plugins/frontlinesms-core/web-app/images/help/poll1.png b/plugins/frontlinesms-core/web-app/images/help/poll1.png index d822d14a62ed0f9183812bf1c6c14be8fb4021da..1bb81d53217febf2745f2595bdbf59927c829c7f 100644 GIT binary patch literal 26822 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ࣺ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 Y0l%Ct5E$`$MF0Q*07*qoM6N<$f`h&gr~m)} From a77fb13266c8665b218118b1a47d7be3b8d6b667 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:38:21 +0300 Subject: [PATCH 0164/2668] Fixed command for getting current git branch. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index d5e14487c..f9da9c21b 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -11,7 +11,7 @@ class MigrationSpec { init() gitWorkingDirectoryMustBeClean = !('--dirty' in args) def exitCode = 0 - def originalGitBranch = executeGetText('git branch | grep '*' | cut -d" " -f2') + def originalGitBranch = executeGetText('git branch | grep \'*\' | cut -d" " -f2') try { new MigrationSpec(serverPort:8080).test() } catch(Exception ex) { From b390bdbb8a35b8fc3aae40b39814c93ccdba462e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:43:38 +0300 Subject: [PATCH 0165/2668] Updated execute method to change effective working directory. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index f9da9c21b..1e259d061 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -19,7 +19,7 @@ class MigrationSpec { exitCode = 1 } finally { try { - simpleExecute('cd ../../../.. && git reset --hard && git clean -xdf') + simpleExecute('git reset --hard && git clean -xdf') } catch(Exception _) { _.printStackTrace() } try { simpleExecute("git checkout $originalGitBranch") @@ -52,7 +52,7 @@ class MigrationSpec { private static Process executeInBackground(String command) { println "# Executing command: $command" - return ['bash', '-c', command].execute() + return ['bash', '-c', command].execute([], '../../..') } private static int simpleExecute(String command) { @@ -78,10 +78,10 @@ class MigrationSpec { println "# Checking out FrontlineSMS version: $version..." execute("git checkout $gitTag") - execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "../../../$contextPath/grails-app/conf/BuildConfig.groovy") + execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") println "# Starting grails server on port $serverPort..." - def grailsServer = executeInBackground "cd ../../../$contextPath && grails -Dserver.port=$serverPort test run-app" + def grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort test run-app" println "# Waiting for grails server to start..." try { grailsServer.inputStream.eachLine { line -> From bff219eec262ecd34ac07e592b0871db1d3c650e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:45:04 +0300 Subject: [PATCH 0166/2668] Fixed execute's path change. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 1e259d061..fefd94a0b 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -52,7 +52,7 @@ class MigrationSpec { private static Process executeInBackground(String command) { println "# Executing command: $command" - return ['bash', '-c', command].execute([], '../../..') + return ['bash', '-c', command].execute([], new File('../../..')) } private static int simpleExecute(String command) { From dc3e801a347d367caa7882569021af4282e7bce9 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:50:24 +0300 Subject: [PATCH 0167/2668] Added forced killing of grails server in all cases. --- .../src/main/groovy/MigrationSpec.groovy | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index fefd94a0b..1071c4546 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -80,24 +80,27 @@ class MigrationSpec { execute("git checkout $gitTag") execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") - println "# Starting grails server on port $serverPort..." - def grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort test run-app" - println "# Waiting for grails server to start..." try { - grailsServer.inputStream.eachLine { line -> - println "# [grails] $line" - if(line.trim().startsWith('| Server running. Browse to ')) { - throw new EOFException('Server started successfully.') + println "# Starting grails server on port $serverPort..." + def grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort test run-app" + println "# Waiting for grails server to start..." + try { + grailsServer.inputStream.eachLine { line -> + println "# [grails] $line" + if(line.trim().startsWith('| Server running. Browse to ')) { + throw new EOFException('Server started successfully.') + } } - } - } catch(EOFException _) {} + } catch(EOFException _) {} - println "# Running test script with remote control..." - def remoteControl = getRemoteControl(contextPath) - def testOutput = remoteControl.exec(remoteCode) - - println "# Killing remote server" - grailsServer.destroy() + println "# Running test script with remote control..." + def remoteControl = getRemoteControl(contextPath) + def testOutput = remoteControl.exec(remoteCode) + } finally { + println "# Killing remote server" + grailsServer.destroy() + println "# Grails exit code: ${grailsServer.exitCode()}" + } println "# Checking test response code..." println "# Test output: $testOutput" From 52d7ec0786488014f5a226d5a3ebe7af6456e9bf Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:51:18 +0300 Subject: [PATCH 0168/2668] Moved grailsServer definition to make it visible to finally. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 1071c4546..37d493a0b 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -80,9 +80,10 @@ class MigrationSpec { execute("git checkout $gitTag") execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") + def grailsServer try { println "# Starting grails server on port $serverPort..." - def grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort test run-app" + grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort test run-app" println "# Waiting for grails server to start..." try { grailsServer.inputStream.eachLine { line -> From 3ba4f00cc67f6465ef2f4997e8585a29022d0a32 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:52:39 +0300 Subject: [PATCH 0169/2668] Fixed reference to Process.exitValue() --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 37d493a0b..1c1d7783e 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -100,7 +100,7 @@ class MigrationSpec { } finally { println "# Killing remote server" grailsServer.destroy() - println "# Grails exit code: ${grailsServer.exitCode()}" + println "# Grails exit code: ${grailsServer.exitValue()}" } println "# Checking test response code..." From 174d2af47bb9006963d1b042ff8dbb0e3aae6784 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 16:53:40 +0300 Subject: [PATCH 0170/2668] Web Connection API helpfiles --- .../core/activities/10.web_connection_api.txt | 77 +++++++++++++++++++ .../activities/8.creating_an_autoforward.txt | 2 +- .../9.creating_a_web_connection.txt | 3 +- 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt b/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt new file mode 100644 index 000000000..6d0e6791f --- /dev/null +++ b/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt @@ -0,0 +1,77 @@ +# The FrontlineSMS Web Connection API + +FrontlineSMS lets you set up Web Connections to external web services. The primary function of Web Connections is to trigger HTTP requests on the external service when messages are received. However, in addition to this, you can enable the FrontlineSMS API through a Web Connection Activity, which allows your external web service to trigger outgoing messages through FrontlineSMS. + +## Enabling the API + +In the Web Connection walkthrough, you will be given the option to enable the FrontlineSMS API for that Activity. The only required configuration is the API Key that the remote service will need to use in each request. See [Creating a Web Connection][] for details on setting up a Web Connection. + +## API Details + +The URL for a specific Activity's API endpoint will be showin in the activity's header. + +The Web Connection API expects a JSON Map with the following parameters: +- secret +- message +- recipients + +### secret (required if Api Secret is set in Web Connection instance) +When configuring a Web Connection, you will be prompted to enter a Api Secret. Incoming requests will only be processed if the secret parameter matches what was set up in the Web Connection walkthough. If no secret was provided, the secret parameter can be left out of a request. + +### message (required) +This is the message body that will be sent out as the SMS. Substitution variables of the type used within FrontlineSMS are supported (so, for example, ${contact_name} will be replaced with the receiving contact's name). As with any SMS, extra cost may be incurred if this message body is longer than 160 characters. + +### recipients (required) +This is a list of entities the message should be sent to. Each entity will have a 'type' parameter and a corresponding value parameter, depending on the type. The available recipient entities are listed below. + +#### group + +The value parameter here can either be a 'name', which takes a literal string representing the group name, or 'id', which takes the FrontlineSMS database id of the group. + +#### smartgroup + +The value parameter here can either be a 'name', which takes a literal string representing the smartgroup name, or 'id', which takes the FrontlineSMS database id of the smartgroup. + +#### contact + +The value parameter here can either be a 'name', which takes a literal string representing the contact name, or 'id', which takes the FrontlineSMS database id of the contact. + +#### address + +This represents a phone number. It must be accompanied by a 'value' attribute, which represents the phone number to send to. Phone numbers should be passed in international format without spaces or brackets. + + +Below is an example of a valid requestst body, utilising all the valid combinations of recipient types. + + URL: [api/webconnection/${activityId}/${secret}]/send + METHOD: POST + FORMAT: JSON + CONTENT: { + secret: "secret", + message:"Hello, ${contact_name}", + recipients: { + { "type":"group", "id":"1" }, + { "type":"group", "name":"friends" }, + { "type":"smartgroup", "id":"3" }, + { "type":"smartgroup", "name":"humans" }, + { "type":"contact", "id":"2" }, + { "type":"contact", "name":"bobby" }, + { "type":"address", "value":"+1234567890" } + } + } + +## Responses + +FrontlineSMS will return various HTTP response codes depending on the outcome of the request. + +### 200 (Success) + +This will be accompanied by a text body stating how many recipients received the message. Note that this only signifies successful submission of the request to FrontlineSMS, and does not necessarily mean the outgoing message will be successfully delivered. If there are no routes available, or a problem with any of the active routes, the outgoing messages may fail despite the 200 response + +### 400 (Bad Request) + +This will be accompanied by an error message stating what was missing in the request. Examples are "no recipients supplied" and "missing required field(s): message". Note that if you specify valid group or smartgroup names, you may still get a 400 if there are currently no members of those groups + +### 401 (Authentication required) + +This error code will occur when the Web Connection requires a 'secret' parameter and none was supplied, or the secret provided was incorrect. The body will specify which of these two conditions occurred, as it will either be "no secret provided" or "invalid secret" \ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt b/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt index a908b24c9..84cfa7d05 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt @@ -17,7 +17,7 @@ In the first step you can configure the message that will be sent when an incomi **Automatic Sorting** ![Auto sorting][9] -On the next tab, you can configure FrontlineSMS to automatically trigger your Autoforward on incoming messages. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by spaces. With this setting, any incoming message that starts with one of those keywords will trigger the Autoforward. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Autoforward, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Autoforward's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. +On the next tab, you can configure FrontlineSMS to automatically trigger your Autoforward on incoming messages. With the 'Sort incoming messages that match a keyword' option, you can enter any number of keywords separated by commas. With this setting, any incoming message that starts with one of those keywords will trigger the Autoforward. Alternatively, you can select the 'Do not use a keyword' setting, which will result in all incoming messages triggering the Autoforward, provided they do not match any other activities' keywords. Only one activity at a time can have this setting. If you choose to, you can also disable automatic sorting altogether. With this setting, you can still use your Autoforward's functionality by manually moving messages into your new activity from the inbox or any other activity or folder. When you have finished setting up your automatic sorting options, click next. diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt index 41f72b9e6..cf956cdf7 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt @@ -29,7 +29,7 @@ If you selected 'Other Web Service', you will be prompted to enter the URL for t ## Enabling the FrontlineSMS API ![Configuring API][9] -For 'Other Web Service' Web Connections, you can enable the FrontlineSMS API, which allows your external web service to trigger outgoing SMS by invoking an HTTP request on your FrontlineSMS instance. All messages sent through the API will be saved in the Web Connection activity. See the [Api Documentation][2] for more information. +For 'Other Web Service' Web Connections, you can enable the FrontlineSMS API, which allows your external web service to trigger outgoing SMS by invoking an HTTP request on your FrontlineSMS instance. All messages sent through the API will be saved in the Web Connection activity. See the [Api Documentation][15] for more information. ## Automatic Sorting ![Auto sorting][10] @@ -66,6 +66,7 @@ Your Web Connection will appear under the Activities sub-heading. [3]: core/activities/3.creating_a_poll [4]: core/contacts/4.creating_a_group [5]: core/contacts/5.creating_a_smart_group +[15]: core/activities/10.web_connection_api [6]: ../images/help/webconnection1.png [7]: ../images/help/webconnection2.png From a409b330cfd3ca70784fa9ac6e57be014f53934e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:56:26 +0300 Subject: [PATCH 0171/2668] Added debug of workingDriectory --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 1c1d7783e..4f3d57e6f 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -51,8 +51,9 @@ class MigrationSpec { } private static Process executeInBackground(String command) { - println "# Executing command: $command" - return ['bash', '-c', command].execute([], new File('../../..')) + def workingDirectory = new File('../../..') + println "# Executing command: $command in $workingDirectory.absolutePath" + return ['bash', '-c', command].execute([], workingDirectory) } private static int simpleExecute(String command) { From d7c2f8859d51b69c67dd0bff047164d9b6d0ec41 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:58:44 +0300 Subject: [PATCH 0172/2668] Changed definition of script root dir. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 4f3d57e6f..ac61295e7 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -3,6 +3,7 @@ import groovyx.remote.transport.http.HttpTransport import groovyx.remote.client.RemoteControl class MigrationSpec { + static File EXECUTE_BASE_DIRECTORY = new File().parent.parent.parent static boolean gitWorkingDirectoryMustBeClean = true String serverPort @@ -51,9 +52,8 @@ class MigrationSpec { } private static Process executeInBackground(String command) { - def workingDirectory = new File('../../..') - println "# Executing command: $command in $workingDirectory.absolutePath" - return ['bash', '-c', command].execute([], workingDirectory) + println "# Executing command: $command in $EXECUTE_BASE_DIRECTORY.absolutePath" + return ['bash', '-c', command].execute([], EXECUTE_BASE_DIRECTORY) } private static int simpleExecute(String command) { From 9ee43c0eb3bca8f664a830f0b33a2266dd1a3ec0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 16:59:24 +0300 Subject: [PATCH 0173/2668] i18n fix in WebCon API tab --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 3d1bf202b..cd3ab75c5 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -856,7 +856,7 @@ webconnection.description=Connect to web service. webconnection.sorting=Automatic sorting webconnection.configure=Configure service webconnection.api=Expose API -webconnection.api.info=FrontlineSMS can be configured to receive incoming requests from your remote service and trigger outgoing messages. For more details, see [this] +webconnection.api.info=FrontlineSMS can be configured to receive incoming requests from your remote service and trigger outgoing messages. For more details, see the Web Connection help section. webconnection.api.enable.label=Enable API webconnection.api.secret.label=API secret key: webconnection.api.disabled=API disabled From 5df806e419411f1482315fde71bf2336bbf804c9 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 16:59:46 +0300 Subject: [PATCH 0174/2668] Fixed definition of script execute dir. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index ac61295e7..5de70d30c 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -3,7 +3,7 @@ import groovyx.remote.transport.http.HttpTransport import groovyx.remote.client.RemoteControl class MigrationSpec { - static File EXECUTE_BASE_DIRECTORY = new File().parent.parent.parent + static File EXECUTE_BASE_DIRECTORY = new File('').parent.parent.parent static boolean gitWorkingDirectoryMustBeClean = true String serverPort From 8e04ba1d588ed91fc6701fbcea63f7a287a61807 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 17:01:04 +0300 Subject: [PATCH 0175/2668] Fixed definition of script base dir a bit more. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 5de70d30c..5b035ab8e 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -3,7 +3,7 @@ import groovyx.remote.transport.http.HttpTransport import groovyx.remote.client.RemoteControl class MigrationSpec { - static File EXECUTE_BASE_DIRECTORY = new File('').parent.parent.parent + static File EXECUTE_BASE_DIRECTORY = new File('').parentFile.parentFile.parentFile static boolean gitWorkingDirectoryMustBeClean = true String serverPort From 46420cdad9391395562d566f571e6d03109f9d99 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 17:04:47 +0300 Subject: [PATCH 0176/2668] Fixed definition of script base dir a bit more. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 5b035ab8e..b23025305 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -3,7 +3,7 @@ import groovyx.remote.transport.http.HttpTransport import groovyx.remote.client.RemoteControl class MigrationSpec { - static File EXECUTE_BASE_DIRECTORY = new File('').parentFile.parentFile.parentFile + static File EXECUTE_BASE_DIRECTORY = new File(new File('').absolutePath).parentFile.parentFile.parentFile static boolean gitWorkingDirectoryMustBeClean = true String serverPort From 7c460c90ff12aeb35450290eab23944cfbb80f12 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 17:06:55 +0300 Subject: [PATCH 0177/2668] CORE-1807 - autoforwad text defaults to message_text --- .../controllers/frontlinesms2/AutoforwardController.groovy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy index a3ebce60a..51cd4bf55 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy @@ -10,6 +10,12 @@ class AutoforwardController extends ActivityController { } } + def create() { + def groupList = Group.getGroupDetails() + SmartGroup.getGroupDetails() + [contactList: Contact.list(), messageText: '${message_text}', + groupList:groupList, activityType: params.controller] + } + private def withAutoforward = withDomainObject Autoforward, { params.ownerId } } From 2c15ea81ab7407356f4bc17f5f146ab6f32c0e50 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 14 Dec 2012 17:12:47 +0300 Subject: [PATCH 0178/2668] Added TODOs to MigrationSpec. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index b23025305..70c1040cf 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -80,11 +80,14 @@ class MigrationSpec { println "# Checking out FrontlineSMS version: $version..." execute("git checkout $gitTag") execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") + println "# TODO enabling grails-remote-control-plugin for prod..." + + println "# TODO changing grails DataSource location for prod..." def grailsServer try { println "# Starting grails server on port $serverPort..." - grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort test run-app" + grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort prod run-app" println "# Waiting for grails server to start..." try { grailsServer.inputStream.eachLine { line -> From 583ac6a0175efe8c2948947af7af295a320d6268 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 14 Dec 2012 17:20:49 +0300 Subject: [PATCH 0179/2668] updated swahili internationalization --- .../grails-app/i18n/messages.properties | 4 +- .../grails-app/i18n/messages_sw.properties | 1471 ++++++++++------- .../frontlinesms-core/install/build.install4j | 78 +- .../fileset/filtered/launcher.properties | 2 +- .../frontlinesms-core.install.properties | 4 +- plugins/frontlinesms-core/swahili | 1008 +++++++++++ 6 files changed, 1907 insertions(+), 660 deletions(-) create mode 100644 plugins/frontlinesms-core/swahili diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 2c0637799..0b7260d04 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -205,7 +205,7 @@ clickatellfconnection.name.label=Name clickatellfconnection.apiId.label=API ID clickatellfconnection.username.label=Username clickatellfconnection.password.label=Password -clickatellfconnection.description=Send an receive messages through a Clickatell account +clickatellfconnection.description=Send and receive messages through a Clickatell account clickatellfconnection.global.info=You will need to configure an account with Clickatell (www.clickatell.com). # Smssync Fconnection @@ -384,6 +384,8 @@ poll.alias=Aliases poll.keywords=Keywords poll.aliases.prompt=Enter the aliases for the corresponding options. poll.aliases.prompt.details=You can enter multiple keywords for each option, separated with commas. The first keyword will be sent in the poll instructions message. +poll.response.keyword=Set response keywords +poll.set.keyword=Set a top-level keyword poll.keywords.validation.error=Keywords should be unique poll.sort.label=Auto-sort poll.autosort.no.description=Don't sort responses automatically. diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 1d0a36b3d..6f84e17a4 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -1,657 +1,827 @@ -# File Info -# FrontlineSMS Swahili translation by the FrontlineSMS team, Nairobi +# FrontlineSMS English translation by the FrontlineSMS team, Nairobi language.name=Kiswahili # General info app.version.label=Toleo # Common action imperatives - to be used for button labels and similar +action.ok=Sawa +action.close=Close +action.cancel=Katisha +action.done=Maliza +action.next=Ijayo +action.prev=Previous +action.back=Nyuma +action.create=Unda +action.edit=Hariri +action.rename=Badilisha Jina action.save=Hifadhi +action.save.all=Hifadhi zote +action.delete=Futa +action.delete.all=Futa zote +action.send=Tuma +action.export=Pakia -# Common action imperatives - to be used for button labels and similar -fmessage.selected.many=Risala {0} zimechaguliwa -fmessage.delete.many=Futa zote -autoreply.saved=Jibu la moja kwa moja limehifadhiwa -announcement.confirm=Thibitisha -autoreply.validation.prompt=Tafadhali jaza taarifa zote zinazohitajika -intellismsfconnection.password.label=Nywila -autoreply.message.title=Risala itakayotumwa ya hili jibu la moja kwa moja\: -fmessage.section.trash=Takataka -search.filter.sent=Risala zilizotumwa pekee -fmessage.unarchive.many=Rejesha zote -poll.sort.by=Panga risala kulingana na neno kuu -poll.messages.queue=Risala zimeongezwa kwenye foleni ya risali 'zinazosubiri'. -autoreply.label=Jibu la moja kwa moja -fmessage.move.to.header=Songesha risala kwa... -smartgroup.id.exist.not=Could not find smartgroup with id {0} Kundi-erevu lililo na kitambulisho {0} halikupatikana -poll.sort.keyword=neno kuu -contact.delete=Futa -contact.phonenumber.international.warning=Nambari hii haiko katika international format. Yaweza leta shida kulinganisha na wawasiliani -fmessage.to.label=Kwenda kwa -contact.all.contacts=Waasiliani wote ({0}) -contact.select.all=Chagua wote -folder.trashed=Folda imesongeshwa kwa takataka\! -default.not.inlist.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipatikani kwenye orodha [{3}] +# Messages when FrontlineSMS server connection is lost +server.connection.fail.title=Muunganisho wako kwa server umepotea +server.connection.fail.info=Tafadhali anzisha FrontlineSMS, au funga dirisha hii + +#Connections: +connection.creation.failed=Kuunda kwa muunganisho huu umefeli +connection.route.destroyed=Njia imeunguka kutoka {0} mpaka {1} +connection.route.connecting=Unganisha... +connection.route.disconnecting=Ungua... +connection.route.successNotification=Njia imeundwa katika {0} na mafanikio +connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho +connection.route.destroyNotification=Njia imekatika katika {0} +connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka +connection.route.exception=TODO:{1} + +# Connection exception messages +connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari +connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM +connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi +connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa +connection.error.org.smslib.notconnectedexception=TODO:{0} +connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa +connection.error.java.io.ioexception=TODO:Port threw an error: {0} +connection.error.frontlinesms2.camel.exception.invalidapiidexception=TODO: {0} +connection.error.frontlinesms2.camel.exception.authenticationexception=TODO: {0} +connection.error.frontlinesms2.camel.exception.insufficientcreditexception=TODO:{0} +connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani +connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho +connection.header=Mazingira > Miunganisho > +connection.list.none=Huna miunganisho iliyo sanidiwa +connection.edit=Hariri mwunganisho +connection.delete=Futa muunganisho +connection.deleted=Muunganisho {0} umefutwa +connection.route.create=Unda mwunganisho +connection.add=Ongeza mwunganisho mpya +connection.createtest.message.label=Risala +connection.route.destroy=Ungua mwunganisho +connection.send.test.message=Tuma risala kama majaribio +connection.test.message=Pongezi kutoka FrontlineSMS \\o/ umefaulu kuunda {0} kutuma risala \\o/ connection.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -fmessage.to=Kwa\: {0} -archive.folder=Hifadhi folda -contact.export=Hamisha -message.create.prompt=Andika risala -frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value=Neno kuu "{2}" limetumiwa -typeMismatch.java.net.URL=Tabia {0} lazima iwe URL halali -archive.activity.date=Tarehe -typeMismatch.java.net.URI=Tabia {0} lazima iwe URI halali -wizard.fmessage.edit.title=Hariri {0} -default.search.betweendates.title=kati ya tarehe\: -poll.message.none=Usitume risala na uchaguzi huu (kusanya majibu pekee). -fmessage.addsender=Weka kwenye waasiliani -default.updated={0} imesasishwa -flash.message.fmessages.many=Risala {0} za SMS -fmessage.moreactions=Vitendo zaidi... -search.betweendates.label=Kati ya tarehe -logs.date=Wakati -contact.view.duplicate=Tazama inayofanana -messages.trash.confirmation=Hiki kitendo kitafuta takataka na kufuta ujumbe wa kudumu. Je ungetaka kuendelea? +connection.select=Chagua aina ya mwunganisho +connection.type=Chagua aina +connection.details=Andika maelezo +connection.confirm=Thibitisha +connection.createtest.number=Nambari +connection.confirm.header=Thibitisha mazingira +connection.name.autoconfigured=Modemu {0} {1} katika port {2} imeongezwa + +status.connection.header=Miunganisho +status.connection.none=Hauna miunganisho iliyosanidiwa status.devises.header=Vifaa vilivyotambulika -default.search.moresearchoption.label=Utafutaji zaidi\: -search.clear=Futa utafutaji -intellismsfconnection.type.label=Aina -poll.type.prompt=Chagua aina ya uchaguzi unaotaka kuunda -typeMismatch.java.lang.Double=Tabia {0} lazima iwe nambari halali -archive.sent=Hifadhi kisanduku cha risala zilizotumwa -flash.message.poll.saved=Uchaguzi umewekwa -search.export=Pakia matokeo -default.archived.multiple={0} imehifadhiwa -layout.settings.header=Mazingira -group.leave.reply.message=Kwaheri -group.edit=Hariri kikundi -default.home.label=Nyumbani -smallpopup.group.rename.title=Badilisha jina la kikundi -export.contact.email=Barua pepe -poll.question=Andika swali -default.boolean.true=Kweli -poll.reply=Majibu ya moja kwa moja -logs.download.label=Chukua logi -activity.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -validation.nospaces.error=usiache nafasi kwenye neno -poll.validation.prompt=Jaza sehemu zote zinazohitajika -poll.choice.validation.error.deleting.response=Huwezi futa chagua iliyowekwa -poll.alias.validation.error.invalid.alias=Lakabu hii si sahihi. Jaribu a,jina, neno +status.detect.modems=Tambua modemu +status.modems.none=Hakuna vifaa vinavyotambulika + +connectionstatus.not_connected=Haijaunganishwa +connectionstatus.connecting=Inaunganishwa +connectionstatus.connected=Imeunganishwa + default.doesnt.match.message=Tabia [{0}] ya darasa [{1}]iliyo na kima [{2}] hailingani na ruwaza [{3}] inayohitajika -fmessage.failed=Imefeli -poll.response.enabled=Majibu ya moja kwa moja yamewezeshwa -typeMismatch.java.lang.Long=Tabia {0} lazima iwe nambari halali -archive.activity.name=Jina -default.archived={0} imehifadhiwa -flash.message.poll.queued=Uchaguzi umewekwa na risala zikapangwa kwenye foleni ili zitumwe -action.send=Tuma -intellismsfconnection.serverName.label=Jina la server -default.button.apply.label=Badilisha -searchdescriptor.exclude.archived.messages=isiyo na risala zilizohifadhiwa -fmessage.count.many=risala {0} -intellismsfconnection.receive.label=Tumia kupokea risala -fmessage.new.info=Ume pokea risala {0}. Bonyeza kuona -smartgroup.name.label=Jina -connection.edit=Hariri mwunganisho -default.deleted={0} imefutwa -typeMismatch.java.lang.Integer=Tabia {0} lazima iwe nambari halali -announcement.title=Tangazo la {0} -connection.confirm=Thibitisha -export.contact.title=Kupakia kwa waasiliani wa FrontlineSMS -group.delete.fail=Kundi halikuweza kufutwa -default.invalid.max.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] -searchdescriptor.until=, hadi {0} -traffic.update.chart=Sasisha chati -search.contact.name.label=Jina la mpokeaji -announcement.moreactions.delete=Futa tangazo -modem.port=Kituo tarishi -default.search.label=Futa utafutaji huu -smallpopup.fmessage.export.title=Pakia -fmessage.section.inbox=Kisanduku pokezi -default.paginate.next=Ijayo -contact.exists.warn=Kuko na mwasiliani anayetumia hiyo nambari. Huwezi kuunda nyingine inayofanana\! -fmessage.section.pending=Risala zitakazotumwa +default.invalid.url.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio URL halali default.invalid.creditCard.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio nabari halali ya kadi -contact.selected.many=wapokeaji waliyochaguliwa {0} -announcement.moreactions.export=Pakia tangazo -searchdescriptor.searching=Inatufuta -folder.name.label=Jina -default.unarchived.multiple={0} imetohifadhiwa -default.update.failed=Ilifeli kusasisha {0} iliyo na kitambulisho {1} -autoreply.details.label=Thibitisha maelezo -smallpopup.group.delete.title=Futa kikundi +default.invalid.email.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio barua pepe halali +default.invalid.range.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] default.invalid.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] -export.selectformat=Chagua fomati -folder.renamed=Jina la folda limebadilishwa -help.info=Hii ni version ya beta kwa hivyo haijajengewa usaidiza. Tafadhali tazama ukumbi wa watumizi kupata usaidizi zaidi -flash.message.fmessages.many.one=Risala 1 ya SMS -connection.deleted=Muunganisho {0} umefutwa -default.updated.message={0} imesasishwa -smartgroup.save.failed=Kundi-erevu {0} kilifeli kuwekwa kilicho na {1}{2} Makosa\: {3} -autoreply.description=Jibu risala zijazo moja kwa moja -poll.recipients=Chagua wapokeaji -poll.yes=Ndio -poll.no=La -announcement.moreactions.rename=Badilisha jina la tangazo -fmessage.footer.show.all=Yote -quickmessage.select.recipients=Chagua Wapokeaji -poll.replies.description=Ukipokea risala inayolingana na jibu la uchaguzi huu, tuma risala kwa mtumaji aliyetuma jibu hilo -autoreply.title=Jibu la Moja Kwa Moja ya {0} +default.invalid.max.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] +default.invalid.min.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] +default.invalid.max.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] +default.invalid.min.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] +default.invalid.validator.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipitishi mahitaji yanayohitajika kuhalalishwa +default.not.inlist.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipatikani kwenye orodha [{3}] +default.blank.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwachwa wazi +default.not.equal.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haiwezi kuwa sawa na [{3}] +default.null.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwa batilis +default.not.unique.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni lazma iwe ghali(unique) + +default.paginate.prev=Awali +default.paginate.next=Ijayo +default.boolean.true=Kweli +default.boolean.false=Uongo +default.date.format=dd MMMM, yyyy hh\:mm +default.number.format=0 + +default.unarchived=Tohifadhi default.unarchive.failed=Kutohifadhi kwa {0} umefeli -announcement.id.exist.not=Tangazo lililo na kitambulisho {0} halikuweza kupatwa -contact.groups.label=Vikundi +default.trashed={0} imewekwa katika takataka +default.restored={0} imerudishwa +default.restore.failed=Haikuweza kurudisha {0} iliyo na kitambulisho {1} +default.archived={0} imehifadhiwa +default.archived.multiple={0} imehifadhiwa +default.created={0} imeundwa +default.created.message={0} {1} imeundwa +default.create.failed=Kuunda kwa {0} kumefeli +default.updated={0} imesasishwa +default.update.failed=Ilifeli kusasisha {0} iliyo na kitambulisho {1} default.updated.multiple={0} imesasishwa -search.filter.archive=Tafuta kwenye hifadhi -announcement.not.saved=Tangazo halikuweza kuwekwa -fmessage.queued=Risala imewekwa kwenye foleni ili itumiwe {0} -fmessage.delete=Futa +default.updated.message={0} imesasishwa +default.deleted={0} imefutwa +default.trashed={0} imewekwa katika takataka +default.trashed.multiple={0} imewekwa katika takataka +default.archived={0} imehifadhiwa +default.unarchived=Tohifadhi +default.unarchive.keyword.failed=Tohifadhi {0} imefeli, neno kuu au jina linatumika +default.unarchived.multiple={0} imetohifadhiwa +default.delete.failed=Kufutwa kwa {0} iliyo na kitambulisho {1} +default.notfound=Haikuweza kupata {0} na kitambulisho {0} +default.optimistic.locking.failure=Mtumiaji mwingine amesasisha {0} ulipokuwa ukihariri + +default.home.label=Nyumbani +default.list.label={0} Orodha default.add.label=Ongeza {0} -traffic.sent=Risala zilizotumwa -poll.autosort.no.description=Risala hazitapangwa moja kwa moja -quickmessage.message.count=Nafasi 160 zimebaki (Risala 1) -fmessage.footer.show=Onyesha -connection.route.disconnecting=Ungua... +default.new.label={0} mpya default.create.label=Unda {0} -smallpopup.fmessage.delete.title=Futa {0} -contact.exists.prompt=Kuko na mwasiliani mwingine anayetumia hiyo nambari -intellismsfconnection.label=Akaunti ya IntelliSms -quickmessage.message.label=Risala -default.null.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwa batilis -smallpopup.group.edit.title=Hariri kikundi -fmessage.to.multiple=Kwa\: watu {0} -poll.message.count=Nafasi 160 zimebaki (Risala 1) -group.moreactions=Vitendo zaidi... -import.contacts=Maelezo ya waasiliani -contact.cancel=Katisha -contact.delete.many=Futa zote -fmessage.export=Hamisha -poll.sort.header=Panga risala kulingana na neno kuu (kwa hiari yako) -fmessage.search.description=Anza kutafuta upya kushoto -report.creation.error=Kulikuwa na kosa katika hali ya kuunda ripoti -poll.message.label=Risala -default.not.unique.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni lazma iwe ghali(unique) -default.not.equal.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haiwezi kuwa sawa na [{3}] -commont.help=Msaada -search.filter.group=Chagua kikundi -flash.message.poll.not.saved=Uchaguzi haukuweza kuwekwa -default.invalid.min.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] -searchdescriptor.between=, kati ya {0} na {1} -fmessage.retry.success.multiple=Risala {0} zimewekwa kwenye foleni tena ili zitumwe -announcement.details.label=Thibitisha vipengele -settings.general.header=Mazingira > Kwa ujumla -fmessage.rename=Badilisha jina {0} -action.create=Unda -smslibfconnection.pin.label=Utambuzi wa idadi -connection.createtest.number=Nambari -poll.message.send={0} {1} -connection.route.connecting=Unganisha... -activity.categorize=Weka majibu kwa kategoria zinazofaa -default.invalid.range.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] -activity.label=Kitendo -search.keyword.label=Neno kuu +default.show.label=Onyesha {0} +default.edit.label=Hariri {0} +search.clear=Futa utafutaji + +default.button.create.label=Unda +default.button.edit.label=Hariri +default.button.update.label=Sasisha +default.button.delete.label=Futa +default.button.search.label=Tafuta +default.button.apply.label=Badilisha +default.button.delete.confirm.message=Uko na hakika? + +default.deleted.message={0} imefutwa + +# Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author) +typeMismatch.java.net.URL=Tabia {0} lazima iwe URL halali +typeMismatch.java.net.URI=Tabia {0} lazima iwe URI halali +typeMismatch.java.util.Date=Tabia {0} lazima iwe tarehe halali +typeMismatch.java.lang.Double=Tabia {0} lazima iwe nambari halali +typeMismatch.java.lang.Integer=Tabia {0} lazima iwe nambari halali +typeMismatch.java.lang.Long=Tabia {0} lazima iwe nambari halali +typeMismatch.java.lang.Short=Tabia {0} lazima iwe nambari halali +typeMismatch.java.math.BigDecimal=Tabia {0} lazima iwe nambari halali +typeMismatch.java.math.BigInteger=Tabia {0} lazima iwe nambari halali +typeMismatch.int =TODO: {0} lazima iwe nambari halali + +# Application specific messages +messages.trash.confirmation=Hiki kitendo kitafuta takataka na kufuta ujumbe wa kudumu. Je ungetaka kuendelea? +default.created.poll=Uchaguzi umeundwa\! +default.search.label=Futa utafutaji huu +default.search.betweendates.title=kati ya tarehe\: +default.search.moresearchoption.label=Utafutaji zaidi\: +default.search.date.format=d/M/yyyy +default.search.moreoption.label=Chaguo zaidi + +# SMSLib Fconnection +smslibfconnection.label=Simu/Modemu +smslibfconnection.type.label=Aina +smslibfconnection.name.label=Jina +smslibfconnection.manufacturer.label=Mtengenezaji +smslibfconnection.model.label=Mwanamitindo +smslibfconnection.port.label=Kituo tarishi +smslibfconnection.baud.label=Kiwango cha baud +smslibfconnection.pin.label=Utambuzi wa idadi +smslibfconnection.imsi.label=Utambulisho wa Kimataifa wa simu ya mteja +smslibfconnection.serial.label=Kufuatanisha cha kifaa\# +smslibfconnection.send.label= Tumia modemu kutuma risala +smslibfconnection.receive.label=Tumia modemu kupokea risala +smslibFconnection.send.validator.error.send=Modemu yafaa kutumika kutuma +smslibFconnection.receive.validator.error.receive=au kupokea risala +smslibfconnection.description=Unganisha kwa modemu za USB, serial na bluetooth au simu +smslibfconnection.global.info=FrontlineSMS itajaribu yenyewe kusanidi modemu au simu yoyote iliyoshikamana, lakini unaweza kuzisanidi hapa + +# Email Fconnection +emailfconnection.label=Barua pepe +emailfconnection.type.label=Aina +emailfconnection.name.label=Jina emailfconnection.receiveProtocol.label=Itifaki -default.create.failed=Kuunda kwa {0} kumefeli -intellismsfconnection.serverPort.label=Kituo cha server -smallpopup.fmessage.rename.title=Badilisha jina la {0} -popup.help.title=Msaada -poll.replies.header=Tuma jibu moja kwa moja wa uchaguzi huu(kwa hiari yako) -fmessage.queued.multiple=Risala imewekwa kwenye ili itumiwe {0} -fmessage.trash.empty=Futa takataka -poll.autoreply.none=Hakuna -logs.download.title=Chukua logi ilizitumwe -traffic.filter.reset=Rudisha mwanzo -group.join.reply.message=Karibu -activity.delete.prompt=Hamisha {0} ziende kwa takataka . Kitendo hiki kitahamisha risala zote ziende kwa takataka -wizard.create=Unda -searchdescriptor.archived.messages=, ikiwa na risala zilizohifadhiwa -fmessage.footer.show.failed=Ilifeli -autoreply.enter.keyword=Neno kuu -language.label=Lugha -fconnection.name=Fconnection -autoreply.info.warning=Moja kwa moja bila neno kuu itatumwa kwa risala zote zijazo -smallpopup.group.title=Kikundi -export.database.id=Kitambulisho cha hifadhidata -connection.route.successNotification=Njia imeundwa katika {0} na mafanikio -action.close=Close -autoreply.create.message=Weka risala -contact.new=Mwasiliani mpya -fconnection.label=Fconnection -fmessage.responses.total=Majibu kwa ujumla {0} +emailfconnection.serverName.label=Jina la server +emailfconnection.serverPort.label=Kituo tarishi cha server +emailfconnection.username.label=jina la mtumiaji +emailfconnection.password.label=nywila + +# CLickatell Fconnection +clickatellfconnection.label=Akaunti ya Clickatell clickatellfconnection.type.label=Aina -logs.filter.label=Onyesha logi za -smallpopup.customfield.create.title=Unda Custom Field -flash.smartgroup.saved=Kikundi-erevu {0} kimewekwa -fmessage.archive.back=Rudi nyuma -smslibfconnection.imsi.label=Utambulisho wa Kimataifa wa simu ya mteja -contact.search.messages=Tafuta risala -logs.none=Huna logi. -export.messages.name2={0} ({1} risala) -export.messages.name1={0} {1} ({2} risala) -poll.sort.label=Panga moja kwa moja -folder.archived.successfully=Folda imehifadhiwa vizuri\! -action.delete=Futa -default.restore.failed=Haikuweza kurudisha {0} iliyo na kitambulisho {1} -fmessage.exist.not=Risala iliyo na kitambulisho {0} haijapatikana -archive.activity.list.none=  Hakuna matendo yaliyohiifadhiwa -dynamicfield.message_content.label=Mwili wa risala -flash.message.folder.found.not=Folda haikuweza kupatikana -system.notification.fail=Imefeli -export.contact.name=Jina -archive.folder.messages=Risala -action.prev=Previous -autoreply.info=Moja kwa moja imeundwa. Risala yoyote ambayo iko na neno kuu itaongezwa katika moja kwa moja hii, ambayo inaweza kutazamwa ukiibonyeza kwa menyu iliyo upande wa kulia. -fmessage.retry=Rudia -action.export=Pakia -folder.restored=Folda imerejeshwa\! -logs.filter.7days=Siku 7 zilizopita -intellismsfconnection.receiveProtocol.label=Protokoli -quickmessage.recipients.count=Wapokeaji wamechaguliwa -connectionstatus.connected=Imeunganishwa -wizard.messages.replyall.title=Jibu zote -fmessage.count=risala 1 -quickmessage.recipients.label=Wapokeaji -smslibfconnection.type.label=Aina -import.messages=Maelezo ya risala -modem.locked=Imefungwa? -traffic.total=Kwa ujumla -fmessage.label=Risala -fmessage.section.sent=Risala zilizotumwa +clickatellfconnection.name.label=Jina +clickatellfconnection.apiId.label=Kitambulisho cha API +clickatellfconnection.username.label=jina la mtumiaji +clickatellfconnection.password.label=nywila +clickatellfconnection.description=Tuma na pokea risala kutumia akaunti ya Clickatell +clickatellfconnection.global.info=Utahitaji kusanidi akanuti na Clickatell (www.clickatell.com). + +# Smssync Fconnection +smssyncfconnection.label=SMSSync +smssyncfconnection.name.label=Jina +smssyncfconnection.type.label=Aina +smssyncfconnection.receiveEnabled.label=Kupokea kumewezeshwa +smssyncfconnection.sendEnabled.label=Kutuma kumewezeshwa +smssyncfconnection.secret.label=Siri +smssyncfconnection.description=Tumia simu ya Android ambayo ina programu ya Smssync pamoja na FrontlineSMS kutuma na kupokea SMS +smssyncfconnection.field.secret.info=Kwenye programu yako ya SMSsync, weka siri ifanane na uga huu +smssyncfconnection.global.info=Pakua programu ya SMSSync kutoka kwa smssync.ushahidi.com + +# Messages Tab +message.create.prompt=Andika risala +message.character.count=Nafasi iliyobaki ni {0}. Risala {1} +message.character.count.warning=Idadi ya maneno inaweza kuongezeka baada ya kufanya mabadilisho +announcement.label=Tangazo +announcement.description=Tuma risala za tangazo na uyapange majibu +announcement.info1=Tangazo limeundwa na risala zikaongezwa kwenye foleni ya risala zitakazotumwa +announcement.info2=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao +announcement.info3=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri' +announcement.info4=Kutazama tangazo, ibonyeze katika menyu iliyo pande ya kushoto +announcement.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika announcement.select.recipients=Chagua wapokeaji -smallpopup.messages.export.title=Pakia Matokeo ({0} risala) -export.contact.info=Kupakia waasiliani kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa. +announcement.confirm=Thibitisha +announcement.delete.warn=Onyo la kufuta {0}\: Hutaweza kurejesha tangazo\! +announcement.prompt=Ipe jina tangazo hili +announcement.confirm.message=Thibitisha risala +announcement.details.label=Thibitisha vipengele +announcement.message.label=Risala +announcement.message.none=Hakuna +announcement.recipients.label=Wapokeaji +announcement.create.message=Andika risala + +announcement.recipients.count=wapokeaji waliochaguliwa +announcement.messages.count=risala zitatumwa +announcement.moreactions.delete=Futa tangazo +announcement.moreactions.rename=Badilisha jina la tangazo +announcement.moreactions.edit=Hariri tangazo +announcement.moreactions.export=Pakia tangazo +frontlinesms2.Announcement.name.unique.error.frontlinesms2.Announcement.name=Jina "{2}" lazima liwe lakipekee + + +archive.inbox=Hifadhi kisanduku pokezi +archive.sent=Hifadhi kisanduku cha risala zilizotumwa archive.activity=Hifadhi matendo -action.rename=Badilisha Jina -contact.addtogroup.error=Huwezi kuongeza na kutoa kutoka kikundi kimoja +archive.folder=Hifadhi folda +archive.folder.name=Jina +archive.folder.date=Tarehe +archive.folder.messages=Risala +archive.folder.none=  Hakuna faili zilizohifadhiwa +archive.activity.name=Jina +archive.activity.type=Aina +archive.activity.date=Tarehe +archive.activity.messages=Risala +archive.activity.list.none=  Hakuna matendo yaliyohiifadhiwa + +autoreply.enter.keyword=Neno kuu +autoreply.create.message=Weka risala +activity.autoreply.sort.description=FrontineSMS yaweza kujibu risala zinazoingia ambazo zinaanza na neno kuu, na kuhamisha ujumbe unaoingia katika kitendo hiki. Waweza kufanya hivi kwa risala zote, au zile pekee zinazofanana an maneno kuu maalum +activity.autoreply.disable.sorting.description=Risala hazitajibiwa moja kwa moja au kuhamishwa katika kitendo hiki +autoreply.confirm=Thibitisha +autoreply.name.label=Risala +autoreply.details.label=Thibitisha maelezo +autoreply.label=Jibu la moja kwa moja autoreply.keyword.label=Neno kuu -announcement.description=Tuma risala za tangazo na uyapange majibu +autoreply.description=Jibu risala zijazo moja kwa moja +autoreply.info=Moja kwa moja imeundwa. Risala yoyote ambayo iko na neno kuu itaongezwa katika moja kwa moja hii, ambayo inaweza kutazamwa ukiibonyeza kwa menyu iliyo upande wa kulia. +autoreply.info.warning=Moja kwa moja bila neno kuu itatumwa kwa risala zote zijazo +autoreply.info.note=Kumbuka\: Ukihifadhi hili jibu la moja kwa moja, risala zijazo hazitapangwa na hili jibu la moja kwa moja. +autoreply.validation.prompt=Tafadhali jaza taarifa zote zinazohitajika +autoreply.message.title=Risala itakayotumwa ya hili jibu la moja kwa moja\: +autoreply.keyword.title=Panga risala za jibu la moja kwa moja ukitumia hili Neno Kuu\: +autoreply.name.prompt=Ipe jina hii jibu ya moja kwa moja +autoreply.message.count=nafasi 0 (Risala 1) +autoreply.moreactions.delete=Futa jibu la moja kwa moja +autoreply.moreactions.rename=Badilisha jina la jibu la moja kwa moja +autoreply.moreactions.edit=Hariri jibu la moja kwa moja +autoreply.moreactions.export=Hamisha jibu la moja kwa moja +autoreply.all.messages=Usitumie neno kuu (Risala zote zijazo zitapokea hili jibu la moja kwa moja) +autoreply.text.none=Hamna +frontlinesms2.Autoreply.name.unique.error.frontlinesms2.Autoreply.name=Jina "{2}" lazima liwe lakipekee +frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=TODO:Autoreply name must be unique +frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Neno kuu "{2}" limetumiwa +frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=Risala haiwezi kuwa tupu + +autoforward.title=Autoforward ya {0} +autoforward.label=Autoforward +autoforward.description=Tuma mbele risala zinazoingia moja kwa moja kwa waasiliani +autoforward.recipientcount.current=Wapokeaji {0} hivi sasa +autoforward.create.message=Andika ujumbe +autoforward.confirm=Thibitisha +autoforward.recipients=Wapokeaji +autoforward.name.prompt=Taja Autoforward hii +autoforward.details.label=Thibitisha vipengele +autoforward.keyword.label=Neno/Maneno kuu +autoforward.name.label=Ujumbe +autoforward.contacts=Waasiliani +autoforward.groups=Vikundi +autoforward.info=Autoforward imetengenezwa, risala zozote ambazo zina neno kuu lako zitaongezwa kwa kitendo hiki ambazo zinaweza kutazamwa kwa kukibonyeza kwenye menyu iliyo upande wa kulia +autoforward.info.warning=Autoforward ambayo haina neno kuu itasababisha risala zote zinazoingia kutumwa mbele +autoforward.info.note=Kumbuka: Ikiwa utatohifadhi Autoforward, risala zinazoingia hazitapangwa kwa ajili yake. +autoforward.save=Autoforward imehifadhiwa! +autoforward.save.success=Autoforward ya {0} imehifadhiwa! +autoforward.global.keyword=Hakuna: (risala zote zinazoingia zitasindikwa) +autoforward.disabled.keyword=Hakuna (upangaji wa moja kwa moja haujawezeshwa) +autoforward.keyword.none.generic=Hakuna +autoforward.groups.none=Hakuna +autoforward.contacts.none=Hakuna +autoforward.message.format=Ujumbe + +contact.new=Mwasiliani mpya +contact.list.no.contact=Hakuna Waasiliani hapa\! +contact.header=Waasiliani +contact.all.contacts=Waasiliani wote ({0}) +contact.create=Unda mwasiliani mpya +contact.groups.header=Vikundi +contact.create.group=Unda kikundi kipya +contact.smartgroup.header=Vikundi-erevu +contact.create.smartgroup=Unda kikundi-erevu kipya +contact.add.to.group=Ongezea kikundi... +contact.remove.from.group=Toa kutoka kikundi contact.customfield.addmoreinformation=Ongeza habari zaidi... -frontlinesms2.Announcement.name.unique.error.frontlinesms2.Announcement.name=Jina "{2}" lazima liwe lakipekee -wizard.quickmessage.title=Risala ya haraka +contact.customfield.option.createnew=Unda mpya... +contact.name.label=Jina +contact.phonenumber.label=Nambari ya simu +contact.phonenumber.international.warning=Nambari hii haiko katika international format. Yaweza leta shida kulinganisha na wawasiliani +contact.notes.label=Vidokezi +contact.email.label=Barua pepe +contact.groups.label=Vikundi +contact.notinanygroup.label=Haiko kwa kikundi chochote +contact.messages.label=Risala +contact.sent.messages=Risala zilizotumwa +contact.received.messages=Risala zilizopokewa +contact.search.messages=Tafuta risala +contact.select.all=Chagua wote +contact.not.found=Mwasiliani hapatikani +group.not.found=Kikundi hakipatikani +smartgroup.not.found=Kikundi-erevu hakipatikani + +group.rename=Badilisha Jina la kikundi +group.edit=Hariri kikundi +group.delete=Futa kikundi +group.moreactions=Vitendo zaidi... + +customfield.validation.prompt=Tafadhali jaza jina +customfield.validation.error=Jina limetumika +customfield.name.label=Jina +export.contact.info=Kupakia waasiliani kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa. +export.message.info=Kupakia risala kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa.. +export.selectformat=Chagua fomati +export.csv=Fomati ya CSV itakayotumiwa na spreadsheet +export.pdf=Fomati ya PDF ili uweze kuchapisha +folder.name.label=Jina +group.delete.prompt=Uko na hakika ungetaka kufuta {0}? Ilani\: Hutaweza kuirejesha. +layout.settings.header=Mazingira activities.header=Vitendo -contact.create.group=Unda kikundi kipya -status.connection.none=Hauna miunganisho iliyosanidiwa -connection.details=Andika maelezo -intellismsfconnection.name.label=Jina -smallpopup.empty.trash.prompt=Mwaga Tupio? -frontlinesms.user.support=usaidizi wa watumiaji kutoka FrontlineSMS -export.message.text=Andiko -emailfconnection.username.label=jina la mtumiaji -fmessage.showpolldetails=Onyesha grafu -fmessage.activity.sentmessage=(risala {0} zimetumwa) -search.moreoptions.label=Chaguo zaidi -modem.description=Maelezo +activities.create=Chagua kitendo kipya folder.header=Folda -tab.message=Risala -search.filter.label=Zuwuia utafutaji uwe katika\: -smslibfconnection.serial.label=Kufuatanisha cha kifaa\# -connection.route.destroyNotification=Njia imekatika katika {0} -default.optimistic.locking.failure=Mtumiaji mwingine amesasisha {0} ulipokuwa ukihariri -logs.filter.28days=Siku 28 zilizopita -import.prompt.type=Chagua aina ya data utakayoingiliza -default.invalid.max.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] -default.invalid.url.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio URL halali -folder.exist.not=Folda iliyo na kitambulisho {0} haikuweza kupatikana -default.trashed={0} imewekwa katika takataka -default.trashed.multiple={0} imewekwa katika takataka -connection.list.none=Huna miunganisho iliyo sanidiwa -popup.smartgroup.create=Unda kikundi-erevu -clickatellfconnection.password.label=nywila -default.restored={0} imerudishwa -contact.add.to.group=Ongezea kikundi... -default.invalid.validator.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipitishi mahitaji yanayohitajika kuhalalishwa -fmessage.edit=Hariri {0} -connection.creation.failed=Kuunda kwa muunganisho huu umefeli -connection.add=Ongeza mwunganisho mpya -import.message.save.error=Kulikuwa na kosa katika kuwekwa kwa risala +folder.create=Chagua folda mpya +folder.label=Folda +message.folder.header=Folda ya {0} +fmessage.trash.actions=Vitendo kuhusu takataka +fmessage.trash.empty=Futa takataka +fmessage.to.label=Kwenda kwa +trash.empty.prompt=Risala na vitendo vyote kwenye takataka zitafutwa kabisa +fmessage.responses.total=Majibu kwa ujumla {0} +fmessage.label=Risala +fmessage.label.multiple={0} risala +poll.prompt=Ipe jina uchaguzi huu +poll.details.label=Thibitisha vipengele +poll.message.label=Risala +poll.choice.validation.error.deleting.response=Huwezi futa chagua iliyowekwa +poll.alias=Malakabu +poll.keywords=Maneno kuu +poll.aliases.prompt=Andika malakabu yanayolingana na majibu. +poll.aliases.prompt.details=Malakabu hayo yatenganishwe na koma. Lakabu ya kwanza litatumwa katika risala. +poll.response.keyword=Weka maneno kuu ya majibu +poll.set.keyword=Weka neno kuu la ngazi ya juu +poll.keywords.validation.error=Maneno kuu lazima yawe ya kipekee +poll.sort.label=Panga moja kwa moja +poll.autosort.no.description=Risala hazitapangwa moja kwa moja poll.autosort.description=Panga risala kulingana na neno kuu -import.label=Ingiliza -logs.download.continue=Endelea -language.prompt=Badilisha lugha unayotumia kwa FrontlineSMS -fmessage.activity.archive=Hifadhi {0} -connection.route.destroy=Ungua mwunganisho -intellismsfconnection.emailUserName.label=Jina la mtumiaji +poll.sort.keyword=neno kuu +poll.sort.by=Panga risala kulingana na neno kuu +poll.autoreply.label=Jibu la moja kwa moja +poll.autoreply.none=Hakuna +poll.recipients.label=Wapokeaji +poll.recipients.none=Hakuna +poll.toplevelkeyword=Maneno kuu ya ngazi ya juu + +#TODO embed javascript values +poll.recipients.count=Wapokeaji wamechaguliwa +poll.messages.count=Risala zitatumwa +poll.yes=Ndio +poll.no=La poll.label=Uchaguzi -dynamicfield.keyword.label=Neno kuu -status.detect.modems=Tambua modemu -typeMismatch.java.util.Date=Tabia {0} lazima iwe tarehe halali -contact.received.messages=Risala zilizopokewa -contact.remove.from.group=Toa kutoka kikundi -quickmessage.phonenumber.add=Ongeza -smallpopup.delete.many.prompt=Futa {0} contacts? -poll.autoreply.send=Tuma risala ya moja kwa moja kwa watumaji wa majibu ya uchaguzi huu -frontlinesms2.Autoreply.name.unique.error.frontlinesms2.Autoreply.name=Jina "{2}" lazima liwe lakipekee -fmessage.retry.success=Risala imewekwa kwenye foleni tena ili itumiwe {0} -default.created.poll=Uchaguzi umeundwa\! -dynamicfield.contact_name.label=Jina la mwasiliani -typeMismatch.java.math.BigInteger=Tabia {0} lazima iwe nambari halali -announcement.create.message=Andika risala -fmessage.messages.none=Hakuna risala hapa\! -frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Neno kuu "{2}" limetumiwa -typeMismatch.java.math.BigDecimal=Tabia {0} lazima iwe nambari halali -fmessage.forward=Tuma -fmessage.restore.many=Rudisha -tab.contact=Waasiliani -contact.mobile.label=Nambari ya simu -flash.message=Risala -action.edit=Hariri -wizard.title.new=Mpya -trash.empty.prompt=Risala na vitendo vyote kwenye takataka zitafutwa kabisa -fmessage.restore=Rudisha -status.modems.none=Hakuna vifaa vinavyotambulika -flash.smartgroup.save.failed=Kuweka kwa kundi-erevu kumefeli. Kosa likuwa {0} -default.created.message={0} {1} imeundwa -contact.messages.label=Risala -folder.create.success=Folda kimeundwa vyema -folder.create.failed=Kuunda kwa folda kumefeli -folder.name.validator.error=Jina hili la folda limetumika -folder.name.blank.error=Tafadhali weka jina la folda +poll.description=Tuma swali na uchambue majibu +poll.messages.sent=risala {0} zimetumwa +poll.response.enabled=Majibu ya moja kwa moja yamewezeshwa +poll.message.edit=Hariri risala itakayotumiwa mpokeaji +poll.message.prompt=Risala hii itatumiwa wapokeaji wa uchaguzi huu +poll.message.count=Nafasi 160 zimebaki (Risala 1) + +poll.moreactions.delete=Futa uchaguzi +poll.moreactions.rename=Badilisha jina la uchaguzi +poll.moreactions.edit=Hariri uchaguzi +poll.moreactions.export=Pakia uchaguzi + folder.moreactions.delete=Futa folda folder.moreactions.rename=Badilisha jina la folda folder.moreactions.export=Pakia folda -poll.name.blank.error=Tafadhali weka jina la uchaguzi -poll.name.validator.error=Jina hili la uchaguzi limetumika -autoreply.name.blank.error=Tafadhali weka jina la moja kwa moja -autoreply.name.validator.error=Jina hili la moja kwa moja limetumika -announcement.name.blank.error=Tafadhali weka jina la tangazo -announcement.name.validator.error=Jina hili la tangazo limetumika -group.name.blank.error=Tafadhali weka jina la kikundi -group.name.validator.error=Jina hiki cha kikundi kimetumika -autoreply.moreactions.delete=Futa jibu la moja kwa moja -poll.reply.text6=Tafadhali jibu -poll.reply.text5=Jibu -poll.reply.text4={0} {1} -poll.reply.text3=ama + +#TODO embed javascript values +poll.reply.text=Jibu "{0} {1}" kujibu Ndio, "{2} {3}" kujibu La. +poll.reply.text1={0} "{1} {2}" kujibu {3} poll.reply.text2=Tafadhali jibu 'Ndio' au 'La' +poll.reply.text3=ama +poll.reply.text4={0} {1} +poll.reply.text5=Jibu +poll.reply.text6=Tafadhali jibu +poll.message.send={0} {1} poll.recipients.validation.error=Chagua waasiliani wa kutumia risala +frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name =TODO: {1} {0} "{2}" must be unique +frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=Aina ya majibu haziwezi kuwa sawa +frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value =Neno kuu "{2}" tayari linatumika + +wizard.title.new=Mpya +wizard.fmessage.edit.title=Hariri {0} +popup.title.saved={0} imewekwa\! +popup.activity.create=Unda Shughuli Mpya \: Chagua aina +popup.smartgroup.create=Unda kikundi-erevu +popup.help.title=Msaada +smallpopup.customfield.create.title=Unda Custom Field +smallpopup.group.rename.title=Badilisha jina la kikundi +smallpopup.group.edit.title=Hariri kikundi +smallpopup.group.delete.title=Futa kikundi +smallpopup.fmessage.rename.title=Badilisha jina la {0} +smallpopup.fmessage.delete.title=Futa {0} +smallpopup.fmessage.export.title=Pakia +smallpopup.delete.prompt=Futa {0} ? +smallpopup.delete.many.prompt=Futa {0} contacts? +smallpopup.empty.trash.prompt=Mwaga Tupio? +smallpopup.messages.export.title=Pakia Matokeo ({0} risala) +smallpopup.test.message.title=Risala jaribio +smallpopup.recipients.title=Wapokeaji +smallpopup.folder.title=Folda +smallpopup.group.title=Kikundi smallpopup.contact.export.title=Pakia -poll.reply.text1={0} "{1} {2}" kujibu {3} -traffic.header=Trafiki -emailfconnection.serverName.label=Jina ya server -poll.messages.count=Risala zitatumwa -default.number.format=0 -archive.activity.messages=Risala -action.cancel=Katisha -fconnection.test.message.sent=Risala ya jaribio imetumwa\! -default.button.search.label=Tafuta -quickmessage.phonenumber.label=Ongeza nambari ya simu\: -quickmessage.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -fmessage.quickmessage=Risala ya haraka -activity.name=Jina -autoreply.moreactions.export=Hamisha jibu la moja kwa moja -activities.create=Chagua kitendo kipya -default.boolean.false=Uongo -archive.activity.type=Aina -fmessage.hidepolldetails=Ficha grafu -import.contact.save.error=Kulikuwa na kosa katika kuwekwa kwa mwasiliani -smartgroup.startswith.label=inayoanza na +smallpopup.contact.delete.title=Futa +contact.selected.many=wapokeaji waliyochaguliwa {0} +group.join.reply.message=Karibu +group.leave.reply.message=Kwaheri +fmessage.new.info=Ume pokea risala {0}. Bonyeza kuona +wizard.quickmessage.title=Risala ya haraka +wizard.messages.replyall.title=Jibu zote +wizard.send.message.title=Tuma Risala wizard.ok=Sawa -default.paginate.prev=Awali -fmessage.move.to.inbox=Kisanduku pokezi -traffic.filter.between.dates=Kati ya tarehe -emailfconnection.serverPort.label=Bandari ya server -quickmessage.details.label=Thibitisha vipengele -autoreply.not.saved=Jibu la moja kwa moja halijaweza kuwekwa -export.message.date.created=Tarehe ya kuundwa -autoreply.keyword.title=Panga risala za jibu la moja kwa moja ukitumia hili Neno Kuu\: -frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=Aina ya majibu haziwezi kuwa sawa -poll.details.label=Thibitisha vipengele -folder.create=Chagua folda mpya -tab.status=Hali -intellismsfconnection.username.label=Jina la mtumiaji -autoreply.moreactions.rename=Badilisha jina la jibu la moja kwa moja -connection.select=Chagua aina ya mwunganisho -quickmessage.enter.message=Andika risala +wizard.create=Unda +wizard.send=Tuma common.settings=Mazingira -connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka -emailfconnection.label=Barua pepe -export.contact.mobile=Nambari -export.contact.groups=Vikundi -emailfconnection.type.label=Aina -fmessage.archive.many=Hifadhi zote -export.csv=Fomati ya CSV itakayotumiwa na spreadsheet +common.help=TODO:Help + +validation.nospaces.error=usiache nafasi kwenye neno +activity.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika +autoreply.blank.keyword=Neno Kuu tupu. Jibi litatumwa kwa risala zote zijazo + + +poll.type.prompt=Chagua aina ya uchaguzi unaotaka kuunda +poll.question.yes.no=Swali linalo jibu 'ndio' au 'la' +poll.question.multiple=Swali linalo majibu mengi (k.m 'Nyekundu', 'Samawati', 'Kijani Kibichi') +poll.question.prompt=Andika swali +poll.message.none=Usitume risala na uchaguzi huu (kusanya majibu pekee). +poll.replies.header=Tuma jibu moja kwa moja wa uchaguzi huu(kwa hiari yako) +poll.replies.description=Ukipokea risala inayolingana na jibu la uchaguzi huu, tuma risala kwa mtumaji aliyetuma jibu hilo +poll.autoreply.send=Tuma risala ya moja kwa moja kwa watumaji wa majibu ya uchaguzi huu +poll.responses.prompt=Andika majibu unayotarajia (Kati ya 2 hadi 5) +poll.sort.header=Panga risala kulingana na neno kuu (kwa hiari yako) +poll.sort.description=Watumaji risala watakapotuma majibu wakitumia neno kuu, FrontlineSMS inaweza kupanga risala hizo kulingana na neno hilo +poll.no.automatic.sort=Usipange risala kulingana na neno kuu +poll.sort.automatically=Panga risala zinazotumia hili neno kuu moja kwa moja +poll.validation.prompt=Jaza sehemu zote zinazohitajika +poll.name.validator.error.name=Majina ya uchaguzi lazima yawe ya kipekee +pollResponse.value.blank.value=thamana ya jibu la uchaguzi haiwezi kuwa tupu +poll.keywords.validation.error.invalid.keyword=Neno kuu si halali, jaribu jina au neno lingine +poll.question=Andika swali +poll.response=Orodha ya majibu +poll.sort=Panga moja kwa moja +poll.reply=Majibu ya moja kwa moja +poll.edit.message=Hariri risala +poll.recipients=Chagua wapokeaji +poll.confirm=Thibitisha +poll.save=Uchaguzi umehifadhiwa! +poll.save.success=Uchaguzi wa {0} umehifadhiwa! +poll.messages.queue=Risala zimeongezwa kwenye foleni ya risali 'zinazosubiri'. +poll.messages.queue.status=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao. +poll.pending.messages=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri'. +poll.send.messages.none=Hamna risala zitakazotumwa +quickmessage.details.label=Thibitisha vipengele +quickmessage.message.label=Risala +quickmessage.message.none=Hakuna quickmessage.recipient.label=Mpokeaji -fmessage.archive=Hifadhi -group.label=Kundi -wizard.send.message.title=Tuma Risala -fmessage.date.label=Tarehe -default.invalid.min.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] -fmessage.label.multiple={0} risala -search.filter.activities=Tafuta kwa vitendo na folda -smallpopup.contact.delete.title=Futa -folder.label=Folda -default.search.moreoption.label=Chaguo zaidi -frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=Risala haiwezi kuwa tupu -fmessage.trash.actions=Vitendo kuhusu takataka -contact.label=Mwasiliani -settings.logs.header=Mazingira > logi za mfumo -quickmessage.count.label=Hesabu ya Risala\: -poll.recipients.count=Wapokeaji wamechaguliwa -export.message.info=Kupakia risala kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa.. -default.button.create.label=Unda +quickmessage.recipients.label=Wapokeaji +quickmessage.message.count=Nafasi 160 zimebaki (Risala 1) +quickmessage.enter.message=Andika risala +quickmessage.select.recipients=Chagua Wapokeaji quickmessage.confirm=Thibitisha -poll.recipients.label=Wapokeaji -fmessage.unarchive=Rejesha -contact.notinanygroup.label=Haiko kwa kikundi chochote -dynamicfield.contact_number.label=Nambari ya simu ya mwasiliani -fmessage.retry.many=Kurudia haikufaulu -quickmessage.selected.recipients=wapokeaji wamechaguliwa -autoreply.name.prompt=Ipe jina hii jibu ya moja kwa moja -magicwand.title=Tumia neno la ubadilifu -customfield.validation.prompt=Tafadhali jaza jina -customfield.validation.error=Jina limetumika -export.contact.notes=Madondo -connection.createtest.message.label=Risala -default.list.label={0} Orodha -clickatellfconnection.name.label=Jina -failed.pending.fmessages=Risala {0} zinazosuburi zimefeli. Enda kwenye sehemu ya risala zinazosuburi kuziona. -archive.folder.date=Tarehe -smslibfconnection.baud.label=Kiwango cha baud -default.created={0} imeundwa -autoreply.info.note=Kumbuka\: Ukihifadhi hili jibu la moja kwa moja, risala zijazo hazitapangwa na hili jibu la moja kwa moja. -smartgroup.info=Kuunda kundi , chagua amri zitakazofuatwa na Waasiliani ili wawe kwatika kikundi hiki -poll.messages.sent=risala {0} zimetumwa -flash.message.fmessage=risala {0} -import.message.complete=Risala {0} zimeingilizwa; {1} zikafeli -poll.title=Uchaguzi wa {0} -connection.send.test.message=Tuma risala kama majaribio -poll.confirm=Thibitisha -search.quickmessage=Tuma risala -poll.message.edit=Hariri risala itakayotumiwa mpokeaji -archive.inbox=Hifadhi kisanduku pokezi -contact.save.many=Weka zote -announcement.messages.count=risala zitatumwa -default.date.format=dd MMMM, yyyy hh\:mm -fmessage.resend=Tuma tena -export.message.source=Chanzo -poll.response=Orodha ya majibu -poll.sort.description=Watumaji risala watakapotuma majibu wakitumia neno kuu, FrontlineSMS inaweza kupanga risala hizo kulingana na neno hilo -contact.sent.messages=Risala zilizotumwa -export.message.destination=Kifiko +#TODO embed javascript values +quickmessage.recipients.count=Wapokeaji wamechaguliwa quickmessage.messages.count=risala zitatumwa -smallpopup.recipients.title=Wapokeaji -import.upload.failed=Kupakia kwa faili hiyo kumefeli -contact.email.label=Barua pepe -flash.smartgroup.delete.unable=Kikundi-erevu haukuweza kufutwa -fmessage.search.none=Hamna risala zilizopaikana -connection.header=Mazingira > Miunganisho > -default.invalid.email.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio barua pepe halali -export.contacts.name3=Waasiliani wote (waasiliani {0}) -export.contacts.name2={0} kundi erevu (waasiliani {1}) -connection.route.destroyed=Njia imeunguka kutoka {0} mpaka {1} -export.contacts.name1={0} kundi ({1} waasiliani) +quickmessage.count.label=Hesabu ya Risala\: +quickmessage.messages.label=Andika risala +quickmessage.phonenumber.label=Ongeza nambari ya simu\: +quickmessage.phonenumber.add=Ongeza +quickmessage.selected.recipients=wapokeaji wamechaguliwa +quickmessage.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika + fmessage.number.error=Umeongeza maandishi yasiyo nambari hapa, utakapoweka maandishi yasiyo nambari yatatolewa -settings.general=Kwa ujumla -poll.pending.messages=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri'. -connection.test.message=Pongezi kutoka FrontlineSMS \\o/ umefaulu kuunda {0} kutuma risala \\o/ -default.delete.failed=Kufutwa kwa {0} iliyo na kitambulisho {1} -smartgroup.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika. Unaweza kuchagua amri moja pekee katika sehemu yeyote -connection.type=Chagua aina -autoreply.blank.keyword=Neno Kuu tupu. Jibi litatumwa kwa risala zote zijazo -popup.activity.create=Unda Shughuli Mpya \: Chagua aina -contact.notes.label=Vidokezi -smallpopup.test.message.title=Risala jaribio -archive.folder.name=Jina -import.version1.info=Kuingiliza data kutoka version 1, yapakie kwa lugha ya Kiingereza -group.save.fail=Kundi halijawekwa vizuri -poll.edit.message=Hariri risala -system.notification.ok=Sawa -clickatellfconnection.label=Akaunti ya Clickatell -default.button.delete.confirm.message=Uko na hakika? -announcement.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -import.contact.complete=Waasiliani {0} wameinglizwa; {1} wamefeli -contact.groups.header=Vikundi +search.filter.label=Zuwuia utafutaji uwe katika\: +search.filter.group=Chagua kikundi +search.filter.activities=Tafuta kwa vitendo na folda search.filter.messages.all=Zote zilizotumwa na kupokewa -searchdescriptor.only=, pekee {0} -clickatellfconnection.apiId.label=Kitambulisho cha API -action.back=Nyuma -group.delete.prompt=Uko na hakika ungetaka kufuta {0}? Ilani\: Hutaweza kuirejesha. -connectionstatus.connecting=Inaunganishwa -traffic.all.folders.activities=Onyesha matendo na faili zote -contact.save=Weka -contact.header=Waasiliani -default.blank.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwachwa wazi -poll.prompt=Ipe jina uchaguzi huu -logs.filter.anytime=Saa zote -frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name=Jina "{2}" lazima liwe lakipekee -announcement.delete.warn=Onyo la kufuta {0}\: Hutaweza kurejesha tangazo\! -poll.responses.prompt=Andika majibu unayotarajia (Kati ya 2 hadi 5) -export.pdf=Fomati ya PDF ili uweze kuchapisha -connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho -poll.moreactions.edit=Hariri uchaguzi -default.search.date.format=d/M/yyyy -autoreply.message.count=nafasi 0 (Risala 1) -smallpopup.folder.title=Folda -tab.archive=Hifadhi -fconnection.unknown.type=Mwunganisho usiojulikana -customfield.name.label=Jina -action.ok=Sawa -search.header=Tafuta -status.connection.header=Miunganisho -autoreply.name.label=Risala -folder.title={0} folda -emailfconnection.password.label=nywila -typeMismatch.int=Ni lazima {0} iwe nambari halali -contact.edited.by.another.user=Mtumiaji mwingine amesasisha rekodi hii ulipokuwa ukihariri -announcement.recipients.count=wapokeaji waliochaguliwa -group.update.success=Kundi limesasishwa vizuri -logs.download.buttontext=Chukua logi -fmessage.selected.none=Hakuna risala iliyochaguliwa -fmessage.reply.many=Jibu zote -export.message.title=Kupakia kwa risala za FrontlineSMS -connection.route.create=Unda mwunganisho -announcement.recipients.label=Wapokeaji -import.contact.failed.download=Unda CSV ya waasiliani zilizofeli -autoreply.all.messages=Usitumie neno kuu (Risala zote zijazo zitapokea hili jibu la moja kwa moja) -message.character.count=Nafasi iliyobaki ni {0}. Risala {1} -message.character.count.warning=Idadi ya maneno inaweza kuongezeka baada ya kufanya mabadilisho -poll.sort.automatically=Panga risala zinazotumia hili neno kuu moja kwa moja search.filter.inbox=Risala zilizopokewa pekee -download.logs.info2=watumiaji wengine wanaweza kuwa wameripoti shida inayolingana na wakapata suluhisho\! kuendelea na kutuma logi ulizonazo Tafadhali bonyeza 'Endelea' -download.logs.info1=Onyo\: Kundi la FrontlineSMS haliwezi kujibu maswali yako moja kwa moja. Ikiwa uko na maswali kuhusu utumiaji, Tafadhali angalia katika 'Msaada' ili uweze kupata majibu hapo. Usipofaulu, ripoti matatizo yako kwa usaidizi wa watumiaji\: -traffic.received=Imepokewa -default.notfound=Haikuweza kupata {0} na kitambulisho {0} -folder.unarchived.successfully=Folda imerejeshwa vizuri\! -tab.search=Tafuta +search.filter.sent=Risala zilizotumwa pekee +search.filter.archive=Tafuta kwenye hifadhi +search.betweendates.label=Kati ya tarehe +search.header=Tafuta +search.quickmessage=Tuma risala +search.export=Pakia matokeo +search.keyword.label=Neno kuu +search.contact.name.label=Jina la mpokeaji search.contact.name=Jina la mpokeaji -fmessage.footer.show.starred=Risala zenye nyota +search.result.header=Matokeo +search.moreoptions.label=Chaguo zaidi +settings.general=Kwa ujumla settings.connections=Simu na miunganisho -many.selected={0} {1} zimechaguliwa -quickmessage.messages.label=Andika risala -poll.moreactions.delete=Futa uchaguzi -default.edit.label=Hariri {0} -group.name.label=Jina -searchdescriptor.from=, kutoka {0} -poll.question.yes.no=Swali linalo jibu 'ndio' au 'la' -contact.list.no.contact=Hakuna Waasiliani hapa\! -message.folder.header=Folda ya {0} -smslibfconnection.name.label=Jina -connectionstatus.not_connected=Haijaunganishwa +settings.logs=Mfumo +settings.general.header=Mazingira > Kwa ujumla +settings.logs.header=Mazingira > logi za mfumo +logs.none=Huna logi. +logs.content=Risala +logs.date=Wakati +logs.filter.label=Onyesha logi za +logs.filter.anytime=Saa zote +logs.filter.1day=Masaa 24 yaliyopita +logs.filter.3days=Siku 3 zilizopita +logs.filter.7days=Siku 7 zilizopita +logs.filter.14days=Siku 14 zilizopita +logs.filter.28days=Siku 28 zilizopita +logs.download.label=Chukua logi +logs.download.buttontext=Chukua logi +logs.download.title=Chukua logi ilizitumwe +logs.download.continue=Endelea + +smartgroup.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika. Unaweza kuchagua amri moja pekee katika sehemu yeyote +smartgroup.info=Kuunda kundi , chagua amri zitakazofuatwa na Waasiliani ili wawe kwatika kikundi hiki smartgroup.contains.label=iliyo na neno -poll.question.prompt=Andika swali +smartgroup.startswith.label=inayoanza na smartgroup.add.anotherrule=Ongeza amri nyingine -quickmessage.message.none=Hakuna -poll.moreactions.export=Pakia uchaguzi -poll.sort=Panga moja kwa moja -poll.alias=Malakabu -poll.aliases.prompt=Andika malakabu yanayolingana na majibu. -poll.aliases.prompt.details=Malakabu hayo yatenganishwe na koma. Lakabu ya kwanza litatumwa katika risala. -poll.alias.validation.error=Malakabu yafaa kuwa ya kipekee -announcement.info4=Kutazama tangazo, ibonyeze katika menyu iliyo pande ya kushoto -announcement.info3=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri' -announcement.info2=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao -announcement.info1=Tangazo limeundwa na risala zikaongezwa kwenye foleni ya risala zitakazotumwa -poll.autoreply.label=Jibu la moja kwa moja -default.button.edit.label=Hariri -announcement.message.label=Risala -smslibfconnection.port.label=Bandari -poll.send.messages.none=Hamna risala zitakazotumwa -frontlinesms.welcome=Karibu FrontlineSMS\! \\o/ -contact.smartgroup.header=Vikundi-erevu -poll.question.multiple=Swali linalo majibu mengi (k.m 'Nyekundu', 'Samawati', 'Kijani Kibichi') -connection.name.autoconfigured=Modemu {0} {1} katika port {2} imeongezwa -poll.message.prompt=Risala hii itatumiwa wapokeaji wa uchaguzi huu -autoreply.confirm=Thibitisha -announcement.message.none=Hakuna -poll.moreactions.rename=Badilisha jina la uchaguzi -clickatellfconnection.username.label=jina la mtumiaji +smartgroup.name.label=Jina + +modem.port=Kituo tarishi +modem.description=Maelezo +modem.locked=Imefungwa? +traffic.header=Trafiki +traffic.update.chart=Sasisha chati +traffic.filter.2weeks=Onyesha wiki mbili zilizopita +traffic.filter.between.dates=Kati ya tarehe +traffic.filter.reset=Rudisha mwanzo +traffic.allgroups=Onyesha vikundi vyote +traffic.all.folders.activities=Onyesha matendo na faili zote +traffic.sent=Risala zilizotumwa +traffic.received=Imepokewa +traffic.total=Kwa ujumla + +tab.message=Risala +tab.archive=Hifadhi +tab.contact=Waasiliani +tab.status=Hali +tab.search=Tafuta + +help.info=Hili ni toleo la beta kwa hivyo haijajengewa usaidiza. Tafadhali tazama ukumbi wa watumizi kupata usaidizi zaidi + +# IntelliSms Fconnection +intellismsfconnection.label=Akaunti ya IntelliSms +intellismsfconnection.type.label=Aina +intellismsfconnection.name.label=Jina +intellismsfconnection.username.label=Jina la mtumiaji +intellismsfconnection.password.label=Nywila + +intellismsfconnection.send.label=Tumia kutuma risala +intellismsfconnection.receive.label=Tumia kupokea risala +intellismsfconnection.receiveProtocol.label=Protokoli +intellismsfconnection.serverName.label=Jina la server +intellismsfconnection.serverPort.label=Kituo cha server +intellismsfconnection.emailUserName.label=Jina la mtumiaji intellismsfconnection.emailPassword.label=Nywila +intellismsfconnection.description=Tuma na upokee risala kwa kutumia akaunti ya Intellisms +intellismsfconnection.global.info=Utahitajike kusanidi akaunti na Intellisms (www.intellisms.co.uk). + +#Controllers +contact.label=Mwasiliani +contact.edited.by.another.user=Mtumiaji mwingine amesasisha rekodi hii ulipokuwa ukihariri +contact.exists.prompt=Kuko na mwasiliani mwingine anayetumia hiyo nambari +contact.exists.warn=Kuko na mwasiliani anayetumia hiyo nambari. Huwezi kuunda nyingine inayofanana\! +contact.view.duplicate=Tazama inayofanana +contact.addtogroup.error=Huwezi kuongeza na kutoa kutoka kikundi kimoja +contact.mobile.label=Nambari ya simu +contact.email.label=Barua pepe +fconnection.label=Fconnection +fconnection.name=Fconnection +fconnection.unknown.type=Mwunganisho usiojulikana +fconnection.test.message.sent=Risala ya jaribio imetumwa\! announcement.saved=Tangazo limewekwa na risala zikaongezwa kwenye foleni ili zitumwe -wizard.send=Tuma -poll.no.automatic.sort=Usipange risala kulingana na neno kuu -group.delete=Futa kikundi -typeMismatch.java.lang.Short=Tabia {0} lazima iwe nambari halali -poll.recipients.none=Hakuna -contact.customfield.option.createnew=Unda mpya... -connection.confirm.header=Thibitisha mazingira -action.next=Ijayo -announcement.label=Tangazo -logs.filter.14days=Siku 14 zilizopita +announcement.not.saved=Tangazo halikuweza kuwekwa +announcement.save.success=Tangazo la {0} limehifadhiwa! +announcement.id.exist.not=Tangazo lililo na kitambulisho {0} halikupatikana + +autoreply.save.success=Tangazo la moja kwa moja la {0} limehifadhiwa! +autoreply.not.saved=Jibu la moja kwa moja halijaweza kuwekwa +report.creation.error=Kulikuwa na kosa katika hali ya kuunda ripoti +export.message.title=Kupakia kwa risala za FrontlineSMS +export.database.id=Kitambulisho cha hifadhidata +export.message.date.created=Tarehe ya kuundwa +export.message.text=Andiko +export.message.destination.name=Jina la fikio +export.message.destination.mobile=Nambari la fikio +export.message.source.name=Jina la chanzo +export.message.source.mobile=Nambari ya chanzo +export.contact.title=Kupakia kwa waasiliani wa FrontlineSMS +export.contact.name=Jina +export.contact.mobile=Nambari +export.contact.email=Barua pepe +export.contact.notes=Madondo +export.contact.groups=Vikundi +export.messages.name1={0} {1} ({2} risala) +export.messages.name2={0} ({1} risala) +export.contacts.name1={0} kundi ({1} waasiliani) +export.contacts.name2={0} kundi erevu (waasiliani {1}) +export.contacts.name3=Waasiliani wote (waasiliani {0}) +folder.label=Folda +folder.archived.successfully=Folda imehifadhiwa vizuri\! +folder.unarchived.successfully=Folda imerejeshwa vizuri\! +folder.trashed=Folda imesongeshwa kwa takataka\! +folder.restored=Folda imerejeshwa\! +folder.exist.not=Folda iliyo na kitambulisho {0} haikuweza kupatikana +folder.renamed=Jina la folda limebadilishwa + +group.label=Kundi +group.name.label=Jina +group.update.success=Kundi limesasishwa vizuri +group.save.fail=Kundi halijawekwa vizuri +group.delete.fail=Kundi halikuweza kufutwa + +import.label=Ingiliza +import.backup.label=Ingiliza data kutoka hifadhi ya hapo mbeleni +import.prompt.type=Chagua aina ya data utakayoingiliza +import.contacts=Maelezo ya waasiliani +import.messages=Maelezo ya risala +import.version1.info=Kuingiliza data kutoka version 1, yapakie kwa lugha ya Kiingereza +import.prompt=Chagua faili utakayoingiliza +import.upload.failed=Kupakia kwa faili hiyo kumefeli +import.contact.save.error=Kulikuwa na kosa katika kuwekwa kwa mwasiliani +import.contact.complete=Waasiliani {0} wameinglizwa; {1} wamefeli +import.contact.failed.download=Unda CSV ya waasiliani zilizofeli +import.message.save.error=Kulikuwa na kosa katika kuwekwa kwa risala +import.message.complete=Risala {0} zimeingilizwa; {1} zikafeli + +many.selected ={1} {0} zimechaguliwa + +flash.message.activity.found.not=Kitendo hakijaweza kupatikana +flash.message.folder.found.not=Folda haikuweza kupatikana +flash.message=Risala +flash.message.fmessage=risala {0} +flash.message.fmessages.many=Risala {0} za SMS +flash.message.fmessages.many.one=Risala 1 ya SMS +fmessage.exist.not=Risala iliyo na kitambulisho {0} haijapatikana +flash.message.poll.queued=Uchaguzi umewekwa na risala zikapangwa kwenye foleni ili zitumwe + +flash.message.poll.not.saved=Uchaguzi haukuweza kuwekwa +system.notification.ok=Sawa +system.notification.fail=Imefeli +flash.smartgroup.delete.unable=Kikundi-erevu haukuweza kufutwa +flash.smartgroup.saved=Kikundi-erevu {0} kimewekwa +flash.smartgroup.save.failed=Kuweka kwa kundi-erevu kumefeli. Kosa likuwa {0} +smartgroup.id.exist.not=Kundi-erevu lililo na kitambulisho {0} hakipatikana +smartgroup.save.failed=Kundi-erevu {0} kilifeli kuwekwa kilicho na {1}{2} Makosa\: {3} +contact.name.label=Jina contact.phonenumber.label=Nambari ya simu -contact.create=Unda mwasiliani mpya -logs.content=Risala -logs.filter.3days=Siku 3 zilizopita -traffic.allgroups=Onyesha vikundi vyote -settings.logs=Mfumo -traffic.filter.2weeks=Onyesha wiki mbili zilizopita + +searchdescriptor.searching=Inatufuta searchdescriptor.all.messages=Risala zote -poll.messages.queue.status=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao. -autoreply.moreactions.edit=Hariri jibu la moja kwa moja -logs.filter.1day=Masaa 24 yaliyopita -default.new.label={0} mpya +searchdescriptor.archived.messages=, ikiwa na risala zilizohifadhiwa +searchdescriptor.exclude.archived.messages=isiyo na risala zilizohifadhiwa +searchdescriptor.only=, pekee {0} +searchdescriptor.between=, kati ya {0} na {1} +searchdescriptor.from=, kutoka {0} +searchdescriptor.until=, hadi {0} +poll.title=Uchaguzi wa {0} +announcement.title=Tangazo la {0} +autoreply.title=Jibu la Moja Kwa Moja ya {0} +folder.title={0} folda +frontlinesms.welcome=Karibu FrontlineSMS\! \\o/ +failed.pending.fmessages=Risala {0} zinazosuburi zimefeli. Enda kwenye sehemu ya risala zinazosuburi kuziona. + +subscription.title=Usajili wa {0} +subscription.info.group=Kikundi: {0} +subscription.info.groupMemberCount=wawasiliani {0} +subscription.info.keyword=Neno Kuu: {0} +subscription.sorting.disable=Lemaza upangaji wa moja kwa moja +subscription.info.joinKeywords=Kujiunga: {0} +subscription.info.leaveKeywords=Kuondoka: {0} +subscription.group.goto=Tazama Kukundi +subscription.group.required.error=Usajili lazime iwe na kikundi +subscription.save.success=Usajili wa {0} umehifadhiwa! + +language.label=Lugha +language.prompt=Badilisha lugha unayotumia kwa FrontlineSMS +frontlinesms.user.support=usaidizi wa watumiaji kutoka FrontlineSMS +download.logs.info1=Onyo\: Kundi la FrontlineSMS haliwezi kujibu maswali yako moja kwa moja. Ikiwa uko na maswali kuhusu utumiaji, Tafadhali angalia katika 'Msaada' ili uweze kupata majibu hapo. Usipofaulu, ripoti matatizo yako kwa usaidizi wa watumiaji\: +download.logs.info2=watumiaji wengine wanaweza kuwa wameripoti shida inayolingana na wakapata suluhisho\! kuendelea na kutuma logi ulizonazo Tafadhali bonyeza 'Endelea' + +# Configuration location info +configuration.location.title=Mahala pa usanidi +configuration.location.instructions=Waweza kupata programu-tumizi yako katika {1}. Faili hizi ni pamoja na hifadhidata yako na mazingira mengine, ambazo ungeari kucheleza mahali pengine + +dynamicfield.contact_name.label=Jina la mwasiliani +dynamicfield.contact_number.label=Nambari ya simu ya mwasiliani +dynamicfield.keyword.label=Neno kuu +dynamicfield.message_content.label=Mwili wa risala + +# Fmessage domain +fmessage.queued=Risala imewekwa kwenye foleni ili itumiwe {0} +fmessage.queued.multiple=Risala imewekwa kwenye ili itumiwe {0} +fmessage.retry.success=Risala imewekwa kwenye foleni tena ili itumiwe {0} +fmessage.retry.success.multiple=Risala {0} zimewekwa kwenye foleni tena ili zitumwe fmessage.displayName.label=Jina -import.prompt=Chagua faili utakayoingiliza -contact.name.label=Jina -announcement.prompt=Ipe jina tangazo hili -autoreply.text.none=Hamna fmessage.text.label=Risala -import.backup.label=Ingiliza data kutoka hifadhi ya hapo mbeleni -flash.message.activity.found.not=Kitendo hakijaweza kupatikana -archive.folder.none=  Hakuna faili zilizohifadhiwa -contact.create.smartgroup=Unda kikundi-erevu kipya -smslibfconnection.label=Simu/Modemu -connection.delete=Futa muunganisho -smallpopup.delete.prompt=Futa {0} ? -emailfconnection.name.label=Jina -action.done=Maliza +fmessage.date.label=Tarehe +fmessage.to=Kwa\: {0} +fmessage.to.multiple=Kwa\: watu {0} +fmessage.quickmessage=Risala ya haraka +fmessage.archive=Hifadhi +fmessage.activity.archive=Hifadhi {0} +fmessage.unarchive=Rejesha +fmessage.export=Hamisha +fmessage.rename=Badilisha jina {0} +fmessage.edit=Hariri {0} +fmessage.delete=Futa +fmessage.moreactions=Vitendo zaidi... +fmessage.footer.show=Onyesha +fmessage.footer.show.failed=Ilifeli +fmessage.footer.show.all=Yote +fmessage.footer.show.starred=Risala zenye nyota +fmessage.footer.show.incoming=Zinazoingia +fmessage.footer.show.outgoing=Zinazotoka +fmessage.archive.back=Rudi nyuma +fmessage.activity.sentmessage=(risala {0} zimetumwa) +fmessage.failed=Imefeli fmessage.header=Risala -default.show.label=Onyesha {0} -poll.description=Tuma swali na uchambue majibu -poll.reply.text=Jibu "{0} {1}" kujibu Ndio, "{2} {3}" kujibu La. -search.result.header=Matokeo -announcement.confirm.message=Thibitisha risala -group.rename=Badilisha Jina la kikundi -default.button.update.label=Sasisha -popup.title.saved={0} imewekwa\! -intellismsfconnection.send.label=Tumia kutuma risala -default.unarchived=Tohifadhi -announcement.moreactions.edit=Hariri tangazo -fmessage.many=Risala -default.button.delete.label=Futa -default.deleted.message={0} imefutwa +fmessage.section.inbox=Kisanduku pokezi +fmessage.section.sent=Risala zilizotumwa +fmessage.section.pending=Risala zitakazotumwa +fmessage.section.trash=Takataka +fmessage.addsender=Weka kwenye waasiliani +fmessage.resend=Tuma tena +fmessage.retry=Rudia fmessage.reply=Jibu -smslibFconnection.send.validator.error.send=Modemu yafaa kutumika kutuma -smslibFconnection.receive.validator.error.receive=au kupokea risala +fmessage.forward=Tuma +fmessage.unarchive=Rejesha +fmessage.delete=Futa +fmessage.messages.none=Hakuna risala hapa\! +fmessage.selected.none=Hakuna risala iliyochaguliwa +fmessage.move.to.header=Songesha risala kwa... +fmessage.move.to.inbox=Kisanduku pokezi +fmessage.archive.many=Hifadhi zote +fmessage.count=risala 1 +fmessage.count.many=risala {0} +fmessage.many=Risala +fmessage.delete.many=Futa zote +fmessage.reply.many=Jibu zote +fmessage.restore=Rudisha +fmessage.restore.many=Rudisha +fmessage.retry.many=Kurudia haikufaulu +fmessage.selected.many=Risala {0} zimechaguliwa +fmessage.unarchive.many=Rejesha zote + +# TODO move to poll.* +fmessage.showpolldetails=Onyesha grafu +fmessage.hidepolldetails=Ficha grafu + +# TODO move to search.* +fmessage.search.none=Hamna risala zilizopaikana +fmessage.search.description=Anza kutafuta upya kushoto + +fmessage.connection.receivedon=Ilipokewa tarehe: + +activity.name=Jina +activity.delete.prompt=Hamisha {0} ziende kwa takataka . Kitendo hiki kitahamisha risala zote ziende kwa takataka +activity.label=Kitendo +activity.categorize=Weka majibu kwa kategoria zinazofaa + +magicwand.title=Tumia neno la ubadilifu +folder.create.success=Folda kimeundwa vyema +folder.create.failed=Kuunda kwa folda kumefeli +folder.name.validator.error=Jina hili la folda limetumika +folder.name.blank.error=Tafadhali weka jina la folda +poll.name.blank.error=Tafadhali weka jina la uchaguzi +poll.name.validator.error=Jina hili la uchaguzi limetumika +autoreply.name.blank.error=Tafadhali weka jina la moja kwa moja +autoreply.name.validator.error=Jina hili la moja kwa moja limetumika +announcement.name.blank.error=Tafadhali weka jina la tangazo +announcement.name.validator.error=Jina hili la tangazo limetumika +group.name.blank.error=Tafadhali weka jina la kikundi +group.name.validator.error=Jina hiki cha kikundi kimetumika #Jquery Validation messages jquery.validation.required=Nafasi hii yahitajika. @@ -672,11 +842,48 @@ jquery.validation.range=Tafadhali jaza nambari kati ya {0} na {1}. jquery.validation.max=Tafadhali jaza nambari isiyozidi {0}. jquery.validation.min=Tafadhali jaza nambari kubwa kuliko {0}. +# Webconnection common +webconnection.select.type=Chagua huduma ya wavuti au programu-tumizi ambayo utajiunga nayo: +webconnection.type=Chagua aina webconnection.title=Uhusiano wa mtandao wa {0} webconnection.label=Uhusiano wa mtandao webconnection.description=Husiana na mtandao webconnection.sorting=Panga moja kwa moja webconnection.configure=Sanidi huduma +webconnection.api=Expose API +webconnection.api.info=FrontlineSMS yaweza kusanidiwa kupokea maombi kutoka kwa huduma ya mbali na kuanzisha risala za kutoka. Kwa maelezo zaidi, angalia [this] +webconnection.api.enable.label=Wezesha API +webconnection.api.secret.label=Ufunguo wa siri wa API: +webconnection.api.disabled=API imelemazwa +webconnection.api.url=Anwani ya wavuti ya API + +# Webconnection - generic +webconnection.generic.label=Huduma zingine za wavuti +webconnection.generic.description=Tuma risala kwa huduma zingine za wavuti +webconnection.generic.subtitle=Muunganisho wa wavuti wa HTTP + +# Webconnection - Ushahidi/Crowdmap +webconnection.ushahidi.label=Crowdmap / Ushahidi +webconnection.ushahidi.description=Tuma risala kwa seva ya CrowdMap au Ushahidi. +webconnection.ushahidi.key.description=Ufunguo wa API wa Crowdmap au Ushahidi unaweza kupatikana katika mazingira ya tovuti ya Crowdmap au Ushahidi +webconnection.ushahidi.url.label=Anuani ya kupelekwa ya Ushahidi: +webconnection.ushahidi.key.label=Ufunguo wa API wa Ushahidi: +webconnection.crowdmap.url.label=Anuani ya kupelekwa ya Crowdmap: +webconnection.crowdmap.key.label=Ufunguo wa API wa Crowdmap: +webconnection.ushahidi.serviceType.label=Chagua huduma +webconnection.ushahidi.serviceType.crowdmap=Crowdmap +webconnection.ushahidi.serviceType.ushahidi=Ushahidi +webconnection.crowdmap.url.suffix.label=.crowdmap.com +webconnection.ushahidi.subtitle=Muunganisho wa wavuti kwa {0} +webconnection.ushahidi.service.label=Huduma: +webconnection.ushahidi.url.label=Anwani: +webconnection.ushahidi.fsmskey.label=Siri ya API ya FrontlineSMS: +webconnection.ushahidi.crowdmapkey.label=Ufunguo wa API wa Crowdmap/Ushahidi: +webconnection.ushahidi.keyword.label=Neno kuu: +webconnection.api.disabled=API imelemazwa +frontlinesms2.GenericWebconnection.url.validator.error=Anuani si halali (yafaa kuanza na http:// au https://) +frontlinesms2.UshahidiWebconnection.url.validator.error=Anuani si halali (yafaa kuanza na http:// au https://) + webconnection.confirm=Thibitisha webconnection.keyword.title=Weka risala zote zinazolingana na neno kuu hii: webconnection.all.messages=Haitatumia neno kuu. Risala zote zitawekwa katika Uhusiano wa mtandao huu. @@ -686,53 +893,56 @@ webconnection.httpMethod.post=POST webconnection.name.prompt=Ipe Uhusiano wa mtandao jina webconnection.details.label=Thibitisha melezo webconnection.parameters=Sanidi data itakayotumwa kwenye server -webconnection.parameters.confirm=Dhibitisha data iliyotumwa kwenye server +webconnection.parameters.confirm=Thibitisha data iliyotumwa kwenye server webconnection.keyword.label=Nemo Kuu: webconnection.none.label=Hakuna webconnection.url.label=Url ya Kompyuta Tumishi: webconnection.param.name=Jina: webconnection.param.value=Thamani: webconnection.add.anotherparam=Ongeza elezo + dynamicfield.message_body.label=Nakala ya Risala dynamicfield.message_body_with_keyword.label=Nakala ya Risala isiyo na neno kuu dynamicfield.message_src_number.label=Nambari ya Mwasili dynamicfield.message_src_name.label=Jina la Mwasili dynamicfield.message_timestamp.label=Wakati wa Risala + webconnection.keyword.validation.error=Neno kuu yahitajika webconnection.url.validation.error=Url yahitajika + webconnection.save=Uhusiano wa mtandao umewekwa! +webconnection.saved=Muunganisho wa wavuti umehifadhiwa! +webconnection.save.success=Muunganisho wa wavuti wa {0} umehifadhiwa! -webconnection.moreactions.delete=Toa Uhusiano wa mtandao -webconnection.moreactions.rename=Badilisha jina ya Uhusiano wa mtandao -webconnection.moreactions.edit=Hariri Uhusiano wa mtandao -webconnection.moreactions.export=Hamisha Uhusiano wa mtandao +webconnection.generic.service.label=Huduma: +webconnection.generic.httpMethod.label=Mbinu ya Http: +webconnection.generic.url.label=Anuani: +webconnection.generic.keyword.label=Upangaji wa moja kwa moja: +webconnection.generic.parameters.label=Habari iliyosanidiwa iliyotumwa kwa seva: +webconnection.generic.keyword.label=Neno kuu: +webconnection.generic.key.label=Ufunguo wa API: +frontlinesms2.Keyword.value.validator.error.frontlinesms2.UshahidiWebconnection.keyword.value=Thamana ya neno kuu si halali #Subscription i18n -subscription.title=Usajili wa {0} -subscription.info.group=Kikundi: {0} -subscription.info.groupMemberCount=wawasiliani {0} -subscription.info.keyword=Neno Kuu: {0} -subscription.info.joinAliases=Kuingia: {0} -subscription.info.leaveAliases=Kutoka: {0} -subscription.group.goto=Tazama Kukundi subscription.label=Usajili subscription.name.prompt=Patia Usajili Jina subscription.details.label=Thibitisha maelezo subscription.description=Ingia kikundi kwa kutumia Risala -subscription.select.group.keyword=Kikundi na Neno kuu subscription.select.group=Chagua kikundi cha usajili subscription.group.none.selected=Chagua kikundi subscription.autoreplies=Majibu ya moja kwa moja -subscription.aliases=Lakabu +subscription.sorting=TODO:Automatic sorting subscription.confirm=Thibitisha subscription.group.header=Chagua Kikundi subscription.group.description=Mwasiliani aweza ongezwa am kutolewa kwa kikundi wakati FrontlineSMS itapata risala iliyo na neno kuu -subscription.keyword.header=Neno Kuu -subscription.aliases.header=Lakabu +subscription.top.keyword.header=Andika maneno kuu ya ngazi ya juu (si lazima) +subscription.top.keyword.description=Unaweza kuandika maneno kuu kadhaa yaliyogawanyishwa na mkato. Ikiwa utatumia mtindo huu, ujumbe utapangwa katika usajili huu iwapo neno la kwanza litafanana na neno kuu +subscription.keywords.header=Andika maneno kuu kwa matendo ya usajili +subscription.keywords.description=Andika maneno kuu ya kujiunga na kuondoka kundi hili. Unaweza kuandika maneno zaidi ya moja kama yame tenganishwa na mkato subscription.default.action.header=Kitendo Msingi subscription.default.action.description=Wakati risala yafanana na neno kuu lakini hayafanani na lakabu zake, moja ya haya yatatendeka -subscription.aliases.leave=Lakabu za kutoka kkikundi -subscription.aliases.join=Lakabu za kuingia kikundi +subscription.keywords.leave=Maneno makuu yakujiondoa katika kikundi +subscription.keywords.join=Maneno makuu yakujiunga na kikundi subscription.default.action.join=Ongeza mwasiliani kwa kikundi subscription.default.action.leave=Toa mwasiliani kwa kikundi subscription.default.action.toggle=Ongeza ama Toa mwasiliani kutoka kwa kikundi @@ -759,11 +969,25 @@ subscription.leave=Toka subscription.keyword.required=Neno kuu yahitajika subscription.jointext.required=Risala yakuingia yahitajika subscription.leavetext.required=Risala yakutoka yahitajika + subscription.moreactions.delete=Toa usajili subscription.moreactions.rename=Badilisha jina ya usajili subscription.moreactions.edit=Hariri usajili subscription.moreactions.export=Hamisha usajili -subscription.group.required.error=Usajili lazime iwe na kikundi + +# Generic activity sorting +activity.generic.sorting=Upangaji wa moja kwa moja +activity.generic.sort.header=Upangaji wa moja kwa moja +activity.generic.sort.description=FrontlineSMS yaweza kuhamisha moja kwa moja risala zinazoingia katika kitendo hiki. Unaweza kufanya hivi kwa risala zote, au zile ambazo zinafanana na maneno kuu maalum +activity.generic.keywords.title=Andika maneno kuu ambayo lazima yafanane na risala. Waweza kuandika maneno mengi, ambayo yametenganishwa na mikato: +activity.generic.no.keywords.title=Usitumie neno kuu +activity.generic.no.keywords.description=Risala zote zinazoingia ambazo hazifanani na maneno kuu zozote zitaanzisha kitendo hiki +activity.generic.disable.sorting=Risala zisipangwe moja kwa moja +activity.generic.disable.sorting.description=Risala hazitahamishwa moja kwa moja katika kitendo hiki +activity.generic.enable.sorting=Panga risala zinazoingia ambazo zinafanana na neno kuu +activity.generic.sort.validation.unique.error=Maneno kuuu lazima yawe ya kipekee +activity.generic.keyword.in.use=Neno kuu {0} tayari linatumika katika kitendo {1} +activity.generic.global.keyword.in.use=Kitendo cha {0} kimewekwa kupokea risala zote ambazo hazifanani na maneno kuu mengine. Unaweza kuwa na kitendo moja ya kipekee yenye mazingira hii #basic authentication basic.authentication=Uthibitishaji wa Kimsingi @@ -773,3 +997,12 @@ basic.authentication.username=Jina la Mtumiaji basic.authentication.password=Nywila basic.authentication.confirm.password=Thibitisha Nywila basic.authentication.password.mismatch=Nywila hazifanani + +newfeatures.popup.title=Vipengele vipya +newfeatures.popup.showinfuture=Onyesha dirisha hii tenaTODO:Show this dialog in future +dynamicfield.message_text.label=Maandishi ya ujumbe +dynamicfield.message_text_with_keyword.label=Neno la ujumbe lenye neno kuu +dynamicfield.sender_name.label=Jina la mtumaji +dynamicfield.sender_number.label=Nambari la mtumiaji +dynamicfield.recipient_number.label=Nambari la mpokeaji +dynamicfield.recipient_name.label=Jina la mpokeaji diff --git a/plugins/frontlinesms-core/install/build.install4j b/plugins/frontlinesms-core/install/build.install4j index e08de9c14..9c8eac212 100644 --- a/plugins/frontlinesms-core/install/build.install4j +++ b/plugins/frontlinesms-core/install/build.install4j @@ -1,5 +1,5 @@ - + @@ -13,6 +13,7 @@ + @@ -32,7 +33,7 @@ - + @@ -61,6 +62,9 @@ + + + @@ -75,12 +79,12 @@ - + - -Dfrontlinesms.resource.path=~/.${compiler:app.shortName} + -Dfrontlinesms.resource.path=~/.${compiler:app.shortName}-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT @@ -113,7 +117,7 @@ - + @@ -124,7 +128,7 @@ - + @@ -137,7 +141,7 @@ - + @@ -148,7 +152,7 @@ - + @@ -167,7 +171,7 @@ - + @@ -178,7 +182,7 @@ - + @@ -197,7 +201,7 @@ - + @@ -210,7 +214,7 @@ - + @@ -227,7 +231,7 @@ - + @@ -238,7 +242,7 @@ - + @@ -246,7 +250,7 @@ context.getBooleanVariable("sys.confirmedUpdateInstallation") - + @@ -254,7 +258,7 @@ - + @@ -262,7 +266,7 @@ - + @@ -274,7 +278,7 @@ !context.getBooleanVariable("sys.programGroupDisabled") - + @@ -289,7 +293,7 @@ - + @@ -363,7 +367,7 @@ context.gotoScreen(context.getScreenById("12")); - + @@ -1177,7 +1181,7 @@ return valid; - + @@ -1247,7 +1251,7 @@ c.setCancelButtonVisible(false); - + @@ -1485,7 +1489,7 @@ return valid; - + @@ -1634,7 +1638,7 @@ To edit the information before submitting click BACK. - + @@ -1714,7 +1718,7 @@ f.send(formEnvironment,context); - + @@ -1729,7 +1733,7 @@ f.send(formEnvironment,context); - + @@ -1738,7 +1742,7 @@ f.send(formEnvironment,context); - + @@ -1750,7 +1754,7 @@ f.send(formEnvironment,context); - + @@ -1763,7 +1767,7 @@ f.send(formEnvironment,context); - + @@ -1776,7 +1780,7 @@ f.send(formEnvironment,context); - + @@ -1787,7 +1791,7 @@ f.send(formEnvironment,context); - + @@ -1798,7 +1802,7 @@ f.send(formEnvironment,context); - + @@ -1811,7 +1815,7 @@ f.send(formEnvironment,context); - + @@ -1829,7 +1833,7 @@ f.send(formEnvironment,context); - + @@ -1842,7 +1846,7 @@ f.send(formEnvironment,context); - + @@ -1854,7 +1858,7 @@ f.send(formEnvironment,context); - + @@ -1872,6 +1876,6 @@ f.send(formEnvironment,context); - + diff --git a/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties b/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties index 283328885..0b3bcd486 100644 --- a/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties +++ b/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties @@ -1,3 +1,3 @@ server.port=8130 -resource.path=~/.${install4j.app.shortName} +resource.path=~/.${install4j.app.shortName}-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT diff --git a/plugins/frontlinesms-core/install/frontlinesms-core.install.properties b/plugins/frontlinesms-core/install/frontlinesms-core.install.properties index 482f82e4b..7d7283728 100644 --- a/plugins/frontlinesms-core/install/frontlinesms-core.install.properties +++ b/plugins/frontlinesms-core/install/frontlinesms-core.install.properties @@ -3,11 +3,11 @@ install4j.releaseId=2.${build.version} install4j.app.shortName=frontlinesms2 # RELEASE and SNAPSHOT applicationIds will be automatically switched at build time as required install4j.applicationId.RELEASE=9038-1538-7100-7772 -install4j.applicationId=9038-1538-7100-7772 install4j.applicationId.SNAPSHOT=1111-2222-3333-4444 +install4j.applicationId=1111-2222-3333-4444 install4j.db.migrations.ENABLE= -install4j.db.migrations= install4j.db.migrations.DISABLE=-Ddb.migrations=false +install4j.db.migrations=-Ddb.migrations=false install4j.exe.name=FrontlineSMS2_Launcher install4j.exe.ico=./src/assemble/resources/FrontlineSMS.ico install4j.exe.icns=./src/assemble/resources/FrontlineSMS.icns diff --git a/plugins/frontlinesms-core/swahili b/plugins/frontlinesms-core/swahili new file mode 100644 index 000000000..6f84e17a4 --- /dev/null +++ b/plugins/frontlinesms-core/swahili @@ -0,0 +1,1008 @@ +# FrontlineSMS English translation by the FrontlineSMS team, Nairobi +language.name=Kiswahili + +# General info +app.version.label=Toleo + +# Common action imperatives - to be used for button labels and similar +action.ok=Sawa +action.close=Close +action.cancel=Katisha +action.done=Maliza +action.next=Ijayo +action.prev=Previous +action.back=Nyuma +action.create=Unda +action.edit=Hariri +action.rename=Badilisha Jina +action.save=Hifadhi +action.save.all=Hifadhi zote +action.delete=Futa +action.delete.all=Futa zote +action.send=Tuma +action.export=Pakia + +# Messages when FrontlineSMS server connection is lost +server.connection.fail.title=Muunganisho wako kwa server umepotea +server.connection.fail.info=Tafadhali anzisha FrontlineSMS, au funga dirisha hii + +#Connections: +connection.creation.failed=Kuunda kwa muunganisho huu umefeli +connection.route.destroyed=Njia imeunguka kutoka {0} mpaka {1} +connection.route.connecting=Unganisha... +connection.route.disconnecting=Ungua... +connection.route.successNotification=Njia imeundwa katika {0} na mafanikio +connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho +connection.route.destroyNotification=Njia imekatika katika {0} +connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka +connection.route.exception=TODO:{1} + +# Connection exception messages +connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari +connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM +connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi +connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa +connection.error.org.smslib.notconnectedexception=TODO:{0} +connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa +connection.error.java.io.ioexception=TODO:Port threw an error: {0} +connection.error.frontlinesms2.camel.exception.invalidapiidexception=TODO: {0} +connection.error.frontlinesms2.camel.exception.authenticationexception=TODO: {0} +connection.error.frontlinesms2.camel.exception.insufficientcreditexception=TODO:{0} +connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani +connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho +connection.header=Mazingira > Miunganisho > +connection.list.none=Huna miunganisho iliyo sanidiwa +connection.edit=Hariri mwunganisho +connection.delete=Futa muunganisho +connection.deleted=Muunganisho {0} umefutwa +connection.route.create=Unda mwunganisho +connection.add=Ongeza mwunganisho mpya +connection.createtest.message.label=Risala +connection.route.destroy=Ungua mwunganisho +connection.send.test.message=Tuma risala kama majaribio +connection.test.message=Pongezi kutoka FrontlineSMS \\o/ umefaulu kuunda {0} kutuma risala \\o/ +connection.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika +connection.select=Chagua aina ya mwunganisho +connection.type=Chagua aina +connection.details=Andika maelezo +connection.confirm=Thibitisha +connection.createtest.number=Nambari +connection.confirm.header=Thibitisha mazingira +connection.name.autoconfigured=Modemu {0} {1} katika port {2} imeongezwa + +status.connection.header=Miunganisho +status.connection.none=Hauna miunganisho iliyosanidiwa +status.devises.header=Vifaa vilivyotambulika +status.detect.modems=Tambua modemu +status.modems.none=Hakuna vifaa vinavyotambulika + +connectionstatus.not_connected=Haijaunganishwa +connectionstatus.connecting=Inaunganishwa +connectionstatus.connected=Imeunganishwa + +default.doesnt.match.message=Tabia [{0}] ya darasa [{1}]iliyo na kima [{2}] hailingani na ruwaza [{3}] inayohitajika +default.invalid.url.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio URL halali +default.invalid.creditCard.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio nabari halali ya kadi +default.invalid.email.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio barua pepe halali +default.invalid.range.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] +default.invalid.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] +default.invalid.max.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] +default.invalid.min.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] +default.invalid.max.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] +default.invalid.min.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] +default.invalid.validator.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipitishi mahitaji yanayohitajika kuhalalishwa +default.not.inlist.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipatikani kwenye orodha [{3}] +default.blank.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwachwa wazi +default.not.equal.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haiwezi kuwa sawa na [{3}] +default.null.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwa batilis +default.not.unique.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni lazma iwe ghali(unique) + +default.paginate.prev=Awali +default.paginate.next=Ijayo +default.boolean.true=Kweli +default.boolean.false=Uongo +default.date.format=dd MMMM, yyyy hh\:mm +default.number.format=0 + +default.unarchived=Tohifadhi +default.unarchive.failed=Kutohifadhi kwa {0} umefeli +default.trashed={0} imewekwa katika takataka +default.restored={0} imerudishwa +default.restore.failed=Haikuweza kurudisha {0} iliyo na kitambulisho {1} +default.archived={0} imehifadhiwa +default.archived.multiple={0} imehifadhiwa +default.created={0} imeundwa +default.created.message={0} {1} imeundwa +default.create.failed=Kuunda kwa {0} kumefeli +default.updated={0} imesasishwa +default.update.failed=Ilifeli kusasisha {0} iliyo na kitambulisho {1} +default.updated.multiple={0} imesasishwa +default.updated.message={0} imesasishwa +default.deleted={0} imefutwa +default.trashed={0} imewekwa katika takataka +default.trashed.multiple={0} imewekwa katika takataka +default.archived={0} imehifadhiwa +default.unarchived=Tohifadhi +default.unarchive.keyword.failed=Tohifadhi {0} imefeli, neno kuu au jina linatumika +default.unarchived.multiple={0} imetohifadhiwa +default.delete.failed=Kufutwa kwa {0} iliyo na kitambulisho {1} +default.notfound=Haikuweza kupata {0} na kitambulisho {0} +default.optimistic.locking.failure=Mtumiaji mwingine amesasisha {0} ulipokuwa ukihariri + +default.home.label=Nyumbani +default.list.label={0} Orodha +default.add.label=Ongeza {0} +default.new.label={0} mpya +default.create.label=Unda {0} +default.show.label=Onyesha {0} +default.edit.label=Hariri {0} +search.clear=Futa utafutaji + +default.button.create.label=Unda +default.button.edit.label=Hariri +default.button.update.label=Sasisha +default.button.delete.label=Futa +default.button.search.label=Tafuta +default.button.apply.label=Badilisha +default.button.delete.confirm.message=Uko na hakika? + +default.deleted.message={0} imefutwa + +# Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author) +typeMismatch.java.net.URL=Tabia {0} lazima iwe URL halali +typeMismatch.java.net.URI=Tabia {0} lazima iwe URI halali +typeMismatch.java.util.Date=Tabia {0} lazima iwe tarehe halali +typeMismatch.java.lang.Double=Tabia {0} lazima iwe nambari halali +typeMismatch.java.lang.Integer=Tabia {0} lazima iwe nambari halali +typeMismatch.java.lang.Long=Tabia {0} lazima iwe nambari halali +typeMismatch.java.lang.Short=Tabia {0} lazima iwe nambari halali +typeMismatch.java.math.BigDecimal=Tabia {0} lazima iwe nambari halali +typeMismatch.java.math.BigInteger=Tabia {0} lazima iwe nambari halali +typeMismatch.int =TODO: {0} lazima iwe nambari halali + +# Application specific messages +messages.trash.confirmation=Hiki kitendo kitafuta takataka na kufuta ujumbe wa kudumu. Je ungetaka kuendelea? +default.created.poll=Uchaguzi umeundwa\! +default.search.label=Futa utafutaji huu +default.search.betweendates.title=kati ya tarehe\: +default.search.moresearchoption.label=Utafutaji zaidi\: +default.search.date.format=d/M/yyyy +default.search.moreoption.label=Chaguo zaidi + +# SMSLib Fconnection +smslibfconnection.label=Simu/Modemu +smslibfconnection.type.label=Aina +smslibfconnection.name.label=Jina +smslibfconnection.manufacturer.label=Mtengenezaji +smslibfconnection.model.label=Mwanamitindo +smslibfconnection.port.label=Kituo tarishi +smslibfconnection.baud.label=Kiwango cha baud +smslibfconnection.pin.label=Utambuzi wa idadi +smslibfconnection.imsi.label=Utambulisho wa Kimataifa wa simu ya mteja +smslibfconnection.serial.label=Kufuatanisha cha kifaa\# +smslibfconnection.send.label= Tumia modemu kutuma risala +smslibfconnection.receive.label=Tumia modemu kupokea risala +smslibFconnection.send.validator.error.send=Modemu yafaa kutumika kutuma +smslibFconnection.receive.validator.error.receive=au kupokea risala +smslibfconnection.description=Unganisha kwa modemu za USB, serial na bluetooth au simu +smslibfconnection.global.info=FrontlineSMS itajaribu yenyewe kusanidi modemu au simu yoyote iliyoshikamana, lakini unaweza kuzisanidi hapa + +# Email Fconnection +emailfconnection.label=Barua pepe +emailfconnection.type.label=Aina +emailfconnection.name.label=Jina +emailfconnection.receiveProtocol.label=Itifaki +emailfconnection.serverName.label=Jina la server +emailfconnection.serverPort.label=Kituo tarishi cha server +emailfconnection.username.label=jina la mtumiaji +emailfconnection.password.label=nywila + +# CLickatell Fconnection +clickatellfconnection.label=Akaunti ya Clickatell +clickatellfconnection.type.label=Aina +clickatellfconnection.name.label=Jina +clickatellfconnection.apiId.label=Kitambulisho cha API +clickatellfconnection.username.label=jina la mtumiaji +clickatellfconnection.password.label=nywila +clickatellfconnection.description=Tuma na pokea risala kutumia akaunti ya Clickatell +clickatellfconnection.global.info=Utahitaji kusanidi akanuti na Clickatell (www.clickatell.com). + +# Smssync Fconnection +smssyncfconnection.label=SMSSync +smssyncfconnection.name.label=Jina +smssyncfconnection.type.label=Aina +smssyncfconnection.receiveEnabled.label=Kupokea kumewezeshwa +smssyncfconnection.sendEnabled.label=Kutuma kumewezeshwa +smssyncfconnection.secret.label=Siri +smssyncfconnection.description=Tumia simu ya Android ambayo ina programu ya Smssync pamoja na FrontlineSMS kutuma na kupokea SMS +smssyncfconnection.field.secret.info=Kwenye programu yako ya SMSsync, weka siri ifanane na uga huu +smssyncfconnection.global.info=Pakua programu ya SMSSync kutoka kwa smssync.ushahidi.com + +# Messages Tab +message.create.prompt=Andika risala +message.character.count=Nafasi iliyobaki ni {0}. Risala {1} +message.character.count.warning=Idadi ya maneno inaweza kuongezeka baada ya kufanya mabadilisho +announcement.label=Tangazo +announcement.description=Tuma risala za tangazo na uyapange majibu +announcement.info1=Tangazo limeundwa na risala zikaongezwa kwenye foleni ya risala zitakazotumwa +announcement.info2=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao +announcement.info3=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri' +announcement.info4=Kutazama tangazo, ibonyeze katika menyu iliyo pande ya kushoto +announcement.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika +announcement.select.recipients=Chagua wapokeaji +announcement.confirm=Thibitisha +announcement.delete.warn=Onyo la kufuta {0}\: Hutaweza kurejesha tangazo\! +announcement.prompt=Ipe jina tangazo hili +announcement.confirm.message=Thibitisha risala +announcement.details.label=Thibitisha vipengele +announcement.message.label=Risala +announcement.message.none=Hakuna +announcement.recipients.label=Wapokeaji +announcement.create.message=Andika risala + +announcement.recipients.count=wapokeaji waliochaguliwa +announcement.messages.count=risala zitatumwa +announcement.moreactions.delete=Futa tangazo +announcement.moreactions.rename=Badilisha jina la tangazo +announcement.moreactions.edit=Hariri tangazo +announcement.moreactions.export=Pakia tangazo +frontlinesms2.Announcement.name.unique.error.frontlinesms2.Announcement.name=Jina "{2}" lazima liwe lakipekee + + +archive.inbox=Hifadhi kisanduku pokezi +archive.sent=Hifadhi kisanduku cha risala zilizotumwa +archive.activity=Hifadhi matendo +archive.folder=Hifadhi folda +archive.folder.name=Jina +archive.folder.date=Tarehe +archive.folder.messages=Risala +archive.folder.none=  Hakuna faili zilizohifadhiwa +archive.activity.name=Jina +archive.activity.type=Aina +archive.activity.date=Tarehe +archive.activity.messages=Risala +archive.activity.list.none=  Hakuna matendo yaliyohiifadhiwa + +autoreply.enter.keyword=Neno kuu +autoreply.create.message=Weka risala +activity.autoreply.sort.description=FrontineSMS yaweza kujibu risala zinazoingia ambazo zinaanza na neno kuu, na kuhamisha ujumbe unaoingia katika kitendo hiki. Waweza kufanya hivi kwa risala zote, au zile pekee zinazofanana an maneno kuu maalum +activity.autoreply.disable.sorting.description=Risala hazitajibiwa moja kwa moja au kuhamishwa katika kitendo hiki +autoreply.confirm=Thibitisha +autoreply.name.label=Risala +autoreply.details.label=Thibitisha maelezo +autoreply.label=Jibu la moja kwa moja +autoreply.keyword.label=Neno kuu +autoreply.description=Jibu risala zijazo moja kwa moja +autoreply.info=Moja kwa moja imeundwa. Risala yoyote ambayo iko na neno kuu itaongezwa katika moja kwa moja hii, ambayo inaweza kutazamwa ukiibonyeza kwa menyu iliyo upande wa kulia. +autoreply.info.warning=Moja kwa moja bila neno kuu itatumwa kwa risala zote zijazo +autoreply.info.note=Kumbuka\: Ukihifadhi hili jibu la moja kwa moja, risala zijazo hazitapangwa na hili jibu la moja kwa moja. +autoreply.validation.prompt=Tafadhali jaza taarifa zote zinazohitajika +autoreply.message.title=Risala itakayotumwa ya hili jibu la moja kwa moja\: +autoreply.keyword.title=Panga risala za jibu la moja kwa moja ukitumia hili Neno Kuu\: +autoreply.name.prompt=Ipe jina hii jibu ya moja kwa moja +autoreply.message.count=nafasi 0 (Risala 1) +autoreply.moreactions.delete=Futa jibu la moja kwa moja +autoreply.moreactions.rename=Badilisha jina la jibu la moja kwa moja +autoreply.moreactions.edit=Hariri jibu la moja kwa moja +autoreply.moreactions.export=Hamisha jibu la moja kwa moja +autoreply.all.messages=Usitumie neno kuu (Risala zote zijazo zitapokea hili jibu la moja kwa moja) +autoreply.text.none=Hamna +frontlinesms2.Autoreply.name.unique.error.frontlinesms2.Autoreply.name=Jina "{2}" lazima liwe lakipekee +frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=TODO:Autoreply name must be unique +frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Neno kuu "{2}" limetumiwa +frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=Risala haiwezi kuwa tupu + +autoforward.title=Autoforward ya {0} +autoforward.label=Autoforward +autoforward.description=Tuma mbele risala zinazoingia moja kwa moja kwa waasiliani +autoforward.recipientcount.current=Wapokeaji {0} hivi sasa +autoforward.create.message=Andika ujumbe +autoforward.confirm=Thibitisha +autoforward.recipients=Wapokeaji +autoforward.name.prompt=Taja Autoforward hii +autoforward.details.label=Thibitisha vipengele +autoforward.keyword.label=Neno/Maneno kuu +autoforward.name.label=Ujumbe +autoforward.contacts=Waasiliani +autoforward.groups=Vikundi +autoforward.info=Autoforward imetengenezwa, risala zozote ambazo zina neno kuu lako zitaongezwa kwa kitendo hiki ambazo zinaweza kutazamwa kwa kukibonyeza kwenye menyu iliyo upande wa kulia +autoforward.info.warning=Autoforward ambayo haina neno kuu itasababisha risala zote zinazoingia kutumwa mbele +autoforward.info.note=Kumbuka: Ikiwa utatohifadhi Autoforward, risala zinazoingia hazitapangwa kwa ajili yake. +autoforward.save=Autoforward imehifadhiwa! +autoforward.save.success=Autoforward ya {0} imehifadhiwa! +autoforward.global.keyword=Hakuna: (risala zote zinazoingia zitasindikwa) +autoforward.disabled.keyword=Hakuna (upangaji wa moja kwa moja haujawezeshwa) +autoforward.keyword.none.generic=Hakuna +autoforward.groups.none=Hakuna +autoforward.contacts.none=Hakuna +autoforward.message.format=Ujumbe + +contact.new=Mwasiliani mpya +contact.list.no.contact=Hakuna Waasiliani hapa\! +contact.header=Waasiliani +contact.all.contacts=Waasiliani wote ({0}) +contact.create=Unda mwasiliani mpya +contact.groups.header=Vikundi +contact.create.group=Unda kikundi kipya +contact.smartgroup.header=Vikundi-erevu +contact.create.smartgroup=Unda kikundi-erevu kipya +contact.add.to.group=Ongezea kikundi... +contact.remove.from.group=Toa kutoka kikundi +contact.customfield.addmoreinformation=Ongeza habari zaidi... +contact.customfield.option.createnew=Unda mpya... +contact.name.label=Jina +contact.phonenumber.label=Nambari ya simu +contact.phonenumber.international.warning=Nambari hii haiko katika international format. Yaweza leta shida kulinganisha na wawasiliani +contact.notes.label=Vidokezi +contact.email.label=Barua pepe +contact.groups.label=Vikundi +contact.notinanygroup.label=Haiko kwa kikundi chochote +contact.messages.label=Risala +contact.sent.messages=Risala zilizotumwa +contact.received.messages=Risala zilizopokewa +contact.search.messages=Tafuta risala +contact.select.all=Chagua wote +contact.not.found=Mwasiliani hapatikani +group.not.found=Kikundi hakipatikani +smartgroup.not.found=Kikundi-erevu hakipatikani + +group.rename=Badilisha Jina la kikundi +group.edit=Hariri kikundi +group.delete=Futa kikundi +group.moreactions=Vitendo zaidi... + +customfield.validation.prompt=Tafadhali jaza jina +customfield.validation.error=Jina limetumika +customfield.name.label=Jina +export.contact.info=Kupakia waasiliani kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa. +export.message.info=Kupakia risala kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa.. +export.selectformat=Chagua fomati +export.csv=Fomati ya CSV itakayotumiwa na spreadsheet +export.pdf=Fomati ya PDF ili uweze kuchapisha +folder.name.label=Jina +group.delete.prompt=Uko na hakika ungetaka kufuta {0}? Ilani\: Hutaweza kuirejesha. +layout.settings.header=Mazingira +activities.header=Vitendo +activities.create=Chagua kitendo kipya +folder.header=Folda +folder.create=Chagua folda mpya +folder.label=Folda +message.folder.header=Folda ya {0} +fmessage.trash.actions=Vitendo kuhusu takataka +fmessage.trash.empty=Futa takataka +fmessage.to.label=Kwenda kwa +trash.empty.prompt=Risala na vitendo vyote kwenye takataka zitafutwa kabisa +fmessage.responses.total=Majibu kwa ujumla {0} +fmessage.label=Risala +fmessage.label.multiple={0} risala +poll.prompt=Ipe jina uchaguzi huu +poll.details.label=Thibitisha vipengele +poll.message.label=Risala +poll.choice.validation.error.deleting.response=Huwezi futa chagua iliyowekwa +poll.alias=Malakabu +poll.keywords=Maneno kuu +poll.aliases.prompt=Andika malakabu yanayolingana na majibu. +poll.aliases.prompt.details=Malakabu hayo yatenganishwe na koma. Lakabu ya kwanza litatumwa katika risala. +poll.response.keyword=Weka maneno kuu ya majibu +poll.set.keyword=Weka neno kuu la ngazi ya juu +poll.keywords.validation.error=Maneno kuu lazima yawe ya kipekee +poll.sort.label=Panga moja kwa moja +poll.autosort.no.description=Risala hazitapangwa moja kwa moja +poll.autosort.description=Panga risala kulingana na neno kuu +poll.sort.keyword=neno kuu +poll.sort.by=Panga risala kulingana na neno kuu +poll.autoreply.label=Jibu la moja kwa moja +poll.autoreply.none=Hakuna +poll.recipients.label=Wapokeaji +poll.recipients.none=Hakuna +poll.toplevelkeyword=Maneno kuu ya ngazi ya juu + +#TODO embed javascript values +poll.recipients.count=Wapokeaji wamechaguliwa +poll.messages.count=Risala zitatumwa +poll.yes=Ndio +poll.no=La +poll.label=Uchaguzi +poll.description=Tuma swali na uchambue majibu +poll.messages.sent=risala {0} zimetumwa +poll.response.enabled=Majibu ya moja kwa moja yamewezeshwa +poll.message.edit=Hariri risala itakayotumiwa mpokeaji +poll.message.prompt=Risala hii itatumiwa wapokeaji wa uchaguzi huu +poll.message.count=Nafasi 160 zimebaki (Risala 1) + +poll.moreactions.delete=Futa uchaguzi +poll.moreactions.rename=Badilisha jina la uchaguzi +poll.moreactions.edit=Hariri uchaguzi +poll.moreactions.export=Pakia uchaguzi + +folder.moreactions.delete=Futa folda +folder.moreactions.rename=Badilisha jina la folda +folder.moreactions.export=Pakia folda + + +#TODO embed javascript values +poll.reply.text=Jibu "{0} {1}" kujibu Ndio, "{2} {3}" kujibu La. +poll.reply.text1={0} "{1} {2}" kujibu {3} +poll.reply.text2=Tafadhali jibu 'Ndio' au 'La' +poll.reply.text3=ama +poll.reply.text4={0} {1} +poll.reply.text5=Jibu +poll.reply.text6=Tafadhali jibu +poll.message.send={0} {1} +poll.recipients.validation.error=Chagua waasiliani wa kutumia risala +frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name =TODO: {1} {0} "{2}" must be unique +frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=Aina ya majibu haziwezi kuwa sawa +frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value =Neno kuu "{2}" tayari linatumika + +wizard.title.new=Mpya +wizard.fmessage.edit.title=Hariri {0} +popup.title.saved={0} imewekwa\! +popup.activity.create=Unda Shughuli Mpya \: Chagua aina +popup.smartgroup.create=Unda kikundi-erevu +popup.help.title=Msaada +smallpopup.customfield.create.title=Unda Custom Field +smallpopup.group.rename.title=Badilisha jina la kikundi +smallpopup.group.edit.title=Hariri kikundi +smallpopup.group.delete.title=Futa kikundi +smallpopup.fmessage.rename.title=Badilisha jina la {0} +smallpopup.fmessage.delete.title=Futa {0} +smallpopup.fmessage.export.title=Pakia +smallpopup.delete.prompt=Futa {0} ? +smallpopup.delete.many.prompt=Futa {0} contacts? +smallpopup.empty.trash.prompt=Mwaga Tupio? +smallpopup.messages.export.title=Pakia Matokeo ({0} risala) +smallpopup.test.message.title=Risala jaribio +smallpopup.recipients.title=Wapokeaji +smallpopup.folder.title=Folda +smallpopup.group.title=Kikundi +smallpopup.contact.export.title=Pakia +smallpopup.contact.delete.title=Futa +contact.selected.many=wapokeaji waliyochaguliwa {0} +group.join.reply.message=Karibu +group.leave.reply.message=Kwaheri +fmessage.new.info=Ume pokea risala {0}. Bonyeza kuona +wizard.quickmessage.title=Risala ya haraka +wizard.messages.replyall.title=Jibu zote +wizard.send.message.title=Tuma Risala +wizard.ok=Sawa +wizard.create=Unda +wizard.send=Tuma +common.settings=Mazingira +common.help=TODO:Help + +validation.nospaces.error=usiache nafasi kwenye neno +activity.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika +autoreply.blank.keyword=Neno Kuu tupu. Jibi litatumwa kwa risala zote zijazo + + +poll.type.prompt=Chagua aina ya uchaguzi unaotaka kuunda +poll.question.yes.no=Swali linalo jibu 'ndio' au 'la' +poll.question.multiple=Swali linalo majibu mengi (k.m 'Nyekundu', 'Samawati', 'Kijani Kibichi') +poll.question.prompt=Andika swali +poll.message.none=Usitume risala na uchaguzi huu (kusanya majibu pekee). +poll.replies.header=Tuma jibu moja kwa moja wa uchaguzi huu(kwa hiari yako) +poll.replies.description=Ukipokea risala inayolingana na jibu la uchaguzi huu, tuma risala kwa mtumaji aliyetuma jibu hilo +poll.autoreply.send=Tuma risala ya moja kwa moja kwa watumaji wa majibu ya uchaguzi huu +poll.responses.prompt=Andika majibu unayotarajia (Kati ya 2 hadi 5) +poll.sort.header=Panga risala kulingana na neno kuu (kwa hiari yako) +poll.sort.description=Watumaji risala watakapotuma majibu wakitumia neno kuu, FrontlineSMS inaweza kupanga risala hizo kulingana na neno hilo +poll.no.automatic.sort=Usipange risala kulingana na neno kuu +poll.sort.automatically=Panga risala zinazotumia hili neno kuu moja kwa moja +poll.validation.prompt=Jaza sehemu zote zinazohitajika +poll.name.validator.error.name=Majina ya uchaguzi lazima yawe ya kipekee +pollResponse.value.blank.value=thamana ya jibu la uchaguzi haiwezi kuwa tupu +poll.keywords.validation.error.invalid.keyword=Neno kuu si halali, jaribu jina au neno lingine +poll.question=Andika swali +poll.response=Orodha ya majibu +poll.sort=Panga moja kwa moja +poll.reply=Majibu ya moja kwa moja +poll.edit.message=Hariri risala +poll.recipients=Chagua wapokeaji +poll.confirm=Thibitisha +poll.save=Uchaguzi umehifadhiwa! +poll.save.success=Uchaguzi wa {0} umehifadhiwa! +poll.messages.queue=Risala zimeongezwa kwenye foleni ya risali 'zinazosubiri'. +poll.messages.queue.status=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao. +poll.pending.messages=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri'. +poll.send.messages.none=Hamna risala zitakazotumwa +quickmessage.details.label=Thibitisha vipengele +quickmessage.message.label=Risala +quickmessage.message.none=Hakuna +quickmessage.recipient.label=Mpokeaji +quickmessage.recipients.label=Wapokeaji +quickmessage.message.count=Nafasi 160 zimebaki (Risala 1) +quickmessage.enter.message=Andika risala +quickmessage.select.recipients=Chagua Wapokeaji +quickmessage.confirm=Thibitisha +#TODO embed javascript values +quickmessage.recipients.count=Wapokeaji wamechaguliwa +quickmessage.messages.count=risala zitatumwa +quickmessage.count.label=Hesabu ya Risala\: +quickmessage.messages.label=Andika risala +quickmessage.phonenumber.label=Ongeza nambari ya simu\: +quickmessage.phonenumber.add=Ongeza +quickmessage.selected.recipients=wapokeaji wamechaguliwa +quickmessage.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika + +fmessage.number.error=Umeongeza maandishi yasiyo nambari hapa, utakapoweka maandishi yasiyo nambari yatatolewa +search.filter.label=Zuwuia utafutaji uwe katika\: +search.filter.group=Chagua kikundi +search.filter.activities=Tafuta kwa vitendo na folda +search.filter.messages.all=Zote zilizotumwa na kupokewa +search.filter.inbox=Risala zilizopokewa pekee +search.filter.sent=Risala zilizotumwa pekee +search.filter.archive=Tafuta kwenye hifadhi +search.betweendates.label=Kati ya tarehe +search.header=Tafuta +search.quickmessage=Tuma risala +search.export=Pakia matokeo +search.keyword.label=Neno kuu +search.contact.name.label=Jina la mpokeaji +search.contact.name=Jina la mpokeaji +search.result.header=Matokeo +search.moreoptions.label=Chaguo zaidi +settings.general=Kwa ujumla +settings.connections=Simu na miunganisho +settings.logs=Mfumo +settings.general.header=Mazingira > Kwa ujumla +settings.logs.header=Mazingira > logi za mfumo +logs.none=Huna logi. +logs.content=Risala +logs.date=Wakati +logs.filter.label=Onyesha logi za +logs.filter.anytime=Saa zote +logs.filter.1day=Masaa 24 yaliyopita +logs.filter.3days=Siku 3 zilizopita +logs.filter.7days=Siku 7 zilizopita +logs.filter.14days=Siku 14 zilizopita +logs.filter.28days=Siku 28 zilizopita +logs.download.label=Chukua logi +logs.download.buttontext=Chukua logi +logs.download.title=Chukua logi ilizitumwe +logs.download.continue=Endelea + +smartgroup.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika. Unaweza kuchagua amri moja pekee katika sehemu yeyote +smartgroup.info=Kuunda kundi , chagua amri zitakazofuatwa na Waasiliani ili wawe kwatika kikundi hiki +smartgroup.contains.label=iliyo na neno +smartgroup.startswith.label=inayoanza na +smartgroup.add.anotherrule=Ongeza amri nyingine +smartgroup.name.label=Jina + +modem.port=Kituo tarishi +modem.description=Maelezo +modem.locked=Imefungwa? +traffic.header=Trafiki +traffic.update.chart=Sasisha chati +traffic.filter.2weeks=Onyesha wiki mbili zilizopita +traffic.filter.between.dates=Kati ya tarehe +traffic.filter.reset=Rudisha mwanzo +traffic.allgroups=Onyesha vikundi vyote +traffic.all.folders.activities=Onyesha matendo na faili zote +traffic.sent=Risala zilizotumwa +traffic.received=Imepokewa +traffic.total=Kwa ujumla + +tab.message=Risala +tab.archive=Hifadhi +tab.contact=Waasiliani +tab.status=Hali +tab.search=Tafuta + +help.info=Hili ni toleo la beta kwa hivyo haijajengewa usaidiza. Tafadhali tazama ukumbi wa watumizi kupata usaidizi zaidi + +# IntelliSms Fconnection +intellismsfconnection.label=Akaunti ya IntelliSms +intellismsfconnection.type.label=Aina +intellismsfconnection.name.label=Jina +intellismsfconnection.username.label=Jina la mtumiaji +intellismsfconnection.password.label=Nywila + +intellismsfconnection.send.label=Tumia kutuma risala +intellismsfconnection.receive.label=Tumia kupokea risala +intellismsfconnection.receiveProtocol.label=Protokoli +intellismsfconnection.serverName.label=Jina la server +intellismsfconnection.serverPort.label=Kituo cha server +intellismsfconnection.emailUserName.label=Jina la mtumiaji +intellismsfconnection.emailPassword.label=Nywila +intellismsfconnection.description=Tuma na upokee risala kwa kutumia akaunti ya Intellisms +intellismsfconnection.global.info=Utahitajike kusanidi akaunti na Intellisms (www.intellisms.co.uk). + +#Controllers +contact.label=Mwasiliani +contact.edited.by.another.user=Mtumiaji mwingine amesasisha rekodi hii ulipokuwa ukihariri +contact.exists.prompt=Kuko na mwasiliani mwingine anayetumia hiyo nambari +contact.exists.warn=Kuko na mwasiliani anayetumia hiyo nambari. Huwezi kuunda nyingine inayofanana\! +contact.view.duplicate=Tazama inayofanana +contact.addtogroup.error=Huwezi kuongeza na kutoa kutoka kikundi kimoja +contact.mobile.label=Nambari ya simu +contact.email.label=Barua pepe +fconnection.label=Fconnection +fconnection.name=Fconnection +fconnection.unknown.type=Mwunganisho usiojulikana +fconnection.test.message.sent=Risala ya jaribio imetumwa\! +announcement.saved=Tangazo limewekwa na risala zikaongezwa kwenye foleni ili zitumwe +announcement.not.saved=Tangazo halikuweza kuwekwa +announcement.save.success=Tangazo la {0} limehifadhiwa! +announcement.id.exist.not=Tangazo lililo na kitambulisho {0} halikupatikana + +autoreply.save.success=Tangazo la moja kwa moja la {0} limehifadhiwa! +autoreply.not.saved=Jibu la moja kwa moja halijaweza kuwekwa +report.creation.error=Kulikuwa na kosa katika hali ya kuunda ripoti +export.message.title=Kupakia kwa risala za FrontlineSMS +export.database.id=Kitambulisho cha hifadhidata +export.message.date.created=Tarehe ya kuundwa +export.message.text=Andiko +export.message.destination.name=Jina la fikio +export.message.destination.mobile=Nambari la fikio +export.message.source.name=Jina la chanzo +export.message.source.mobile=Nambari ya chanzo +export.contact.title=Kupakia kwa waasiliani wa FrontlineSMS +export.contact.name=Jina +export.contact.mobile=Nambari +export.contact.email=Barua pepe +export.contact.notes=Madondo +export.contact.groups=Vikundi +export.messages.name1={0} {1} ({2} risala) +export.messages.name2={0} ({1} risala) +export.contacts.name1={0} kundi ({1} waasiliani) +export.contacts.name2={0} kundi erevu (waasiliani {1}) +export.contacts.name3=Waasiliani wote (waasiliani {0}) +folder.label=Folda +folder.archived.successfully=Folda imehifadhiwa vizuri\! +folder.unarchived.successfully=Folda imerejeshwa vizuri\! +folder.trashed=Folda imesongeshwa kwa takataka\! +folder.restored=Folda imerejeshwa\! +folder.exist.not=Folda iliyo na kitambulisho {0} haikuweza kupatikana +folder.renamed=Jina la folda limebadilishwa + +group.label=Kundi +group.name.label=Jina +group.update.success=Kundi limesasishwa vizuri +group.save.fail=Kundi halijawekwa vizuri +group.delete.fail=Kundi halikuweza kufutwa + +import.label=Ingiliza +import.backup.label=Ingiliza data kutoka hifadhi ya hapo mbeleni +import.prompt.type=Chagua aina ya data utakayoingiliza +import.contacts=Maelezo ya waasiliani +import.messages=Maelezo ya risala +import.version1.info=Kuingiliza data kutoka version 1, yapakie kwa lugha ya Kiingereza +import.prompt=Chagua faili utakayoingiliza +import.upload.failed=Kupakia kwa faili hiyo kumefeli +import.contact.save.error=Kulikuwa na kosa katika kuwekwa kwa mwasiliani +import.contact.complete=Waasiliani {0} wameinglizwa; {1} wamefeli +import.contact.failed.download=Unda CSV ya waasiliani zilizofeli +import.message.save.error=Kulikuwa na kosa katika kuwekwa kwa risala +import.message.complete=Risala {0} zimeingilizwa; {1} zikafeli + +many.selected ={1} {0} zimechaguliwa + +flash.message.activity.found.not=Kitendo hakijaweza kupatikana +flash.message.folder.found.not=Folda haikuweza kupatikana +flash.message=Risala +flash.message.fmessage=risala {0} +flash.message.fmessages.many=Risala {0} za SMS +flash.message.fmessages.many.one=Risala 1 ya SMS +fmessage.exist.not=Risala iliyo na kitambulisho {0} haijapatikana +flash.message.poll.queued=Uchaguzi umewekwa na risala zikapangwa kwenye foleni ili zitumwe + +flash.message.poll.not.saved=Uchaguzi haukuweza kuwekwa +system.notification.ok=Sawa +system.notification.fail=Imefeli +flash.smartgroup.delete.unable=Kikundi-erevu haukuweza kufutwa +flash.smartgroup.saved=Kikundi-erevu {0} kimewekwa +flash.smartgroup.save.failed=Kuweka kwa kundi-erevu kumefeli. Kosa likuwa {0} +smartgroup.id.exist.not=Kundi-erevu lililo na kitambulisho {0} hakipatikana +smartgroup.save.failed=Kundi-erevu {0} kilifeli kuwekwa kilicho na {1}{2} Makosa\: {3} +contact.name.label=Jina +contact.phonenumber.label=Nambari ya simu + +searchdescriptor.searching=Inatufuta +searchdescriptor.all.messages=Risala zote +searchdescriptor.archived.messages=, ikiwa na risala zilizohifadhiwa +searchdescriptor.exclude.archived.messages=isiyo na risala zilizohifadhiwa +searchdescriptor.only=, pekee {0} +searchdescriptor.between=, kati ya {0} na {1} +searchdescriptor.from=, kutoka {0} +searchdescriptor.until=, hadi {0} +poll.title=Uchaguzi wa {0} +announcement.title=Tangazo la {0} +autoreply.title=Jibu la Moja Kwa Moja ya {0} +folder.title={0} folda +frontlinesms.welcome=Karibu FrontlineSMS\! \\o/ +failed.pending.fmessages=Risala {0} zinazosuburi zimefeli. Enda kwenye sehemu ya risala zinazosuburi kuziona. + +subscription.title=Usajili wa {0} +subscription.info.group=Kikundi: {0} +subscription.info.groupMemberCount=wawasiliani {0} +subscription.info.keyword=Neno Kuu: {0} +subscription.sorting.disable=Lemaza upangaji wa moja kwa moja +subscription.info.joinKeywords=Kujiunga: {0} +subscription.info.leaveKeywords=Kuondoka: {0} +subscription.group.goto=Tazama Kukundi +subscription.group.required.error=Usajili lazime iwe na kikundi +subscription.save.success=Usajili wa {0} umehifadhiwa! + +language.label=Lugha +language.prompt=Badilisha lugha unayotumia kwa FrontlineSMS +frontlinesms.user.support=usaidizi wa watumiaji kutoka FrontlineSMS +download.logs.info1=Onyo\: Kundi la FrontlineSMS haliwezi kujibu maswali yako moja kwa moja. Ikiwa uko na maswali kuhusu utumiaji, Tafadhali angalia katika 'Msaada' ili uweze kupata majibu hapo. Usipofaulu, ripoti matatizo yako kwa usaidizi wa watumiaji\: +download.logs.info2=watumiaji wengine wanaweza kuwa wameripoti shida inayolingana na wakapata suluhisho\! kuendelea na kutuma logi ulizonazo Tafadhali bonyeza 'Endelea' + +# Configuration location info +configuration.location.title=Mahala pa usanidi +configuration.location.instructions=Waweza kupata programu-tumizi yako katika {1}. Faili hizi ni pamoja na hifadhidata yako na mazingira mengine, ambazo ungeari kucheleza mahali pengine + +dynamicfield.contact_name.label=Jina la mwasiliani +dynamicfield.contact_number.label=Nambari ya simu ya mwasiliani +dynamicfield.keyword.label=Neno kuu +dynamicfield.message_content.label=Mwili wa risala + +# Fmessage domain +fmessage.queued=Risala imewekwa kwenye foleni ili itumiwe {0} +fmessage.queued.multiple=Risala imewekwa kwenye ili itumiwe {0} +fmessage.retry.success=Risala imewekwa kwenye foleni tena ili itumiwe {0} +fmessage.retry.success.multiple=Risala {0} zimewekwa kwenye foleni tena ili zitumwe +fmessage.displayName.label=Jina +fmessage.text.label=Risala +fmessage.date.label=Tarehe +fmessage.to=Kwa\: {0} +fmessage.to.multiple=Kwa\: watu {0} +fmessage.quickmessage=Risala ya haraka +fmessage.archive=Hifadhi +fmessage.activity.archive=Hifadhi {0} +fmessage.unarchive=Rejesha +fmessage.export=Hamisha +fmessage.rename=Badilisha jina {0} +fmessage.edit=Hariri {0} +fmessage.delete=Futa +fmessage.moreactions=Vitendo zaidi... +fmessage.footer.show=Onyesha +fmessage.footer.show.failed=Ilifeli +fmessage.footer.show.all=Yote +fmessage.footer.show.starred=Risala zenye nyota +fmessage.footer.show.incoming=Zinazoingia +fmessage.footer.show.outgoing=Zinazotoka +fmessage.archive.back=Rudi nyuma +fmessage.activity.sentmessage=(risala {0} zimetumwa) +fmessage.failed=Imefeli +fmessage.header=Risala +fmessage.section.inbox=Kisanduku pokezi +fmessage.section.sent=Risala zilizotumwa +fmessage.section.pending=Risala zitakazotumwa +fmessage.section.trash=Takataka +fmessage.addsender=Weka kwenye waasiliani +fmessage.resend=Tuma tena +fmessage.retry=Rudia +fmessage.reply=Jibu +fmessage.forward=Tuma +fmessage.unarchive=Rejesha +fmessage.delete=Futa +fmessage.messages.none=Hakuna risala hapa\! +fmessage.selected.none=Hakuna risala iliyochaguliwa +fmessage.move.to.header=Songesha risala kwa... +fmessage.move.to.inbox=Kisanduku pokezi +fmessage.archive.many=Hifadhi zote +fmessage.count=risala 1 +fmessage.count.many=risala {0} +fmessage.many=Risala +fmessage.delete.many=Futa zote +fmessage.reply.many=Jibu zote +fmessage.restore=Rudisha +fmessage.restore.many=Rudisha +fmessage.retry.many=Kurudia haikufaulu +fmessage.selected.many=Risala {0} zimechaguliwa +fmessage.unarchive.many=Rejesha zote + +# TODO move to poll.* +fmessage.showpolldetails=Onyesha grafu +fmessage.hidepolldetails=Ficha grafu + +# TODO move to search.* +fmessage.search.none=Hamna risala zilizopaikana +fmessage.search.description=Anza kutafuta upya kushoto + +fmessage.connection.receivedon=Ilipokewa tarehe: + +activity.name=Jina +activity.delete.prompt=Hamisha {0} ziende kwa takataka . Kitendo hiki kitahamisha risala zote ziende kwa takataka +activity.label=Kitendo +activity.categorize=Weka majibu kwa kategoria zinazofaa + +magicwand.title=Tumia neno la ubadilifu +folder.create.success=Folda kimeundwa vyema +folder.create.failed=Kuunda kwa folda kumefeli +folder.name.validator.error=Jina hili la folda limetumika +folder.name.blank.error=Tafadhali weka jina la folda +poll.name.blank.error=Tafadhali weka jina la uchaguzi +poll.name.validator.error=Jina hili la uchaguzi limetumika +autoreply.name.blank.error=Tafadhali weka jina la moja kwa moja +autoreply.name.validator.error=Jina hili la moja kwa moja limetumika +announcement.name.blank.error=Tafadhali weka jina la tangazo +announcement.name.validator.error=Jina hili la tangazo limetumika +group.name.blank.error=Tafadhali weka jina la kikundi +group.name.validator.error=Jina hiki cha kikundi kimetumika + +#Jquery Validation messages +jquery.validation.required=Nafasi hii yahitajika. +jquery.validation.remote=Tafadhali jaza nafasi hii. +jquery.validation.email=Tafadhali jaza barua pepe halisi. +jquery.validation.url=Tafadhali jaza URL. +jquery.validation.date=Tafadhali jaza siku halisi. +jquery.validation.dateISO=Tafadhali jaza siku(ISO) halisi. +jquery.validation.number=Tafadhali jaza nambari. +jquery.validation.digits=Tafadhali jaza nambari pekee. +jquery.validation.creditcard=Tafadhali jaza nambari halisi. +jquery.validation.equalto=Tafadhali jaza nafasi hii na neno sawa. +jquery.validation.accept=Tafadhali jaza nafasi hii na neno halisi. +jquery.validation.maxlength=Usijaze zaidi ya maneno {0}. +jquery.validation.minlength=Jaza maneno ya ziada. +jquery.validation.rangelength=Tafadhali jaza neno lenye urefu baina ya maneno {0} na {1}. +jquery.validation.range=Tafadhali jaza nambari kati ya {0} na {1}. +jquery.validation.max=Tafadhali jaza nambari isiyozidi {0}. +jquery.validation.min=Tafadhali jaza nambari kubwa kuliko {0}. + +# Webconnection common +webconnection.select.type=Chagua huduma ya wavuti au programu-tumizi ambayo utajiunga nayo: +webconnection.type=Chagua aina +webconnection.title=Uhusiano wa mtandao wa {0} +webconnection.label=Uhusiano wa mtandao +webconnection.description=Husiana na mtandao +webconnection.sorting=Panga moja kwa moja +webconnection.configure=Sanidi huduma +webconnection.api=Expose API +webconnection.api.info=FrontlineSMS yaweza kusanidiwa kupokea maombi kutoka kwa huduma ya mbali na kuanzisha risala za kutoka. Kwa maelezo zaidi, angalia [this] +webconnection.api.enable.label=Wezesha API +webconnection.api.secret.label=Ufunguo wa siri wa API: +webconnection.api.disabled=API imelemazwa +webconnection.api.url=Anwani ya wavuti ya API + +# Webconnection - generic +webconnection.generic.label=Huduma zingine za wavuti +webconnection.generic.description=Tuma risala kwa huduma zingine za wavuti +webconnection.generic.subtitle=Muunganisho wa wavuti wa HTTP + +# Webconnection - Ushahidi/Crowdmap +webconnection.ushahidi.label=Crowdmap / Ushahidi +webconnection.ushahidi.description=Tuma risala kwa seva ya CrowdMap au Ushahidi. +webconnection.ushahidi.key.description=Ufunguo wa API wa Crowdmap au Ushahidi unaweza kupatikana katika mazingira ya tovuti ya Crowdmap au Ushahidi +webconnection.ushahidi.url.label=Anuani ya kupelekwa ya Ushahidi: +webconnection.ushahidi.key.label=Ufunguo wa API wa Ushahidi: +webconnection.crowdmap.url.label=Anuani ya kupelekwa ya Crowdmap: +webconnection.crowdmap.key.label=Ufunguo wa API wa Crowdmap: +webconnection.ushahidi.serviceType.label=Chagua huduma +webconnection.ushahidi.serviceType.crowdmap=Crowdmap +webconnection.ushahidi.serviceType.ushahidi=Ushahidi +webconnection.crowdmap.url.suffix.label=.crowdmap.com +webconnection.ushahidi.subtitle=Muunganisho wa wavuti kwa {0} +webconnection.ushahidi.service.label=Huduma: +webconnection.ushahidi.url.label=Anwani: +webconnection.ushahidi.fsmskey.label=Siri ya API ya FrontlineSMS: +webconnection.ushahidi.crowdmapkey.label=Ufunguo wa API wa Crowdmap/Ushahidi: +webconnection.ushahidi.keyword.label=Neno kuu: +webconnection.api.disabled=API imelemazwa +frontlinesms2.GenericWebconnection.url.validator.error=Anuani si halali (yafaa kuanza na http:// au https://) +frontlinesms2.UshahidiWebconnection.url.validator.error=Anuani si halali (yafaa kuanza na http:// au https://) + +webconnection.confirm=Thibitisha +webconnection.keyword.title=Weka risala zote zinazolingana na neno kuu hii: +webconnection.all.messages=Haitatumia neno kuu. Risala zote zitawekwa katika Uhusiano wa mtandao huu. +webconnection.httpMethod.label=Chagua itafaki ya HTTP: +webconnection.httpMethod.get=GET +webconnection.httpMethod.post=POST +webconnection.name.prompt=Ipe Uhusiano wa mtandao jina +webconnection.details.label=Thibitisha melezo +webconnection.parameters=Sanidi data itakayotumwa kwenye server +webconnection.parameters.confirm=Thibitisha data iliyotumwa kwenye server +webconnection.keyword.label=Nemo Kuu: +webconnection.none.label=Hakuna +webconnection.url.label=Url ya Kompyuta Tumishi: +webconnection.param.name=Jina: +webconnection.param.value=Thamani: +webconnection.add.anotherparam=Ongeza elezo + +dynamicfield.message_body.label=Nakala ya Risala +dynamicfield.message_body_with_keyword.label=Nakala ya Risala isiyo na neno kuu +dynamicfield.message_src_number.label=Nambari ya Mwasili +dynamicfield.message_src_name.label=Jina la Mwasili +dynamicfield.message_timestamp.label=Wakati wa Risala + +webconnection.keyword.validation.error=Neno kuu yahitajika +webconnection.url.validation.error=Url yahitajika + +webconnection.save=Uhusiano wa mtandao umewekwa! +webconnection.saved=Muunganisho wa wavuti umehifadhiwa! +webconnection.save.success=Muunganisho wa wavuti wa {0} umehifadhiwa! + +webconnection.generic.service.label=Huduma: +webconnection.generic.httpMethod.label=Mbinu ya Http: +webconnection.generic.url.label=Anuani: +webconnection.generic.keyword.label=Upangaji wa moja kwa moja: +webconnection.generic.parameters.label=Habari iliyosanidiwa iliyotumwa kwa seva: +webconnection.generic.keyword.label=Neno kuu: +webconnection.generic.key.label=Ufunguo wa API: +frontlinesms2.Keyword.value.validator.error.frontlinesms2.UshahidiWebconnection.keyword.value=Thamana ya neno kuu si halali + +#Subscription i18n +subscription.label=Usajili +subscription.name.prompt=Patia Usajili Jina +subscription.details.label=Thibitisha maelezo +subscription.description=Ingia kikundi kwa kutumia Risala +subscription.select.group=Chagua kikundi cha usajili +subscription.group.none.selected=Chagua kikundi +subscription.autoreplies=Majibu ya moja kwa moja +subscription.sorting=TODO:Automatic sorting +subscription.confirm=Thibitisha +subscription.group.header=Chagua Kikundi +subscription.group.description=Mwasiliani aweza ongezwa am kutolewa kwa kikundi wakati FrontlineSMS itapata risala iliyo na neno kuu +subscription.top.keyword.header=Andika maneno kuu ya ngazi ya juu (si lazima) +subscription.top.keyword.description=Unaweza kuandika maneno kuu kadhaa yaliyogawanyishwa na mkato. Ikiwa utatumia mtindo huu, ujumbe utapangwa katika usajili huu iwapo neno la kwanza litafanana na neno kuu +subscription.keywords.header=Andika maneno kuu kwa matendo ya usajili +subscription.keywords.description=Andika maneno kuu ya kujiunga na kuondoka kundi hili. Unaweza kuandika maneno zaidi ya moja kama yame tenganishwa na mkato +subscription.default.action.header=Kitendo Msingi +subscription.default.action.description=Wakati risala yafanana na neno kuu lakini hayafanani na lakabu zake, moja ya haya yatatendeka +subscription.keywords.leave=Maneno makuu yakujiondoa katika kikundi +subscription.keywords.join=Maneno makuu yakujiunga na kikundi +subscription.default.action.join=Ongeza mwasiliani kwa kikundi +subscription.default.action.leave=Toa mwasiliani kwa kikundi +subscription.default.action.toggle=Ongeza ama Toa mwasiliani kutoka kwa kikundi +subscription.autoreply.join=Tuma risala wakati mwasiliani aingia kukundi +subscription.autoreply.leave=Tuma risala wakati mwasiliani atoka kukundi +subscription.confirm.group=Kikundi +subscription.confirm.keyword=Neno Kuu +subscription.confirm.join.alias=Lakabu za kuingia +subscription.confirm.leave.alias=Lakabu za kutoka +subscription.confirm.default.action=Kitendo Msingi +subscription.confirm.join.autoreply=Majibu ya moja kwa moja ya kuingia +subscription.confirm.leave.autoreply=Majibu ya moja kwa moja ya kutoka +subscription.info1=Usajili imeundwa na inafanya kazi +subscription.info2=Risala zinazolingana na neno kuu zitabadilisha wawasiliani wa kikundi +subscription.info3=Kuona usajili, ichague kutoka sehemu iliyo mkono wa kushoto +subscription.categorise.title=Ingia ama Toka kwa Usajili +subscription.categorise.info=Tafathali chagua kitendo utakachofanya kwa usajili kwa wawasiliani waliochaguliwa watakapo ongezwa kwa {0} +subscription.categorise.join.label=Ongeza wawasiliani wote kwa {0} +subscription.categorise.leave.label=Toa wawasiliani wote kutoka {0} +subscription.categorise.toggle.label=Ongezea ama Toa wawasiliani kutoka {0} +subscription.join=Ingia +subscription.leave=Toka + +subscription.keyword.required=Neno kuu yahitajika +subscription.jointext.required=Risala yakuingia yahitajika +subscription.leavetext.required=Risala yakutoka yahitajika + +subscription.moreactions.delete=Toa usajili +subscription.moreactions.rename=Badilisha jina ya usajili +subscription.moreactions.edit=Hariri usajili +subscription.moreactions.export=Hamisha usajili + +# Generic activity sorting +activity.generic.sorting=Upangaji wa moja kwa moja +activity.generic.sort.header=Upangaji wa moja kwa moja +activity.generic.sort.description=FrontlineSMS yaweza kuhamisha moja kwa moja risala zinazoingia katika kitendo hiki. Unaweza kufanya hivi kwa risala zote, au zile ambazo zinafanana na maneno kuu maalum +activity.generic.keywords.title=Andika maneno kuu ambayo lazima yafanane na risala. Waweza kuandika maneno mengi, ambayo yametenganishwa na mikato: +activity.generic.no.keywords.title=Usitumie neno kuu +activity.generic.no.keywords.description=Risala zote zinazoingia ambazo hazifanani na maneno kuu zozote zitaanzisha kitendo hiki +activity.generic.disable.sorting=Risala zisipangwe moja kwa moja +activity.generic.disable.sorting.description=Risala hazitahamishwa moja kwa moja katika kitendo hiki +activity.generic.enable.sorting=Panga risala zinazoingia ambazo zinafanana na neno kuu +activity.generic.sort.validation.unique.error=Maneno kuuu lazima yawe ya kipekee +activity.generic.keyword.in.use=Neno kuu {0} tayari linatumika katika kitendo {1} +activity.generic.global.keyword.in.use=Kitendo cha {0} kimewekwa kupokea risala zote ambazo hazifanani na maneno kuu mengine. Unaweza kuwa na kitendo moja ya kipekee yenye mazingira hii + +#basic authentication +basic.authentication=Uthibitishaji wa Kimsingi +basic.authentication.label=Jina la mtumiaji na nywila zinahitajika kutumia FrontlineSMS kwenye mtandao +basic.authentication.enable=Wezesha Uthibitishaji wa Kimsingi +basic.authentication.username=Jina la Mtumiaji +basic.authentication.password=Nywila +basic.authentication.confirm.password=Thibitisha Nywila +basic.authentication.password.mismatch=Nywila hazifanani + +newfeatures.popup.title=Vipengele vipya +newfeatures.popup.showinfuture=Onyesha dirisha hii tenaTODO:Show this dialog in future +dynamicfield.message_text.label=Maandishi ya ujumbe +dynamicfield.message_text_with_keyword.label=Neno la ujumbe lenye neno kuu +dynamicfield.sender_name.label=Jina la mtumaji +dynamicfield.sender_number.label=Nambari la mtumiaji +dynamicfield.recipient_number.label=Nambari la mpokeaji +dynamicfield.recipient_name.label=Jina la mpokeaji From a10d24e85d820b2870b633932f4c447b2b505d46 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 17:31:33 +0300 Subject: [PATCH 0180/2668] removed redundant text file --- plugins/frontlinesms-core/swahili | 1008 ----------------------------- 1 file changed, 1008 deletions(-) delete mode 100644 plugins/frontlinesms-core/swahili diff --git a/plugins/frontlinesms-core/swahili b/plugins/frontlinesms-core/swahili deleted file mode 100644 index 6f84e17a4..000000000 --- a/plugins/frontlinesms-core/swahili +++ /dev/null @@ -1,1008 +0,0 @@ -# FrontlineSMS English translation by the FrontlineSMS team, Nairobi -language.name=Kiswahili - -# General info -app.version.label=Toleo - -# Common action imperatives - to be used for button labels and similar -action.ok=Sawa -action.close=Close -action.cancel=Katisha -action.done=Maliza -action.next=Ijayo -action.prev=Previous -action.back=Nyuma -action.create=Unda -action.edit=Hariri -action.rename=Badilisha Jina -action.save=Hifadhi -action.save.all=Hifadhi zote -action.delete=Futa -action.delete.all=Futa zote -action.send=Tuma -action.export=Pakia - -# Messages when FrontlineSMS server connection is lost -server.connection.fail.title=Muunganisho wako kwa server umepotea -server.connection.fail.info=Tafadhali anzisha FrontlineSMS, au funga dirisha hii - -#Connections: -connection.creation.failed=Kuunda kwa muunganisho huu umefeli -connection.route.destroyed=Njia imeunguka kutoka {0} mpaka {1} -connection.route.connecting=Unganisha... -connection.route.disconnecting=Ungua... -connection.route.successNotification=Njia imeundwa katika {0} na mafanikio -connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho -connection.route.destroyNotification=Njia imekatika katika {0} -connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka -connection.route.exception=TODO:{1} - -# Connection exception messages -connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari -connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM -connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi -connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa -connection.error.org.smslib.notconnectedexception=TODO:{0} -connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa -connection.error.java.io.ioexception=TODO:Port threw an error: {0} -connection.error.frontlinesms2.camel.exception.invalidapiidexception=TODO: {0} -connection.error.frontlinesms2.camel.exception.authenticationexception=TODO: {0} -connection.error.frontlinesms2.camel.exception.insufficientcreditexception=TODO:{0} -connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani -connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho -connection.header=Mazingira > Miunganisho > -connection.list.none=Huna miunganisho iliyo sanidiwa -connection.edit=Hariri mwunganisho -connection.delete=Futa muunganisho -connection.deleted=Muunganisho {0} umefutwa -connection.route.create=Unda mwunganisho -connection.add=Ongeza mwunganisho mpya -connection.createtest.message.label=Risala -connection.route.destroy=Ungua mwunganisho -connection.send.test.message=Tuma risala kama majaribio -connection.test.message=Pongezi kutoka FrontlineSMS \\o/ umefaulu kuunda {0} kutuma risala \\o/ -connection.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -connection.select=Chagua aina ya mwunganisho -connection.type=Chagua aina -connection.details=Andika maelezo -connection.confirm=Thibitisha -connection.createtest.number=Nambari -connection.confirm.header=Thibitisha mazingira -connection.name.autoconfigured=Modemu {0} {1} katika port {2} imeongezwa - -status.connection.header=Miunganisho -status.connection.none=Hauna miunganisho iliyosanidiwa -status.devises.header=Vifaa vilivyotambulika -status.detect.modems=Tambua modemu -status.modems.none=Hakuna vifaa vinavyotambulika - -connectionstatus.not_connected=Haijaunganishwa -connectionstatus.connecting=Inaunganishwa -connectionstatus.connected=Imeunganishwa - -default.doesnt.match.message=Tabia [{0}] ya darasa [{1}]iliyo na kima [{2}] hailingani na ruwaza [{3}] inayohitajika -default.invalid.url.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio URL halali -default.invalid.creditCard.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio nabari halali ya kadi -default.invalid.email.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] sio barua pepe halali -default.invalid.range.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] -default.invalid.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haimo katika kiwango kinachohitajika kutoka [{3}] hadi [{4}] -default.invalid.max.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] -default.invalid.min.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] -default.invalid.max.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni juu ya kima kinachohitajika [{3}] -default.invalid.min.size.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni chini ya kima kinachohitajika [{3}] -default.invalid.validator.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipitishi mahitaji yanayohitajika kuhalalishwa -default.not.inlist.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haipatikani kwenye orodha [{3}] -default.blank.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwachwa wazi -default.not.equal.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] haiwezi kuwa sawa na [{3}] -default.null.message=Tabia [{0}] ya darasa [{1}] haiwezi kuwa batilis -default.not.unique.message=Tabia [{0}] ya darasa [{1}] iliyo na kima [{2}] ni lazma iwe ghali(unique) - -default.paginate.prev=Awali -default.paginate.next=Ijayo -default.boolean.true=Kweli -default.boolean.false=Uongo -default.date.format=dd MMMM, yyyy hh\:mm -default.number.format=0 - -default.unarchived=Tohifadhi -default.unarchive.failed=Kutohifadhi kwa {0} umefeli -default.trashed={0} imewekwa katika takataka -default.restored={0} imerudishwa -default.restore.failed=Haikuweza kurudisha {0} iliyo na kitambulisho {1} -default.archived={0} imehifadhiwa -default.archived.multiple={0} imehifadhiwa -default.created={0} imeundwa -default.created.message={0} {1} imeundwa -default.create.failed=Kuunda kwa {0} kumefeli -default.updated={0} imesasishwa -default.update.failed=Ilifeli kusasisha {0} iliyo na kitambulisho {1} -default.updated.multiple={0} imesasishwa -default.updated.message={0} imesasishwa -default.deleted={0} imefutwa -default.trashed={0} imewekwa katika takataka -default.trashed.multiple={0} imewekwa katika takataka -default.archived={0} imehifadhiwa -default.unarchived=Tohifadhi -default.unarchive.keyword.failed=Tohifadhi {0} imefeli, neno kuu au jina linatumika -default.unarchived.multiple={0} imetohifadhiwa -default.delete.failed=Kufutwa kwa {0} iliyo na kitambulisho {1} -default.notfound=Haikuweza kupata {0} na kitambulisho {0} -default.optimistic.locking.failure=Mtumiaji mwingine amesasisha {0} ulipokuwa ukihariri - -default.home.label=Nyumbani -default.list.label={0} Orodha -default.add.label=Ongeza {0} -default.new.label={0} mpya -default.create.label=Unda {0} -default.show.label=Onyesha {0} -default.edit.label=Hariri {0} -search.clear=Futa utafutaji - -default.button.create.label=Unda -default.button.edit.label=Hariri -default.button.update.label=Sasisha -default.button.delete.label=Futa -default.button.search.label=Tafuta -default.button.apply.label=Badilisha -default.button.delete.confirm.message=Uko na hakika? - -default.deleted.message={0} imefutwa - -# Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author) -typeMismatch.java.net.URL=Tabia {0} lazima iwe URL halali -typeMismatch.java.net.URI=Tabia {0} lazima iwe URI halali -typeMismatch.java.util.Date=Tabia {0} lazima iwe tarehe halali -typeMismatch.java.lang.Double=Tabia {0} lazima iwe nambari halali -typeMismatch.java.lang.Integer=Tabia {0} lazima iwe nambari halali -typeMismatch.java.lang.Long=Tabia {0} lazima iwe nambari halali -typeMismatch.java.lang.Short=Tabia {0} lazima iwe nambari halali -typeMismatch.java.math.BigDecimal=Tabia {0} lazima iwe nambari halali -typeMismatch.java.math.BigInteger=Tabia {0} lazima iwe nambari halali -typeMismatch.int =TODO: {0} lazima iwe nambari halali - -# Application specific messages -messages.trash.confirmation=Hiki kitendo kitafuta takataka na kufuta ujumbe wa kudumu. Je ungetaka kuendelea? -default.created.poll=Uchaguzi umeundwa\! -default.search.label=Futa utafutaji huu -default.search.betweendates.title=kati ya tarehe\: -default.search.moresearchoption.label=Utafutaji zaidi\: -default.search.date.format=d/M/yyyy -default.search.moreoption.label=Chaguo zaidi - -# SMSLib Fconnection -smslibfconnection.label=Simu/Modemu -smslibfconnection.type.label=Aina -smslibfconnection.name.label=Jina -smslibfconnection.manufacturer.label=Mtengenezaji -smslibfconnection.model.label=Mwanamitindo -smslibfconnection.port.label=Kituo tarishi -smslibfconnection.baud.label=Kiwango cha baud -smslibfconnection.pin.label=Utambuzi wa idadi -smslibfconnection.imsi.label=Utambulisho wa Kimataifa wa simu ya mteja -smslibfconnection.serial.label=Kufuatanisha cha kifaa\# -smslibfconnection.send.label= Tumia modemu kutuma risala -smslibfconnection.receive.label=Tumia modemu kupokea risala -smslibFconnection.send.validator.error.send=Modemu yafaa kutumika kutuma -smslibFconnection.receive.validator.error.receive=au kupokea risala -smslibfconnection.description=Unganisha kwa modemu za USB, serial na bluetooth au simu -smslibfconnection.global.info=FrontlineSMS itajaribu yenyewe kusanidi modemu au simu yoyote iliyoshikamana, lakini unaweza kuzisanidi hapa - -# Email Fconnection -emailfconnection.label=Barua pepe -emailfconnection.type.label=Aina -emailfconnection.name.label=Jina -emailfconnection.receiveProtocol.label=Itifaki -emailfconnection.serverName.label=Jina la server -emailfconnection.serverPort.label=Kituo tarishi cha server -emailfconnection.username.label=jina la mtumiaji -emailfconnection.password.label=nywila - -# CLickatell Fconnection -clickatellfconnection.label=Akaunti ya Clickatell -clickatellfconnection.type.label=Aina -clickatellfconnection.name.label=Jina -clickatellfconnection.apiId.label=Kitambulisho cha API -clickatellfconnection.username.label=jina la mtumiaji -clickatellfconnection.password.label=nywila -clickatellfconnection.description=Tuma na pokea risala kutumia akaunti ya Clickatell -clickatellfconnection.global.info=Utahitaji kusanidi akanuti na Clickatell (www.clickatell.com). - -# Smssync Fconnection -smssyncfconnection.label=SMSSync -smssyncfconnection.name.label=Jina -smssyncfconnection.type.label=Aina -smssyncfconnection.receiveEnabled.label=Kupokea kumewezeshwa -smssyncfconnection.sendEnabled.label=Kutuma kumewezeshwa -smssyncfconnection.secret.label=Siri -smssyncfconnection.description=Tumia simu ya Android ambayo ina programu ya Smssync pamoja na FrontlineSMS kutuma na kupokea SMS -smssyncfconnection.field.secret.info=Kwenye programu yako ya SMSsync, weka siri ifanane na uga huu -smssyncfconnection.global.info=Pakua programu ya SMSSync kutoka kwa smssync.ushahidi.com - -# Messages Tab -message.create.prompt=Andika risala -message.character.count=Nafasi iliyobaki ni {0}. Risala {1} -message.character.count.warning=Idadi ya maneno inaweza kuongezeka baada ya kufanya mabadilisho -announcement.label=Tangazo -announcement.description=Tuma risala za tangazo na uyapange majibu -announcement.info1=Tangazo limeundwa na risala zikaongezwa kwenye foleni ya risala zitakazotumwa -announcement.info2=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao -announcement.info3=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri' -announcement.info4=Kutazama tangazo, ibonyeze katika menyu iliyo pande ya kushoto -announcement.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -announcement.select.recipients=Chagua wapokeaji -announcement.confirm=Thibitisha -announcement.delete.warn=Onyo la kufuta {0}\: Hutaweza kurejesha tangazo\! -announcement.prompt=Ipe jina tangazo hili -announcement.confirm.message=Thibitisha risala -announcement.details.label=Thibitisha vipengele -announcement.message.label=Risala -announcement.message.none=Hakuna -announcement.recipients.label=Wapokeaji -announcement.create.message=Andika risala - -announcement.recipients.count=wapokeaji waliochaguliwa -announcement.messages.count=risala zitatumwa -announcement.moreactions.delete=Futa tangazo -announcement.moreactions.rename=Badilisha jina la tangazo -announcement.moreactions.edit=Hariri tangazo -announcement.moreactions.export=Pakia tangazo -frontlinesms2.Announcement.name.unique.error.frontlinesms2.Announcement.name=Jina "{2}" lazima liwe lakipekee - - -archive.inbox=Hifadhi kisanduku pokezi -archive.sent=Hifadhi kisanduku cha risala zilizotumwa -archive.activity=Hifadhi matendo -archive.folder=Hifadhi folda -archive.folder.name=Jina -archive.folder.date=Tarehe -archive.folder.messages=Risala -archive.folder.none=  Hakuna faili zilizohifadhiwa -archive.activity.name=Jina -archive.activity.type=Aina -archive.activity.date=Tarehe -archive.activity.messages=Risala -archive.activity.list.none=  Hakuna matendo yaliyohiifadhiwa - -autoreply.enter.keyword=Neno kuu -autoreply.create.message=Weka risala -activity.autoreply.sort.description=FrontineSMS yaweza kujibu risala zinazoingia ambazo zinaanza na neno kuu, na kuhamisha ujumbe unaoingia katika kitendo hiki. Waweza kufanya hivi kwa risala zote, au zile pekee zinazofanana an maneno kuu maalum -activity.autoreply.disable.sorting.description=Risala hazitajibiwa moja kwa moja au kuhamishwa katika kitendo hiki -autoreply.confirm=Thibitisha -autoreply.name.label=Risala -autoreply.details.label=Thibitisha maelezo -autoreply.label=Jibu la moja kwa moja -autoreply.keyword.label=Neno kuu -autoreply.description=Jibu risala zijazo moja kwa moja -autoreply.info=Moja kwa moja imeundwa. Risala yoyote ambayo iko na neno kuu itaongezwa katika moja kwa moja hii, ambayo inaweza kutazamwa ukiibonyeza kwa menyu iliyo upande wa kulia. -autoreply.info.warning=Moja kwa moja bila neno kuu itatumwa kwa risala zote zijazo -autoreply.info.note=Kumbuka\: Ukihifadhi hili jibu la moja kwa moja, risala zijazo hazitapangwa na hili jibu la moja kwa moja. -autoreply.validation.prompt=Tafadhali jaza taarifa zote zinazohitajika -autoreply.message.title=Risala itakayotumwa ya hili jibu la moja kwa moja\: -autoreply.keyword.title=Panga risala za jibu la moja kwa moja ukitumia hili Neno Kuu\: -autoreply.name.prompt=Ipe jina hii jibu ya moja kwa moja -autoreply.message.count=nafasi 0 (Risala 1) -autoreply.moreactions.delete=Futa jibu la moja kwa moja -autoreply.moreactions.rename=Badilisha jina la jibu la moja kwa moja -autoreply.moreactions.edit=Hariri jibu la moja kwa moja -autoreply.moreactions.export=Hamisha jibu la moja kwa moja -autoreply.all.messages=Usitumie neno kuu (Risala zote zijazo zitapokea hili jibu la moja kwa moja) -autoreply.text.none=Hamna -frontlinesms2.Autoreply.name.unique.error.frontlinesms2.Autoreply.name=Jina "{2}" lazima liwe lakipekee -frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=TODO:Autoreply name must be unique -frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Neno kuu "{2}" limetumiwa -frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=Risala haiwezi kuwa tupu - -autoforward.title=Autoforward ya {0} -autoforward.label=Autoforward -autoforward.description=Tuma mbele risala zinazoingia moja kwa moja kwa waasiliani -autoforward.recipientcount.current=Wapokeaji {0} hivi sasa -autoforward.create.message=Andika ujumbe -autoforward.confirm=Thibitisha -autoforward.recipients=Wapokeaji -autoforward.name.prompt=Taja Autoforward hii -autoforward.details.label=Thibitisha vipengele -autoforward.keyword.label=Neno/Maneno kuu -autoforward.name.label=Ujumbe -autoforward.contacts=Waasiliani -autoforward.groups=Vikundi -autoforward.info=Autoforward imetengenezwa, risala zozote ambazo zina neno kuu lako zitaongezwa kwa kitendo hiki ambazo zinaweza kutazamwa kwa kukibonyeza kwenye menyu iliyo upande wa kulia -autoforward.info.warning=Autoforward ambayo haina neno kuu itasababisha risala zote zinazoingia kutumwa mbele -autoforward.info.note=Kumbuka: Ikiwa utatohifadhi Autoforward, risala zinazoingia hazitapangwa kwa ajili yake. -autoforward.save=Autoforward imehifadhiwa! -autoforward.save.success=Autoforward ya {0} imehifadhiwa! -autoforward.global.keyword=Hakuna: (risala zote zinazoingia zitasindikwa) -autoforward.disabled.keyword=Hakuna (upangaji wa moja kwa moja haujawezeshwa) -autoforward.keyword.none.generic=Hakuna -autoforward.groups.none=Hakuna -autoforward.contacts.none=Hakuna -autoforward.message.format=Ujumbe - -contact.new=Mwasiliani mpya -contact.list.no.contact=Hakuna Waasiliani hapa\! -contact.header=Waasiliani -contact.all.contacts=Waasiliani wote ({0}) -contact.create=Unda mwasiliani mpya -contact.groups.header=Vikundi -contact.create.group=Unda kikundi kipya -contact.smartgroup.header=Vikundi-erevu -contact.create.smartgroup=Unda kikundi-erevu kipya -contact.add.to.group=Ongezea kikundi... -contact.remove.from.group=Toa kutoka kikundi -contact.customfield.addmoreinformation=Ongeza habari zaidi... -contact.customfield.option.createnew=Unda mpya... -contact.name.label=Jina -contact.phonenumber.label=Nambari ya simu -contact.phonenumber.international.warning=Nambari hii haiko katika international format. Yaweza leta shida kulinganisha na wawasiliani -contact.notes.label=Vidokezi -contact.email.label=Barua pepe -contact.groups.label=Vikundi -contact.notinanygroup.label=Haiko kwa kikundi chochote -contact.messages.label=Risala -contact.sent.messages=Risala zilizotumwa -contact.received.messages=Risala zilizopokewa -contact.search.messages=Tafuta risala -contact.select.all=Chagua wote -contact.not.found=Mwasiliani hapatikani -group.not.found=Kikundi hakipatikani -smartgroup.not.found=Kikundi-erevu hakipatikani - -group.rename=Badilisha Jina la kikundi -group.edit=Hariri kikundi -group.delete=Futa kikundi -group.moreactions=Vitendo zaidi... - -customfield.validation.prompt=Tafadhali jaza jina -customfield.validation.error=Jina limetumika -customfield.name.label=Jina -export.contact.info=Kupakia waasiliani kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa. -export.message.info=Kupakia risala kutoka FrontlineSMS, chagua aina ya upakiaji na ujumbe utakao ongezwa katika data inayopakiwa.. -export.selectformat=Chagua fomati -export.csv=Fomati ya CSV itakayotumiwa na spreadsheet -export.pdf=Fomati ya PDF ili uweze kuchapisha -folder.name.label=Jina -group.delete.prompt=Uko na hakika ungetaka kufuta {0}? Ilani\: Hutaweza kuirejesha. -layout.settings.header=Mazingira -activities.header=Vitendo -activities.create=Chagua kitendo kipya -folder.header=Folda -folder.create=Chagua folda mpya -folder.label=Folda -message.folder.header=Folda ya {0} -fmessage.trash.actions=Vitendo kuhusu takataka -fmessage.trash.empty=Futa takataka -fmessage.to.label=Kwenda kwa -trash.empty.prompt=Risala na vitendo vyote kwenye takataka zitafutwa kabisa -fmessage.responses.total=Majibu kwa ujumla {0} -fmessage.label=Risala -fmessage.label.multiple={0} risala -poll.prompt=Ipe jina uchaguzi huu -poll.details.label=Thibitisha vipengele -poll.message.label=Risala -poll.choice.validation.error.deleting.response=Huwezi futa chagua iliyowekwa -poll.alias=Malakabu -poll.keywords=Maneno kuu -poll.aliases.prompt=Andika malakabu yanayolingana na majibu. -poll.aliases.prompt.details=Malakabu hayo yatenganishwe na koma. Lakabu ya kwanza litatumwa katika risala. -poll.response.keyword=Weka maneno kuu ya majibu -poll.set.keyword=Weka neno kuu la ngazi ya juu -poll.keywords.validation.error=Maneno kuu lazima yawe ya kipekee -poll.sort.label=Panga moja kwa moja -poll.autosort.no.description=Risala hazitapangwa moja kwa moja -poll.autosort.description=Panga risala kulingana na neno kuu -poll.sort.keyword=neno kuu -poll.sort.by=Panga risala kulingana na neno kuu -poll.autoreply.label=Jibu la moja kwa moja -poll.autoreply.none=Hakuna -poll.recipients.label=Wapokeaji -poll.recipients.none=Hakuna -poll.toplevelkeyword=Maneno kuu ya ngazi ya juu - -#TODO embed javascript values -poll.recipients.count=Wapokeaji wamechaguliwa -poll.messages.count=Risala zitatumwa -poll.yes=Ndio -poll.no=La -poll.label=Uchaguzi -poll.description=Tuma swali na uchambue majibu -poll.messages.sent=risala {0} zimetumwa -poll.response.enabled=Majibu ya moja kwa moja yamewezeshwa -poll.message.edit=Hariri risala itakayotumiwa mpokeaji -poll.message.prompt=Risala hii itatumiwa wapokeaji wa uchaguzi huu -poll.message.count=Nafasi 160 zimebaki (Risala 1) - -poll.moreactions.delete=Futa uchaguzi -poll.moreactions.rename=Badilisha jina la uchaguzi -poll.moreactions.edit=Hariri uchaguzi -poll.moreactions.export=Pakia uchaguzi - -folder.moreactions.delete=Futa folda -folder.moreactions.rename=Badilisha jina la folda -folder.moreactions.export=Pakia folda - - -#TODO embed javascript values -poll.reply.text=Jibu "{0} {1}" kujibu Ndio, "{2} {3}" kujibu La. -poll.reply.text1={0} "{1} {2}" kujibu {3} -poll.reply.text2=Tafadhali jibu 'Ndio' au 'La' -poll.reply.text3=ama -poll.reply.text4={0} {1} -poll.reply.text5=Jibu -poll.reply.text6=Tafadhali jibu -poll.message.send={0} {1} -poll.recipients.validation.error=Chagua waasiliani wa kutumia risala -frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name =TODO: {1} {0} "{2}" must be unique -frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=Aina ya majibu haziwezi kuwa sawa -frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value =Neno kuu "{2}" tayari linatumika - -wizard.title.new=Mpya -wizard.fmessage.edit.title=Hariri {0} -popup.title.saved={0} imewekwa\! -popup.activity.create=Unda Shughuli Mpya \: Chagua aina -popup.smartgroup.create=Unda kikundi-erevu -popup.help.title=Msaada -smallpopup.customfield.create.title=Unda Custom Field -smallpopup.group.rename.title=Badilisha jina la kikundi -smallpopup.group.edit.title=Hariri kikundi -smallpopup.group.delete.title=Futa kikundi -smallpopup.fmessage.rename.title=Badilisha jina la {0} -smallpopup.fmessage.delete.title=Futa {0} -smallpopup.fmessage.export.title=Pakia -smallpopup.delete.prompt=Futa {0} ? -smallpopup.delete.many.prompt=Futa {0} contacts? -smallpopup.empty.trash.prompt=Mwaga Tupio? -smallpopup.messages.export.title=Pakia Matokeo ({0} risala) -smallpopup.test.message.title=Risala jaribio -smallpopup.recipients.title=Wapokeaji -smallpopup.folder.title=Folda -smallpopup.group.title=Kikundi -smallpopup.contact.export.title=Pakia -smallpopup.contact.delete.title=Futa -contact.selected.many=wapokeaji waliyochaguliwa {0} -group.join.reply.message=Karibu -group.leave.reply.message=Kwaheri -fmessage.new.info=Ume pokea risala {0}. Bonyeza kuona -wizard.quickmessage.title=Risala ya haraka -wizard.messages.replyall.title=Jibu zote -wizard.send.message.title=Tuma Risala -wizard.ok=Sawa -wizard.create=Unda -wizard.send=Tuma -common.settings=Mazingira -common.help=TODO:Help - -validation.nospaces.error=usiache nafasi kwenye neno -activity.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika -autoreply.blank.keyword=Neno Kuu tupu. Jibi litatumwa kwa risala zote zijazo - - -poll.type.prompt=Chagua aina ya uchaguzi unaotaka kuunda -poll.question.yes.no=Swali linalo jibu 'ndio' au 'la' -poll.question.multiple=Swali linalo majibu mengi (k.m 'Nyekundu', 'Samawati', 'Kijani Kibichi') -poll.question.prompt=Andika swali -poll.message.none=Usitume risala na uchaguzi huu (kusanya majibu pekee). -poll.replies.header=Tuma jibu moja kwa moja wa uchaguzi huu(kwa hiari yako) -poll.replies.description=Ukipokea risala inayolingana na jibu la uchaguzi huu, tuma risala kwa mtumaji aliyetuma jibu hilo -poll.autoreply.send=Tuma risala ya moja kwa moja kwa watumaji wa majibu ya uchaguzi huu -poll.responses.prompt=Andika majibu unayotarajia (Kati ya 2 hadi 5) -poll.sort.header=Panga risala kulingana na neno kuu (kwa hiari yako) -poll.sort.description=Watumaji risala watakapotuma majibu wakitumia neno kuu, FrontlineSMS inaweza kupanga risala hizo kulingana na neno hilo -poll.no.automatic.sort=Usipange risala kulingana na neno kuu -poll.sort.automatically=Panga risala zinazotumia hili neno kuu moja kwa moja -poll.validation.prompt=Jaza sehemu zote zinazohitajika -poll.name.validator.error.name=Majina ya uchaguzi lazima yawe ya kipekee -pollResponse.value.blank.value=thamana ya jibu la uchaguzi haiwezi kuwa tupu -poll.keywords.validation.error.invalid.keyword=Neno kuu si halali, jaribu jina au neno lingine -poll.question=Andika swali -poll.response=Orodha ya majibu -poll.sort=Panga moja kwa moja -poll.reply=Majibu ya moja kwa moja -poll.edit.message=Hariri risala -poll.recipients=Chagua wapokeaji -poll.confirm=Thibitisha -poll.save=Uchaguzi umehifadhiwa! -poll.save.success=Uchaguzi wa {0} umehifadhiwa! -poll.messages.queue=Risala zimeongezwa kwenye foleni ya risali 'zinazosubiri'. -poll.messages.queue.status=Itachukua muda kutuma risala zote, kutegemea na nambari ya risala zinazotumwa na mwunganisho wa mtandao. -poll.pending.messages=Kutazama hadhi ya risala zako, fungua faili ya risala 'zinazosubiri'. -poll.send.messages.none=Hamna risala zitakazotumwa -quickmessage.details.label=Thibitisha vipengele -quickmessage.message.label=Risala -quickmessage.message.none=Hakuna -quickmessage.recipient.label=Mpokeaji -quickmessage.recipients.label=Wapokeaji -quickmessage.message.count=Nafasi 160 zimebaki (Risala 1) -quickmessage.enter.message=Andika risala -quickmessage.select.recipients=Chagua Wapokeaji -quickmessage.confirm=Thibitisha -#TODO embed javascript values -quickmessage.recipients.count=Wapokeaji wamechaguliwa -quickmessage.messages.count=risala zitatumwa -quickmessage.count.label=Hesabu ya Risala\: -quickmessage.messages.label=Andika risala -quickmessage.phonenumber.label=Ongeza nambari ya simu\: -quickmessage.phonenumber.add=Ongeza -quickmessage.selected.recipients=wapokeaji wamechaguliwa -quickmessage.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika - -fmessage.number.error=Umeongeza maandishi yasiyo nambari hapa, utakapoweka maandishi yasiyo nambari yatatolewa -search.filter.label=Zuwuia utafutaji uwe katika\: -search.filter.group=Chagua kikundi -search.filter.activities=Tafuta kwa vitendo na folda -search.filter.messages.all=Zote zilizotumwa na kupokewa -search.filter.inbox=Risala zilizopokewa pekee -search.filter.sent=Risala zilizotumwa pekee -search.filter.archive=Tafuta kwenye hifadhi -search.betweendates.label=Kati ya tarehe -search.header=Tafuta -search.quickmessage=Tuma risala -search.export=Pakia matokeo -search.keyword.label=Neno kuu -search.contact.name.label=Jina la mpokeaji -search.contact.name=Jina la mpokeaji -search.result.header=Matokeo -search.moreoptions.label=Chaguo zaidi -settings.general=Kwa ujumla -settings.connections=Simu na miunganisho -settings.logs=Mfumo -settings.general.header=Mazingira > Kwa ujumla -settings.logs.header=Mazingira > logi za mfumo -logs.none=Huna logi. -logs.content=Risala -logs.date=Wakati -logs.filter.label=Onyesha logi za -logs.filter.anytime=Saa zote -logs.filter.1day=Masaa 24 yaliyopita -logs.filter.3days=Siku 3 zilizopita -logs.filter.7days=Siku 7 zilizopita -logs.filter.14days=Siku 14 zilizopita -logs.filter.28days=Siku 28 zilizopita -logs.download.label=Chukua logi -logs.download.buttontext=Chukua logi -logs.download.title=Chukua logi ilizitumwe -logs.download.continue=Endelea - -smartgroup.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika. Unaweza kuchagua amri moja pekee katika sehemu yeyote -smartgroup.info=Kuunda kundi , chagua amri zitakazofuatwa na Waasiliani ili wawe kwatika kikundi hiki -smartgroup.contains.label=iliyo na neno -smartgroup.startswith.label=inayoanza na -smartgroup.add.anotherrule=Ongeza amri nyingine -smartgroup.name.label=Jina - -modem.port=Kituo tarishi -modem.description=Maelezo -modem.locked=Imefungwa? -traffic.header=Trafiki -traffic.update.chart=Sasisha chati -traffic.filter.2weeks=Onyesha wiki mbili zilizopita -traffic.filter.between.dates=Kati ya tarehe -traffic.filter.reset=Rudisha mwanzo -traffic.allgroups=Onyesha vikundi vyote -traffic.all.folders.activities=Onyesha matendo na faili zote -traffic.sent=Risala zilizotumwa -traffic.received=Imepokewa -traffic.total=Kwa ujumla - -tab.message=Risala -tab.archive=Hifadhi -tab.contact=Waasiliani -tab.status=Hali -tab.search=Tafuta - -help.info=Hili ni toleo la beta kwa hivyo haijajengewa usaidiza. Tafadhali tazama ukumbi wa watumizi kupata usaidizi zaidi - -# IntelliSms Fconnection -intellismsfconnection.label=Akaunti ya IntelliSms -intellismsfconnection.type.label=Aina -intellismsfconnection.name.label=Jina -intellismsfconnection.username.label=Jina la mtumiaji -intellismsfconnection.password.label=Nywila - -intellismsfconnection.send.label=Tumia kutuma risala -intellismsfconnection.receive.label=Tumia kupokea risala -intellismsfconnection.receiveProtocol.label=Protokoli -intellismsfconnection.serverName.label=Jina la server -intellismsfconnection.serverPort.label=Kituo cha server -intellismsfconnection.emailUserName.label=Jina la mtumiaji -intellismsfconnection.emailPassword.label=Nywila -intellismsfconnection.description=Tuma na upokee risala kwa kutumia akaunti ya Intellisms -intellismsfconnection.global.info=Utahitajike kusanidi akaunti na Intellisms (www.intellisms.co.uk). - -#Controllers -contact.label=Mwasiliani -contact.edited.by.another.user=Mtumiaji mwingine amesasisha rekodi hii ulipokuwa ukihariri -contact.exists.prompt=Kuko na mwasiliani mwingine anayetumia hiyo nambari -contact.exists.warn=Kuko na mwasiliani anayetumia hiyo nambari. Huwezi kuunda nyingine inayofanana\! -contact.view.duplicate=Tazama inayofanana -contact.addtogroup.error=Huwezi kuongeza na kutoa kutoka kikundi kimoja -contact.mobile.label=Nambari ya simu -contact.email.label=Barua pepe -fconnection.label=Fconnection -fconnection.name=Fconnection -fconnection.unknown.type=Mwunganisho usiojulikana -fconnection.test.message.sent=Risala ya jaribio imetumwa\! -announcement.saved=Tangazo limewekwa na risala zikaongezwa kwenye foleni ili zitumwe -announcement.not.saved=Tangazo halikuweza kuwekwa -announcement.save.success=Tangazo la {0} limehifadhiwa! -announcement.id.exist.not=Tangazo lililo na kitambulisho {0} halikupatikana - -autoreply.save.success=Tangazo la moja kwa moja la {0} limehifadhiwa! -autoreply.not.saved=Jibu la moja kwa moja halijaweza kuwekwa -report.creation.error=Kulikuwa na kosa katika hali ya kuunda ripoti -export.message.title=Kupakia kwa risala za FrontlineSMS -export.database.id=Kitambulisho cha hifadhidata -export.message.date.created=Tarehe ya kuundwa -export.message.text=Andiko -export.message.destination.name=Jina la fikio -export.message.destination.mobile=Nambari la fikio -export.message.source.name=Jina la chanzo -export.message.source.mobile=Nambari ya chanzo -export.contact.title=Kupakia kwa waasiliani wa FrontlineSMS -export.contact.name=Jina -export.contact.mobile=Nambari -export.contact.email=Barua pepe -export.contact.notes=Madondo -export.contact.groups=Vikundi -export.messages.name1={0} {1} ({2} risala) -export.messages.name2={0} ({1} risala) -export.contacts.name1={0} kundi ({1} waasiliani) -export.contacts.name2={0} kundi erevu (waasiliani {1}) -export.contacts.name3=Waasiliani wote (waasiliani {0}) -folder.label=Folda -folder.archived.successfully=Folda imehifadhiwa vizuri\! -folder.unarchived.successfully=Folda imerejeshwa vizuri\! -folder.trashed=Folda imesongeshwa kwa takataka\! -folder.restored=Folda imerejeshwa\! -folder.exist.not=Folda iliyo na kitambulisho {0} haikuweza kupatikana -folder.renamed=Jina la folda limebadilishwa - -group.label=Kundi -group.name.label=Jina -group.update.success=Kundi limesasishwa vizuri -group.save.fail=Kundi halijawekwa vizuri -group.delete.fail=Kundi halikuweza kufutwa - -import.label=Ingiliza -import.backup.label=Ingiliza data kutoka hifadhi ya hapo mbeleni -import.prompt.type=Chagua aina ya data utakayoingiliza -import.contacts=Maelezo ya waasiliani -import.messages=Maelezo ya risala -import.version1.info=Kuingiliza data kutoka version 1, yapakie kwa lugha ya Kiingereza -import.prompt=Chagua faili utakayoingiliza -import.upload.failed=Kupakia kwa faili hiyo kumefeli -import.contact.save.error=Kulikuwa na kosa katika kuwekwa kwa mwasiliani -import.contact.complete=Waasiliani {0} wameinglizwa; {1} wamefeli -import.contact.failed.download=Unda CSV ya waasiliani zilizofeli -import.message.save.error=Kulikuwa na kosa katika kuwekwa kwa risala -import.message.complete=Risala {0} zimeingilizwa; {1} zikafeli - -many.selected ={1} {0} zimechaguliwa - -flash.message.activity.found.not=Kitendo hakijaweza kupatikana -flash.message.folder.found.not=Folda haikuweza kupatikana -flash.message=Risala -flash.message.fmessage=risala {0} -flash.message.fmessages.many=Risala {0} za SMS -flash.message.fmessages.many.one=Risala 1 ya SMS -fmessage.exist.not=Risala iliyo na kitambulisho {0} haijapatikana -flash.message.poll.queued=Uchaguzi umewekwa na risala zikapangwa kwenye foleni ili zitumwe - -flash.message.poll.not.saved=Uchaguzi haukuweza kuwekwa -system.notification.ok=Sawa -system.notification.fail=Imefeli -flash.smartgroup.delete.unable=Kikundi-erevu haukuweza kufutwa -flash.smartgroup.saved=Kikundi-erevu {0} kimewekwa -flash.smartgroup.save.failed=Kuweka kwa kundi-erevu kumefeli. Kosa likuwa {0} -smartgroup.id.exist.not=Kundi-erevu lililo na kitambulisho {0} hakipatikana -smartgroup.save.failed=Kundi-erevu {0} kilifeli kuwekwa kilicho na {1}{2} Makosa\: {3} -contact.name.label=Jina -contact.phonenumber.label=Nambari ya simu - -searchdescriptor.searching=Inatufuta -searchdescriptor.all.messages=Risala zote -searchdescriptor.archived.messages=, ikiwa na risala zilizohifadhiwa -searchdescriptor.exclude.archived.messages=isiyo na risala zilizohifadhiwa -searchdescriptor.only=, pekee {0} -searchdescriptor.between=, kati ya {0} na {1} -searchdescriptor.from=, kutoka {0} -searchdescriptor.until=, hadi {0} -poll.title=Uchaguzi wa {0} -announcement.title=Tangazo la {0} -autoreply.title=Jibu la Moja Kwa Moja ya {0} -folder.title={0} folda -frontlinesms.welcome=Karibu FrontlineSMS\! \\o/ -failed.pending.fmessages=Risala {0} zinazosuburi zimefeli. Enda kwenye sehemu ya risala zinazosuburi kuziona. - -subscription.title=Usajili wa {0} -subscription.info.group=Kikundi: {0} -subscription.info.groupMemberCount=wawasiliani {0} -subscription.info.keyword=Neno Kuu: {0} -subscription.sorting.disable=Lemaza upangaji wa moja kwa moja -subscription.info.joinKeywords=Kujiunga: {0} -subscription.info.leaveKeywords=Kuondoka: {0} -subscription.group.goto=Tazama Kukundi -subscription.group.required.error=Usajili lazime iwe na kikundi -subscription.save.success=Usajili wa {0} umehifadhiwa! - -language.label=Lugha -language.prompt=Badilisha lugha unayotumia kwa FrontlineSMS -frontlinesms.user.support=usaidizi wa watumiaji kutoka FrontlineSMS -download.logs.info1=Onyo\: Kundi la FrontlineSMS haliwezi kujibu maswali yako moja kwa moja. Ikiwa uko na maswali kuhusu utumiaji, Tafadhali angalia katika 'Msaada' ili uweze kupata majibu hapo. Usipofaulu, ripoti matatizo yako kwa usaidizi wa watumiaji\: -download.logs.info2=watumiaji wengine wanaweza kuwa wameripoti shida inayolingana na wakapata suluhisho\! kuendelea na kutuma logi ulizonazo Tafadhali bonyeza 'Endelea' - -# Configuration location info -configuration.location.title=Mahala pa usanidi -configuration.location.instructions=Waweza kupata programu-tumizi yako katika {1}. Faili hizi ni pamoja na hifadhidata yako na mazingira mengine, ambazo ungeari kucheleza mahali pengine - -dynamicfield.contact_name.label=Jina la mwasiliani -dynamicfield.contact_number.label=Nambari ya simu ya mwasiliani -dynamicfield.keyword.label=Neno kuu -dynamicfield.message_content.label=Mwili wa risala - -# Fmessage domain -fmessage.queued=Risala imewekwa kwenye foleni ili itumiwe {0} -fmessage.queued.multiple=Risala imewekwa kwenye ili itumiwe {0} -fmessage.retry.success=Risala imewekwa kwenye foleni tena ili itumiwe {0} -fmessage.retry.success.multiple=Risala {0} zimewekwa kwenye foleni tena ili zitumwe -fmessage.displayName.label=Jina -fmessage.text.label=Risala -fmessage.date.label=Tarehe -fmessage.to=Kwa\: {0} -fmessage.to.multiple=Kwa\: watu {0} -fmessage.quickmessage=Risala ya haraka -fmessage.archive=Hifadhi -fmessage.activity.archive=Hifadhi {0} -fmessage.unarchive=Rejesha -fmessage.export=Hamisha -fmessage.rename=Badilisha jina {0} -fmessage.edit=Hariri {0} -fmessage.delete=Futa -fmessage.moreactions=Vitendo zaidi... -fmessage.footer.show=Onyesha -fmessage.footer.show.failed=Ilifeli -fmessage.footer.show.all=Yote -fmessage.footer.show.starred=Risala zenye nyota -fmessage.footer.show.incoming=Zinazoingia -fmessage.footer.show.outgoing=Zinazotoka -fmessage.archive.back=Rudi nyuma -fmessage.activity.sentmessage=(risala {0} zimetumwa) -fmessage.failed=Imefeli -fmessage.header=Risala -fmessage.section.inbox=Kisanduku pokezi -fmessage.section.sent=Risala zilizotumwa -fmessage.section.pending=Risala zitakazotumwa -fmessage.section.trash=Takataka -fmessage.addsender=Weka kwenye waasiliani -fmessage.resend=Tuma tena -fmessage.retry=Rudia -fmessage.reply=Jibu -fmessage.forward=Tuma -fmessage.unarchive=Rejesha -fmessage.delete=Futa -fmessage.messages.none=Hakuna risala hapa\! -fmessage.selected.none=Hakuna risala iliyochaguliwa -fmessage.move.to.header=Songesha risala kwa... -fmessage.move.to.inbox=Kisanduku pokezi -fmessage.archive.many=Hifadhi zote -fmessage.count=risala 1 -fmessage.count.many=risala {0} -fmessage.many=Risala -fmessage.delete.many=Futa zote -fmessage.reply.many=Jibu zote -fmessage.restore=Rudisha -fmessage.restore.many=Rudisha -fmessage.retry.many=Kurudia haikufaulu -fmessage.selected.many=Risala {0} zimechaguliwa -fmessage.unarchive.many=Rejesha zote - -# TODO move to poll.* -fmessage.showpolldetails=Onyesha grafu -fmessage.hidepolldetails=Ficha grafu - -# TODO move to search.* -fmessage.search.none=Hamna risala zilizopaikana -fmessage.search.description=Anza kutafuta upya kushoto - -fmessage.connection.receivedon=Ilipokewa tarehe: - -activity.name=Jina -activity.delete.prompt=Hamisha {0} ziende kwa takataka . Kitendo hiki kitahamisha risala zote ziende kwa takataka -activity.label=Kitendo -activity.categorize=Weka majibu kwa kategoria zinazofaa - -magicwand.title=Tumia neno la ubadilifu -folder.create.success=Folda kimeundwa vyema -folder.create.failed=Kuunda kwa folda kumefeli -folder.name.validator.error=Jina hili la folda limetumika -folder.name.blank.error=Tafadhali weka jina la folda -poll.name.blank.error=Tafadhali weka jina la uchaguzi -poll.name.validator.error=Jina hili la uchaguzi limetumika -autoreply.name.blank.error=Tafadhali weka jina la moja kwa moja -autoreply.name.validator.error=Jina hili la moja kwa moja limetumika -announcement.name.blank.error=Tafadhali weka jina la tangazo -announcement.name.validator.error=Jina hili la tangazo limetumika -group.name.blank.error=Tafadhali weka jina la kikundi -group.name.validator.error=Jina hiki cha kikundi kimetumika - -#Jquery Validation messages -jquery.validation.required=Nafasi hii yahitajika. -jquery.validation.remote=Tafadhali jaza nafasi hii. -jquery.validation.email=Tafadhali jaza barua pepe halisi. -jquery.validation.url=Tafadhali jaza URL. -jquery.validation.date=Tafadhali jaza siku halisi. -jquery.validation.dateISO=Tafadhali jaza siku(ISO) halisi. -jquery.validation.number=Tafadhali jaza nambari. -jquery.validation.digits=Tafadhali jaza nambari pekee. -jquery.validation.creditcard=Tafadhali jaza nambari halisi. -jquery.validation.equalto=Tafadhali jaza nafasi hii na neno sawa. -jquery.validation.accept=Tafadhali jaza nafasi hii na neno halisi. -jquery.validation.maxlength=Usijaze zaidi ya maneno {0}. -jquery.validation.minlength=Jaza maneno ya ziada. -jquery.validation.rangelength=Tafadhali jaza neno lenye urefu baina ya maneno {0} na {1}. -jquery.validation.range=Tafadhali jaza nambari kati ya {0} na {1}. -jquery.validation.max=Tafadhali jaza nambari isiyozidi {0}. -jquery.validation.min=Tafadhali jaza nambari kubwa kuliko {0}. - -# Webconnection common -webconnection.select.type=Chagua huduma ya wavuti au programu-tumizi ambayo utajiunga nayo: -webconnection.type=Chagua aina -webconnection.title=Uhusiano wa mtandao wa {0} -webconnection.label=Uhusiano wa mtandao -webconnection.description=Husiana na mtandao -webconnection.sorting=Panga moja kwa moja -webconnection.configure=Sanidi huduma -webconnection.api=Expose API -webconnection.api.info=FrontlineSMS yaweza kusanidiwa kupokea maombi kutoka kwa huduma ya mbali na kuanzisha risala za kutoka. Kwa maelezo zaidi, angalia [this] -webconnection.api.enable.label=Wezesha API -webconnection.api.secret.label=Ufunguo wa siri wa API: -webconnection.api.disabled=API imelemazwa -webconnection.api.url=Anwani ya wavuti ya API - -# Webconnection - generic -webconnection.generic.label=Huduma zingine za wavuti -webconnection.generic.description=Tuma risala kwa huduma zingine za wavuti -webconnection.generic.subtitle=Muunganisho wa wavuti wa HTTP - -# Webconnection - Ushahidi/Crowdmap -webconnection.ushahidi.label=Crowdmap / Ushahidi -webconnection.ushahidi.description=Tuma risala kwa seva ya CrowdMap au Ushahidi. -webconnection.ushahidi.key.description=Ufunguo wa API wa Crowdmap au Ushahidi unaweza kupatikana katika mazingira ya tovuti ya Crowdmap au Ushahidi -webconnection.ushahidi.url.label=Anuani ya kupelekwa ya Ushahidi: -webconnection.ushahidi.key.label=Ufunguo wa API wa Ushahidi: -webconnection.crowdmap.url.label=Anuani ya kupelekwa ya Crowdmap: -webconnection.crowdmap.key.label=Ufunguo wa API wa Crowdmap: -webconnection.ushahidi.serviceType.label=Chagua huduma -webconnection.ushahidi.serviceType.crowdmap=Crowdmap -webconnection.ushahidi.serviceType.ushahidi=Ushahidi -webconnection.crowdmap.url.suffix.label=.crowdmap.com -webconnection.ushahidi.subtitle=Muunganisho wa wavuti kwa {0} -webconnection.ushahidi.service.label=Huduma: -webconnection.ushahidi.url.label=Anwani: -webconnection.ushahidi.fsmskey.label=Siri ya API ya FrontlineSMS: -webconnection.ushahidi.crowdmapkey.label=Ufunguo wa API wa Crowdmap/Ushahidi: -webconnection.ushahidi.keyword.label=Neno kuu: -webconnection.api.disabled=API imelemazwa -frontlinesms2.GenericWebconnection.url.validator.error=Anuani si halali (yafaa kuanza na http:// au https://) -frontlinesms2.UshahidiWebconnection.url.validator.error=Anuani si halali (yafaa kuanza na http:// au https://) - -webconnection.confirm=Thibitisha -webconnection.keyword.title=Weka risala zote zinazolingana na neno kuu hii: -webconnection.all.messages=Haitatumia neno kuu. Risala zote zitawekwa katika Uhusiano wa mtandao huu. -webconnection.httpMethod.label=Chagua itafaki ya HTTP: -webconnection.httpMethod.get=GET -webconnection.httpMethod.post=POST -webconnection.name.prompt=Ipe Uhusiano wa mtandao jina -webconnection.details.label=Thibitisha melezo -webconnection.parameters=Sanidi data itakayotumwa kwenye server -webconnection.parameters.confirm=Thibitisha data iliyotumwa kwenye server -webconnection.keyword.label=Nemo Kuu: -webconnection.none.label=Hakuna -webconnection.url.label=Url ya Kompyuta Tumishi: -webconnection.param.name=Jina: -webconnection.param.value=Thamani: -webconnection.add.anotherparam=Ongeza elezo - -dynamicfield.message_body.label=Nakala ya Risala -dynamicfield.message_body_with_keyword.label=Nakala ya Risala isiyo na neno kuu -dynamicfield.message_src_number.label=Nambari ya Mwasili -dynamicfield.message_src_name.label=Jina la Mwasili -dynamicfield.message_timestamp.label=Wakati wa Risala - -webconnection.keyword.validation.error=Neno kuu yahitajika -webconnection.url.validation.error=Url yahitajika - -webconnection.save=Uhusiano wa mtandao umewekwa! -webconnection.saved=Muunganisho wa wavuti umehifadhiwa! -webconnection.save.success=Muunganisho wa wavuti wa {0} umehifadhiwa! - -webconnection.generic.service.label=Huduma: -webconnection.generic.httpMethod.label=Mbinu ya Http: -webconnection.generic.url.label=Anuani: -webconnection.generic.keyword.label=Upangaji wa moja kwa moja: -webconnection.generic.parameters.label=Habari iliyosanidiwa iliyotumwa kwa seva: -webconnection.generic.keyword.label=Neno kuu: -webconnection.generic.key.label=Ufunguo wa API: -frontlinesms2.Keyword.value.validator.error.frontlinesms2.UshahidiWebconnection.keyword.value=Thamana ya neno kuu si halali - -#Subscription i18n -subscription.label=Usajili -subscription.name.prompt=Patia Usajili Jina -subscription.details.label=Thibitisha maelezo -subscription.description=Ingia kikundi kwa kutumia Risala -subscription.select.group=Chagua kikundi cha usajili -subscription.group.none.selected=Chagua kikundi -subscription.autoreplies=Majibu ya moja kwa moja -subscription.sorting=TODO:Automatic sorting -subscription.confirm=Thibitisha -subscription.group.header=Chagua Kikundi -subscription.group.description=Mwasiliani aweza ongezwa am kutolewa kwa kikundi wakati FrontlineSMS itapata risala iliyo na neno kuu -subscription.top.keyword.header=Andika maneno kuu ya ngazi ya juu (si lazima) -subscription.top.keyword.description=Unaweza kuandika maneno kuu kadhaa yaliyogawanyishwa na mkato. Ikiwa utatumia mtindo huu, ujumbe utapangwa katika usajili huu iwapo neno la kwanza litafanana na neno kuu -subscription.keywords.header=Andika maneno kuu kwa matendo ya usajili -subscription.keywords.description=Andika maneno kuu ya kujiunga na kuondoka kundi hili. Unaweza kuandika maneno zaidi ya moja kama yame tenganishwa na mkato -subscription.default.action.header=Kitendo Msingi -subscription.default.action.description=Wakati risala yafanana na neno kuu lakini hayafanani na lakabu zake, moja ya haya yatatendeka -subscription.keywords.leave=Maneno makuu yakujiondoa katika kikundi -subscription.keywords.join=Maneno makuu yakujiunga na kikundi -subscription.default.action.join=Ongeza mwasiliani kwa kikundi -subscription.default.action.leave=Toa mwasiliani kwa kikundi -subscription.default.action.toggle=Ongeza ama Toa mwasiliani kutoka kwa kikundi -subscription.autoreply.join=Tuma risala wakati mwasiliani aingia kukundi -subscription.autoreply.leave=Tuma risala wakati mwasiliani atoka kukundi -subscription.confirm.group=Kikundi -subscription.confirm.keyword=Neno Kuu -subscription.confirm.join.alias=Lakabu za kuingia -subscription.confirm.leave.alias=Lakabu za kutoka -subscription.confirm.default.action=Kitendo Msingi -subscription.confirm.join.autoreply=Majibu ya moja kwa moja ya kuingia -subscription.confirm.leave.autoreply=Majibu ya moja kwa moja ya kutoka -subscription.info1=Usajili imeundwa na inafanya kazi -subscription.info2=Risala zinazolingana na neno kuu zitabadilisha wawasiliani wa kikundi -subscription.info3=Kuona usajili, ichague kutoka sehemu iliyo mkono wa kushoto -subscription.categorise.title=Ingia ama Toka kwa Usajili -subscription.categorise.info=Tafathali chagua kitendo utakachofanya kwa usajili kwa wawasiliani waliochaguliwa watakapo ongezwa kwa {0} -subscription.categorise.join.label=Ongeza wawasiliani wote kwa {0} -subscription.categorise.leave.label=Toa wawasiliani wote kutoka {0} -subscription.categorise.toggle.label=Ongezea ama Toa wawasiliani kutoka {0} -subscription.join=Ingia -subscription.leave=Toka - -subscription.keyword.required=Neno kuu yahitajika -subscription.jointext.required=Risala yakuingia yahitajika -subscription.leavetext.required=Risala yakutoka yahitajika - -subscription.moreactions.delete=Toa usajili -subscription.moreactions.rename=Badilisha jina ya usajili -subscription.moreactions.edit=Hariri usajili -subscription.moreactions.export=Hamisha usajili - -# Generic activity sorting -activity.generic.sorting=Upangaji wa moja kwa moja -activity.generic.sort.header=Upangaji wa moja kwa moja -activity.generic.sort.description=FrontlineSMS yaweza kuhamisha moja kwa moja risala zinazoingia katika kitendo hiki. Unaweza kufanya hivi kwa risala zote, au zile ambazo zinafanana na maneno kuu maalum -activity.generic.keywords.title=Andika maneno kuu ambayo lazima yafanane na risala. Waweza kuandika maneno mengi, ambayo yametenganishwa na mikato: -activity.generic.no.keywords.title=Usitumie neno kuu -activity.generic.no.keywords.description=Risala zote zinazoingia ambazo hazifanani na maneno kuu zozote zitaanzisha kitendo hiki -activity.generic.disable.sorting=Risala zisipangwe moja kwa moja -activity.generic.disable.sorting.description=Risala hazitahamishwa moja kwa moja katika kitendo hiki -activity.generic.enable.sorting=Panga risala zinazoingia ambazo zinafanana na neno kuu -activity.generic.sort.validation.unique.error=Maneno kuuu lazima yawe ya kipekee -activity.generic.keyword.in.use=Neno kuu {0} tayari linatumika katika kitendo {1} -activity.generic.global.keyword.in.use=Kitendo cha {0} kimewekwa kupokea risala zote ambazo hazifanani na maneno kuu mengine. Unaweza kuwa na kitendo moja ya kipekee yenye mazingira hii - -#basic authentication -basic.authentication=Uthibitishaji wa Kimsingi -basic.authentication.label=Jina la mtumiaji na nywila zinahitajika kutumia FrontlineSMS kwenye mtandao -basic.authentication.enable=Wezesha Uthibitishaji wa Kimsingi -basic.authentication.username=Jina la Mtumiaji -basic.authentication.password=Nywila -basic.authentication.confirm.password=Thibitisha Nywila -basic.authentication.password.mismatch=Nywila hazifanani - -newfeatures.popup.title=Vipengele vipya -newfeatures.popup.showinfuture=Onyesha dirisha hii tenaTODO:Show this dialog in future -dynamicfield.message_text.label=Maandishi ya ujumbe -dynamicfield.message_text_with_keyword.label=Neno la ujumbe lenye neno kuu -dynamicfield.sender_name.label=Jina la mtumaji -dynamicfield.sender_number.label=Nambari la mtumiaji -dynamicfield.recipient_number.label=Nambari la mpokeaji -dynamicfield.recipient_name.label=Jina la mpokeaji From 72622a3fe93244269f8616996961fef9a5f818c9 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 14 Dec 2012 18:10:33 +0300 Subject: [PATCH 0181/2668] fixed poll bug --- plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index 1d8745338..51452a6ce 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -140,7 +140,7 @@ var keywordText = ''; var replyText = ''; if ($('#poll-keyword').attr("disabled") == undefined || $('#poll-keyword').attr("disabled") == false) { - keywordText = getFirstAlias($("#poll-keyword")).toUpperCase(); + keywordText = (getFirstAlias($("#poll-keyword")) || "").toUpperCase(); if($("input[name='pollType']:checked").val() == "yesNo") { var yesAlias = getFirstAlias($("ul#poll-aliases li input#keywordsA")); var noAlias = getFirstAlias($("ul#poll-aliases li input#keywordsB")); From d9b464bb001f6fe7d35a4143dd3cd28dbbc8af60 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 14 Dec 2012 18:20:33 +0300 Subject: [PATCH 0182/2668] Updated version numbers to 2.0 for frontlinesms-2.2.0 build --- plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy | 2 +- plugins/frontlinesms-core/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy index 60ec24221..4fac07c9f 100644 --- a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy +++ b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy @@ -1,5 +1,5 @@ class FrontlinesmsCoreGrailsPlugin { - def version = "2.0-SNAPSHOT" + def version = "2.0" def grailsVersion = "2.0.3" def pluginExcludes = ["grails-app/views/error.gsp", "grails-app/conf/CoreBootStrap.groovy", diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index c4b302c3c..bb45113d4 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0-SNAPSHOT +app.version=2.0 From 8675c889902c9235676344022ae8d77ad60ee894 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 10:51:50 +0300 Subject: [PATCH 0183/2668] Added option to stash/unstash changes when migration script is run. --- .../src/main/groovy/MigrationSpec.groovy | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 70c1040cf..8bb8121d2 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -4,13 +4,12 @@ import groovyx.remote.client.RemoteControl class MigrationSpec { static File EXECUTE_BASE_DIRECTORY = new File(new File('').absolutePath).parentFile.parentFile.parentFile - static boolean gitWorkingDirectoryMustBeClean = true + boolean changesStashed String serverPort public static void main(String... args) { init() - gitWorkingDirectoryMustBeClean = !('--dirty' in args) def exitCode = 0 def originalGitBranch = executeGetText('git branch | grep \'*\' | cut -d" " -f2') try { @@ -25,6 +24,11 @@ class MigrationSpec { try { simpleExecute("git checkout $originalGitBranch") } catch(Exception _) { _.printStackTrace() } + if(changesStashed) { + try { + simpleExecute("git stash apply") + } catch(Exception _) { _.printStackTrace() } + } } System.exit(exitCode) } @@ -34,16 +38,13 @@ class MigrationSpec { } private static void init() { - // TODO fail if git working directory not clean - - if(gitWorkingDirectoryMustBeClean) { - def porcelainOutput = simpleExecute('git status --porcelain | /usr/bin/env grep --quiet "."') - println "# porcelainOutput=$porcelainOutput" - def clean = porcelainOutput == 1 - println "# Git working directory is clean? $clean" - if(!clean) { - throw new RuntimeException("GIT WORKING DIRECTORY IS NOT CLEAN. TERMINATING.") - } + def porcelainOutput = simpleExecute('git status --porcelain | /usr/bin/env grep --quiet "."') + println "# porcelainOutput=$porcelainOutput" + def clean = porcelainOutput == 1 + println "# Git working directory is clean? $clean" + if(!clean) { + simpleExecute('git stash --include-untracked') + changesStashed = true } } From d9997c34ccfabe59b7f2630ee555e928952e8d40 Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 17 Dec 2012 10:53:07 +0300 Subject: [PATCH 0184/2668] fixed TODOs in messages_sw.properties --- .../build_installers_with_migrations_disabled | 3 +-- .../grails-app/i18n/messages_sw.properties | 26 +++++++++---------- .../frontlinesms-core/install/build.install4j | 2 +- .../fileset/filtered/launcher.properties | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_installers_with_migrations_disabled b/plugins/frontlinesms-core/do/build_installers_with_migrations_disabled index abf125cb7..6a1b03951 100755 --- a/plugins/frontlinesms-core/do/build_installers_with_migrations_disabled +++ b/plugins/frontlinesms-core/do/build_installers_with_migrations_disabled @@ -8,6 +8,5 @@ fi echo "# running grails clean..." grails clean echo "# build installers with migrations disabled for grails env $GRAILS_ENV..." -grails -Dfrontlinesms2.build.db.migrations=false $GRAILS_ENV build-installers -echo "# installers built. Have a nice day." +grails -Dfrontlinesms2.build.db.migrations=false $GRAILS_ENV build-installers && echo "# installers built. Have a nice day." diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 750ecaec0..79f52d2b8 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -35,19 +35,19 @@ connection.route.successNotification=Njia imeundwa katika {0} na mafanikio connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho connection.route.destroyNotification=Njia imekatika katika {0} connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka -connection.route.exception=TODO:{1} +connection.route.exception={1} # Connection exception messages connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa -connection.error.org.smslib.notconnectedexception=TODO:{0} +connection.error.org.smslib.notconnectedexception={0} connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa -connection.error.java.io.ioexception=TODO:Port threw an error: {0} -connection.error.frontlinesms2.camel.exception.invalidapiidexception=TODO: {0} -connection.error.frontlinesms2.camel.exception.authenticationexception=TODO: {0} -connection.error.frontlinesms2.camel.exception.insufficientcreditexception=TODO:{0} +connection.error.java.io.ioexception=Kituo tarishi kilipata kasoro ifuatayo: {0} +connection.error.frontlinesms2.camel.exception.invalidapiidexception={0} +connection.error.frontlinesms2.camel.exception.authenticationexception={0} +connection.error.frontlinesms2.camel.exception.insufficientcreditexception={0} connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho connection.header=Mazingira > Miunganisho > @@ -158,7 +158,7 @@ typeMismatch.java.lang.Long=Tabia {0} lazima iwe nambari halali typeMismatch.java.lang.Short=Tabia {0} lazima iwe nambari halali typeMismatch.java.math.BigDecimal=Tabia {0} lazima iwe nambari halali typeMismatch.java.math.BigInteger=Tabia {0} lazima iwe nambari halali -typeMismatch.int =TODO: {0} lazima iwe nambari halali +typeMismatch.int =Tabia {0} lazima iwe nambari halali # Application specific messages messages.trash.confirmation=Hiki kitendo kitafuta takataka na kufuta ujumbe wa kudumu. Je ungetaka kuendelea? @@ -288,7 +288,7 @@ autoreply.moreactions.export=Hamisha jibu la moja kwa moja autoreply.all.messages=Usitumie neno kuu (Risala zote zijazo zitapokea hili jibu la moja kwa moja) autoreply.text.none=Hamna frontlinesms2.Autoreply.name.unique.error.frontlinesms2.Autoreply.name=Jina "{2}" lazima liwe lakipekee -frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=TODO:Autoreply name must be unique +frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=Jina la jibu la moja kwa moja lazima liwe la kipekee frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Neno kuu "{2}" limetumiwa frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=Risala haiwezi kuwa tupu @@ -430,7 +430,7 @@ poll.reply.text4={0} {1} poll.reply.text5=Jibu poll.message.send={0} {1} poll.recipients.validation.error=Chagua waasiliani wa kutumia risala -frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name =TODO: {1} {0} "{2}" must be unique +frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name = {1} {0} "{2}" lazima liwe la kipekee frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=Aina ya majibu haziwezi kuwa sawa frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value =Neno kuu "{2}" tayari linatumika @@ -468,7 +468,7 @@ wizard.ok=Sawa wizard.create=Unda wizard.send=Tuma common.settings=Mazingira -common.help=TODO:Help +common.help=Usaidizi validation.nospaces.error=usiache nafasi kwenye neno activity.validation.prompt=Tafadhali jaza sehemu zote zinazohitajika @@ -931,7 +931,7 @@ subscription.description=Ingia kikundi kwa kutumia Risala subscription.select.group=Chagua kikundi cha usajili subscription.group.none.selected=Chagua kikundi subscription.autoreplies=Majibu ya moja kwa moja -subscription.sorting=TODO:Automatic sorting +subscription.sorting=Upangaji wa moja kwa moja subscription.confirm=Thibitisha subscription.group.header=Chagua Kikundi subscription.group.description=Mwasiliani aweza ongezwa am kutolewa kwa kikundi wakati FrontlineSMS itapata risala iliyo na neno kuu @@ -981,7 +981,7 @@ activity.generic.sort.header=Upangaji wa moja kwa moja activity.generic.sort.description=FrontlineSMS yaweza kuhamisha moja kwa moja risala zinazoingia katika kitendo hiki. Unaweza kufanya hivi kwa risala zote, au zile ambazo zinafanana na maneno kuu maalum activity.generic.keywords.title=Andika maneno kuu ambayo lazima yafanane na risala. Waweza kuandika maneno mengi, ambayo yametenganishwa na mikato: activity.generic.no.keywords.title=Usitumie neno kuu -activity.generic.no.keywords.description=Risala zote zinazoingia ambazo hazifanani na maneno kuu zozote zitaanzisha kitendo hiki +activity.generic.no.keywords.description=Risala zote zinazoingia ambazo hazifanani na maneno kuu yoyote zitaanzisha kitendo hiki activity.generic.disable.sorting=Risala zisipangwe moja kwa moja activity.generic.disable.sorting.description=Risala hazitahamishwa moja kwa moja katika kitendo hiki activity.generic.enable.sorting=Panga risala zinazoingia ambazo zinafanana na neno kuu @@ -999,7 +999,7 @@ basic.authentication.confirm.password=Thibitisha Nywila basic.authentication.password.mismatch=Nywila hazifanani newfeatures.popup.title=Vipengele vipya -newfeatures.popup.showinfuture=Onyesha dirisha hii tenaTODO:Show this dialog in future +newfeatures.popup.showinfuture=Onyesha dirisha hii tena dynamicfield.message_text.label=Maandishi ya ujumbe dynamicfield.message_text_with_keyword.label=Neno la ujumbe lenye neno kuu dynamicfield.sender_name.label=Jina la mtumaji diff --git a/plugins/frontlinesms-core/install/build.install4j b/plugins/frontlinesms-core/install/build.install4j index 9c8eac212..d46fe056d 100644 --- a/plugins/frontlinesms-core/install/build.install4j +++ b/plugins/frontlinesms-core/install/build.install4j @@ -84,7 +84,7 @@ - -Dfrontlinesms.resource.path=~/.${compiler:app.shortName}-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT + -Dfrontlinesms.resource.path=~/.${compiler:app.shortName}-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT diff --git a/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties b/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties index 0b3bcd486..655b337e1 100644 --- a/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties +++ b/plugins/frontlinesms-core/install/fileset/filtered/launcher.properties @@ -1,3 +1,3 @@ server.port=8130 -resource.path=~/.${install4j.app.shortName}-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT +resource.path=~/.${install4j.app.shortName}-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT-SNAPSHOT From b2fc961312564468c0630ff498d9438aecca42f6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 10:57:53 +0300 Subject: [PATCH 0185/2668] Fixed stashing of working stuff when running migration tests. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 8bb8121d2..3f1b49f66 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -5,7 +5,7 @@ import groovyx.remote.client.RemoteControl class MigrationSpec { static File EXECUTE_BASE_DIRECTORY = new File(new File('').absolutePath).parentFile.parentFile.parentFile - boolean changesStashed + static boolean changesStashed String serverPort public static void main(String... args) { From d2189bc3b911d33bcc58288fe05fedaa9397fbe8 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 17 Dec 2012 11:03:29 +0300 Subject: [PATCH 0186/2668] Migrations fix: poll aliases must be capitalized before converting to 2nd level keywords --- .../grails-app/migrations/changelog-2.0.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy index 79fb44dcf..9ef54282d 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-2.0.groovy @@ -266,7 +266,7 @@ databaseChangeLog = { println "MIGRATIONS:::::::::: for poll: ${poll}, migrating poll response:::: ${pollResponse}" pollResponse.ALIASES?.split(',').each { aliasValue -> println "MIGRATIONS:::::::::: for poll: ${poll}, migrating poll response ${pollResponse}: alias::: ${aliasValue}" - sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level, keywords_idx) values ($poll.ID, $pollResponse.KEY, ${aliasValue.trim()}, false, $pollKeywordIndex)") + sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level, keywords_idx) values ($poll.ID, $pollResponse.KEY, ${aliasValue.trim().toUpperCase()}, false, $pollKeywordIndex)") pollKeywordIndex += 1 } } From e6a7ec9235e167a091f324f6fba0aeec61580b8a Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 17 Dec 2012 11:08:33 +0300 Subject: [PATCH 0187/2668] corrected problem --- .../grails-app/i18n/messages_sw.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 79f52d2b8..158128aa5 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -35,19 +35,19 @@ connection.route.successNotification=Njia imeundwa katika {0} na mafanikio connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho connection.route.destroyNotification=Njia imekatika katika {0} connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka -connection.route.exception={1} +connection.route.exception= # Connection exception messages connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa -connection.error.org.smslib.notconnectedexception={0} +connection.error.org.smslib.notconnectedexception= connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa connection.error.java.io.ioexception=Kituo tarishi kilipata kasoro ifuatayo: {0} -connection.error.frontlinesms2.camel.exception.invalidapiidexception={0} -connection.error.frontlinesms2.camel.exception.authenticationexception={0} -connection.error.frontlinesms2.camel.exception.insufficientcreditexception={0} +connection.error.frontlinesms2.camel.exception.invalidapiidexception= +connection.error.frontlinesms2.camel.exception.authenticationexception= +connection.error.frontlinesms2.camel.exception.insufficientcreditexception= connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho connection.header=Mazingira > Miunganisho > From d9d49866baa4916fce179b402630b8b2ac891754 Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 17 Dec 2012 11:11:49 +0300 Subject: [PATCH 0188/2668] removed lines in messages_sw.properties --- .../frontlinesms-core/grails-app/i18n/messages_sw.properties | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 158128aa5..63ec5b39a 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -35,19 +35,14 @@ connection.route.successNotification=Njia imeundwa katika {0} na mafanikio connection.route.failNotification=Imefeli kuunda njia katika {0} Hariri Muunganisho connection.route.destroyNotification=Njia imekatika katika {0} connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka -connection.route.exception= # Connection exception messages connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa -connection.error.org.smslib.notconnectedexception= connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa connection.error.java.io.ioexception=Kituo tarishi kilipata kasoro ifuatayo: {0} -connection.error.frontlinesms2.camel.exception.invalidapiidexception= -connection.error.frontlinesms2.camel.exception.authenticationexception= -connection.error.frontlinesms2.camel.exception.insufficientcreditexception= connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho connection.header=Mazingira > Miunganisho > From ca6c3fb15da1ad332ff868c8606efdd33c7b0016 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 17 Dec 2012 11:35:12 +0300 Subject: [PATCH 0189/2668] fixed CORE-1809: wrong language names in 'select language' dropdown --- .../grails-app/services/frontlinesms2/I18nUtilService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy index 6a2a9ccf7..e9f839346 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy @@ -45,7 +45,7 @@ class I18nUtilService { def f = new File(getRootDirectory(), filename) if(f.exists()) { def lang - try { f.eachLine { line -> + try { f.eachLine("utf-8") { line -> if(line.startsWith("language.name=")) { lang = (line - "language.name=").trim() throw new EOFException() From f6bfe5461cb2032df287c0b44e37ae28aa2e5aff Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 11:40:28 +0300 Subject: [PATCH 0190/2668] Fixed cleanup of migration script; added more useful debug. --- .../src/main/groovy/MigrationSpec.groovy | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 3f1b49f66..895f21145 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -18,16 +18,10 @@ class MigrationSpec { ex.printStackTrace() exitCode = 1 } finally { - try { - simpleExecute('git reset --hard && git clean -xdf') - } catch(Exception _) { _.printStackTrace() } - try { - simpleExecute("git checkout $originalGitBranch") - } catch(Exception _) { _.printStackTrace() } + simpleExecute_ignoreExceptions('git reset --hard && git clean -xdf') + simpleExecute_ignoreExceptions("git checkout $originalGitBranch") if(changesStashed) { - try { - simpleExecute("git stash apply") - } catch(Exception _) { _.printStackTrace() } + simpleExecute_ignoreExceptions("git stash apply") } } System.exit(exitCode) @@ -57,10 +51,24 @@ class MigrationSpec { return ['bash', '-c', command].execute([], EXECUTE_BASE_DIRECTORY) } + /** @return command's exit status, or -1 if there was an Exception thrown */ + private static int simpleExecute_ignoreExceptions(String command) { + try { + return simpleExecute(command) + } catch(Exception _) { + _.printStackTrace() + return -1 + } + } + private static int simpleExecute(String command) { return executeInBackground(command).waitFor() } + private static void executeAndEcho(String command) { + println executeGetText(command) + } + private static int execute(String command, String errorMessage=null, boolean throwExceptionOnFailure=true) { def exitCode = simpleExecute(command) if(throwExceptionOnFailure && exitCode) { @@ -81,10 +89,15 @@ class MigrationSpec { println "# Checking out FrontlineSMS version: $version..." execute("git checkout $gitTag") execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") - println "# TODO enabling grails-remote-control-plugin for prod..." + println "# enabling grails-remote-control-plugin for prod..." + execute "echo 'remoteControl.enabled = true' >> $contextPath/grails-app/conf/Config.groovy" - println "# TODO changing grails DataSource location for prod..." + println "# changing grails DataSource location for prod..." + execute "sed -i -e 's_^\\s*url = .*\$_url = \"jdbc:h2:\$userHome/frontlinesms2-migration-test-database;MVCC=TRUE\"_' $contextPath/grails-app/conf/DataSource.groovy" + println "# Displaying changes to working version..." + executeAndEcho('git status') + executeAndEcho('git diff') def grailsServer try { println "# Starting grails server on port $serverPort..." @@ -106,6 +119,9 @@ class MigrationSpec { println "# Killing remote server" grailsServer.destroy() println "# Grails exit code: ${grailsServer.exitValue()}" + + println "# cleaning and resetting git repository..." + simpleExecute_ignoreExceptions('git reset --hard && git clean -xdf') } println "# Checking test response code..." From 62e52a9de96d6e6b1d10f8eba353fd541f197f9d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 12:02:01 +0300 Subject: [PATCH 0191/2668] Fixed resetting to original state. --- .../src/main/groovy/MigrationSpec.groovy | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 895f21145..727241c98 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -5,24 +5,21 @@ import groovyx.remote.client.RemoteControl class MigrationSpec { static File EXECUTE_BASE_DIRECTORY = new File(new File('').absolutePath).parentFile.parentFile.parentFile + static String originalGitBranch static boolean changesStashed String serverPort public static void main(String... args) { init() def exitCode = 0 - def originalGitBranch = executeGetText('git branch | grep \'*\' | cut -d" " -f2') + originalGitBranch = executeGetText('git branch | grep \'*\' | cut -d" " -f2') try { new MigrationSpec(serverPort:8080).test() } catch(Exception ex) { ex.printStackTrace() exitCode = 1 } finally { - simpleExecute_ignoreExceptions('git reset --hard && git clean -xdf') - simpleExecute_ignoreExceptions("git checkout $originalGitBranch") - if(changesStashed) { - simpleExecute_ignoreExceptions("git stash apply") - } + returnToOriginalState() } System.exit(exitCode) } @@ -77,18 +74,31 @@ class MigrationSpec { return exitCode as Integer } + private static void returnToOriginalState() { + // checkout the working state we started with + simpleExecute_ignoreExceptions("git checkout $originalGitBranch") + if(changesStashed) { + simpleExecute_ignoreExceptions("git stash apply") + } + } + def getRemoteControl = { contextPath -> def transport = new HttpTransport(getServerAddress(contextPath)) return new RemoteControl(transport) } // TEST HELPERS - def withFrontlineSMS = { String version, contextPath = 'frontlinesms-core', Closure remoteCode -> - def gitTag = (version ==~ /\d+(\.\d+)*/)? "frontlinesms$version": version + def withFrontlineSMS = { String version = null, contextPath = 'frontlinesms-core', Closure remoteCode -> + if(version) { + def gitTag = (version ==~ /\d+(\.\d+)*/)? "frontlinesms$version": version + + println "# Checking out FrontlineSMS version: $version..." + execute("git checkout $gitTag") + execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") + } else { + returnToOriginalState() + } - println "# Checking out FrontlineSMS version: $version..." - execute("git checkout $gitTag") - execute(/sed -i -E -e "s:^.*remote-control.*\$::" -e "s\/plugins\s*\{\/plugins {\\ncompile \":remote-control:1.3\"\/" / + "$contextPath/grails-app/conf/BuildConfig.groovy") println "# enabling grails-remote-control-plugin for prod..." execute "echo 'remoteControl.enabled = true' >> $contextPath/grails-app/conf/Config.groovy" @@ -103,14 +113,18 @@ class MigrationSpec { println "# Starting grails server on port $serverPort..." grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort prod run-app" println "# Waiting for grails server to start..." + boolean startedOk = false try { grailsServer.inputStream.eachLine { line -> println "# [grails] $line" if(line.trim().startsWith('| Server running. Browse to ')) { + println 'Server started successfully.' throw new EOFException('Server started successfully.') } } - } catch(EOFException _) {} + } catch(EOFException _) { startedOk = true } + + if(!startedOk) throw new RuntimeException("Server failed to start ${version? "for '$version'": 'in original state'}") println "# Running test script with remote control..." def remoteControl = getRemoteControl(contextPath) @@ -129,13 +143,6 @@ class MigrationSpec { // TODO handle errors and finally cleanup } - def withCurrentFrontlineSMS = { Closure remoteCode -> - println "# Starting grails server on port $serverPort..." - // TODO start server - println "# Running test script with remote control..." - // TODO run test script on remote server - } - def performMigration = { Closure remoteCode -> println "# TODO run migration..." } @@ -169,7 +176,7 @@ class MigrationSpec { new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: "Thanks for the input. Your number, ${contact_number}, has been added to our records").save(failOnError:true, flush:true) } - withFrontlineSMS('2.2.0') { + withStartingFrontlineSMS { // check data migrated properly def click = ClickatellFconnection.findByName("Test Clickatell connection") assert click.apiId == "doesntmatter" @@ -204,7 +211,7 @@ class MigrationSpec { // some migration you're trying to test out... } - withCurrentFrontlineSMS { + withStartingFrontlineSMS { // check that the `performMigration` executed OK } } From 5131c1e4f29756a7098cf952dec11838a33024b9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 17 Dec 2012 12:37:54 +0300 Subject: [PATCH 0192/2668] 2.2.0 RC-2 build --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index bb45113d4..2fe008f3a 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0 +app.version=2.0-RC2 From 3febdc72ab1214529b0ee6a8430b83caa7cea026 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 17 Dec 2012 12:38:59 +0300 Subject: [PATCH 0193/2668] 2.2.0 RC-2 build --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 2fe008f3a..42893470b 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0-RC2 +app.version=2.0-rc2 From 11d7ea5457c7105f2c0b2ad2a0e9ba683406d052 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 13:16:13 +0300 Subject: [PATCH 0194/2668] Fixed execution environment for migration test script. --- .../migration/src/main/groovy/MigrationSpec.groovy | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 727241c98..c83fc9102 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -45,7 +45,7 @@ class MigrationSpec { private static Process executeInBackground(String command) { println "# Executing command: $command in $EXECUTE_BASE_DIRECTORY.absolutePath" - return ['bash', '-c', command].execute([], EXECUTE_BASE_DIRECTORY) + return ['bash', '-c', 'set -x\n' + command].execute(null, EXECUTE_BASE_DIRECTORY) } /** @return command's exit status, or -1 if there was an Exception thrown */ @@ -111,11 +111,11 @@ class MigrationSpec { def grailsServer try { println "# Starting grails server on port $serverPort..." - grailsServer = executeInBackground "cd $contextPath && grails -Dserver.port=$serverPort prod run-app" + grailsServer = executeInBackground "echo \"# grails executable: `which grails`\"; cd $contextPath && grails -Dserver.port=$serverPort prod run-app" println "# Waiting for grails server to start..." boolean startedOk = false try { - grailsServer.inputStream.eachLine { line -> + grailsServer.in.eachLine { line -> println "# [grails] $line" if(line.trim().startsWith('| Server running. Browse to ')) { println 'Server started successfully.' @@ -130,9 +130,10 @@ class MigrationSpec { def remoteControl = getRemoteControl(contextPath) def testOutput = remoteControl.exec(remoteCode) } finally { - println "# Killing remote server" + println "# Killing remote server..." grailsServer.destroy() - println "# Grails exit code: ${grailsServer.exitValue()}" + grailsServer.waitFor() + println "# Remote server killed; exit code: ${grailsServer.exitValue()}" println "# cleaning and resetting git repository..." simpleExecute_ignoreExceptions('git reset --hard && git clean -xdf') From 2fc8151de5d1f21ec54e5588ad897844407d5e9a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 13:36:21 +0300 Subject: [PATCH 0195/2668] Added database cleanup to migration test; fixed migration test script. --- .../migration/src/main/groovy/MigrationSpec.groovy | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index c83fc9102..e141e8583 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -29,6 +29,10 @@ class MigrationSpec { } private static void init() { + println "# Deleting test database..." + simpleExecute_ignoreExceptions 'rm ~/frontlinesms2-migration-test-database.*' + println "# Test database deleted." + def porcelainOutput = simpleExecute('git status --porcelain | /usr/bin/env grep --quiet "."') println "# porcelainOutput=$porcelainOutput" def clean = porcelainOutput == 1 @@ -126,9 +130,13 @@ class MigrationSpec { if(!startedOk) throw new RuntimeException("Server failed to start ${version? "for '$version'": 'in original state'}") - println "# Running test script with remote control..." + println "# Creating remote control..." def remoteControl = getRemoteControl(contextPath) + println "# Remote control created." + + println "# Running test script with remote control..." def testOutput = remoteControl.exec(remoteCode) + println "# Remote test script executed successfully." } finally { println "# Killing remote server..." grailsServer.destroy() @@ -160,7 +168,7 @@ class MigrationSpec { poll1.save(failOnError:true, flush:true) PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'UTD!')) PollResponse.findByValue('manchester').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'MUFC!')) - PollResponse.findByValue('unknown').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'All I want is a good game.')) + PollResponse.findByValue('Unknown').addToMessages(new Fmessage(src:'+123', date:new Date(), text:'All I want is a good game.')) def barcelonaResponse = PollResponse.findByValue('barcelona'); 10.times { From f2a6ca09dff04f37d83bb4461c4720b83e52790c Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 17 Dec 2012 15:32:17 +0300 Subject: [PATCH 0196/2668] fixed migrationSpec typo --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index e141e8583..c0ffbdbe8 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -182,7 +182,7 @@ class MigrationSpec { poll2.addToResponses(key:'B', value:'no') poll2.addToResponses(PollResponse.createUnknown()) poll2.save(failOnError:true, flush:true) - new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: "Thanks for the input. Your number, ${contact_number}, has been added to our records").save(failOnError:true, flush:true) + new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: 'Thanks for the input. Your number, ${contact_number}, has been added to our records').save(failOnError:true, flush:true) } withStartingFrontlineSMS { From 816649b0c48510ca1905d5b2b672cadfec4f9466 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 17 Dec 2012 15:32:51 +0300 Subject: [PATCH 0197/2668] fixed migrationSpec typo --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index c0ffbdbe8..4758e8459 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -197,7 +197,7 @@ class MigrationSpec { def poll1 = Poll.findByName('Football Teams') assert poll1.question == "Who will win?" assert poll1.sentMessageText == "Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'" - assert poll1.autoreplyText == "Thank you, ${recipient_name}, for participating in the football poll" + assert poll1.autoreplyText == 'Thank you, ${recipient_name}, for participating in the football poll' assert poll1.keywords*.value.sort() == [''] assert poll1.keywords.size() == 5 assert poll1.keywords*.value.sort() == ['A', 'B', 'BARCELONA', 'FOOTBALL', 'MANCHESTER'] @@ -211,7 +211,7 @@ class MigrationSpec { assert !Keyword.findByValue('IRRELEVANT') def autoreply = Autoreply.findByName('Toothpaste') - assert autoreply.autoreplyText == "Thanks for the input. Your number, ${recipient_number}, has been added to our records" + assert autoreply.autoreplyText == 'Thanks for the input. Your number, ${recipient_number}, has been added to our records' // create any additional data for future } From 7d7eb8432255477fca47756c75177c36e206a4fb Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 15:35:40 +0300 Subject: [PATCH 0198/2668] FIXED CORE-1810 - The version at the bottom right corner read Version 2.0 may be it should read Version 2.2.0 --- plugins/frontlinesms-core/grails-app/views/_system.gsp | 1 + plugins/frontlinesms-core/grails-app/views/_system_menu.gsp | 5 +---- .../frontlinesms-core/grails-app/views/_version_number.gsp | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/_version_number.gsp diff --git a/plugins/frontlinesms-core/grails-app/views/_system.gsp b/plugins/frontlinesms-core/grails-app/views/_system.gsp index 6b627b1ea..f35868b11 100644 --- a/plugins/frontlinesms-core/grails-app/views/_system.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_system.gsp @@ -3,6 +3,7 @@ +
    diff --git a/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp b/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp index 5e15ae962..5b697cf2d 100644 --- a/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp @@ -11,7 +11,4 @@ -
    - - -
    + diff --git a/plugins/frontlinesms-core/grails-app/views/_version_number.gsp b/plugins/frontlinesms-core/grails-app/views/_version_number.gsp new file mode 100644 index 000000000..78e7cbcb4 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/_version_number.gsp @@ -0,0 +1,5 @@ +
    + + 2.${g.meta(name:'app.version')} +
    + From 7597167c9de35e97469b45ea87b3f6e367a05c10 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 17 Dec 2012 15:53:35 +0300 Subject: [PATCH 0199/2668] Moved connectionTooltips.js to common to fix CORE-1812 - Confirm screen in smslib fconnection has missing data and data from other connections --- plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 7a10da30d..770918afe 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -28,6 +28,7 @@ modules = { resource url:[dir:'js', file:'button.js'], disposition:'head' resource url:[dir:'js', file:'characterSMS-count.js'], disposition:'head' resource url:[dir:'js', file:'check_li.js'], disposition:'head' + resource url:[dir:'js', file:'/settings/connectionTooltips.js'], disposition:'head' resource url:[dir:'js', file:"jquery.ui.selectmenu.js"], disposition:'head' resource url:[dir:'js', file:"jquery.validate.min.js"], disposition:'head' resource url:[dir:'js', file:"mediumPopup.js"], disposition:'head' @@ -99,7 +100,6 @@ modules = { settings { dependsOn "common" resource url:[dir:'js', file:'/settings/basicAuthValidation.js'] - resource url:[dir:'js', file:'/settings/connectionTooltips.js'] } overrides { From 4af7f6ef0d24d5505dc0b84829cd09626d90d6e5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 18 Dec 2012 10:25:06 +0300 Subject: [PATCH 0200/2668] Fixed migration test output. --- .../migration/src/main/groovy/MigrationSpec.groovy | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 4758e8459..910d0d58d 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -92,6 +92,10 @@ class MigrationSpec { } // TEST HELPERS + def withStartingFrontlineSMS = { Closure remoteCode -> + withFrontlineSMS remoteCode + } + def withFrontlineSMS = { String version = null, contextPath = 'frontlinesms-core', Closure remoteCode -> if(version) { def gitTag = (version ==~ /\d+(\.\d+)*/)? "frontlinesms$version": version @@ -112,7 +116,7 @@ class MigrationSpec { println "# Displaying changes to working version..." executeAndEcho('git status') executeAndEcho('git diff') - def grailsServer + def grailsServer, testOutput try { println "# Starting grails server on port $serverPort..." grailsServer = executeInBackground "echo \"# grails executable: `which grails`\"; cd $contextPath && grails -Dserver.port=$serverPort prod run-app" @@ -135,7 +139,7 @@ class MigrationSpec { println "# Remote control created." println "# Running test script with remote control..." - def testOutput = remoteControl.exec(remoteCode) + testOutput = remoteControl.exec(remoteCode) println "# Remote test script executed successfully." } finally { println "# Killing remote server..." @@ -183,6 +187,8 @@ class MigrationSpec { poll2.addToResponses(PollResponse.createUnknown()) poll2.save(failOnError:true, flush:true) new Autoreply(name:"Toothpaste", keyword: new Keyword(value: 'MENO'), autoreplyText: 'Thanks for the input. Your number, ${contact_number}, has been added to our records').save(failOnError:true, flush:true) + + return true } withStartingFrontlineSMS { @@ -214,6 +220,7 @@ class MigrationSpec { assert autoreply.autoreplyText == 'Thanks for the input. Your number, ${recipient_number}, has been added to our records' // create any additional data for future + return true } performMigration { From 6d419971851261bc5227328385658374770b6b86 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 18 Dec 2012 10:25:30 +0300 Subject: [PATCH 0201/2668] Added script for running migration tests. --- plugins/frontlinesms-core/do/test_migrations | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 plugins/frontlinesms-core/do/test_migrations diff --git a/plugins/frontlinesms-core/do/test_migrations b/plugins/frontlinesms-core/do/test_migrations new file mode 100755 index 000000000..6c201a130 --- /dev/null +++ b/plugins/frontlinesms-core/do/test_migrations @@ -0,0 +1,14 @@ +#!/bin/bash +set -e +TEMP_DIR=../../../frontlinesms2-db-migrate-test-temp +echo "# Checking if $TEMP_DIR folder exists already..." +TODO + +echo "# Running the tests..." +TODO + +echo "# Cleaning temp dir $TEMP_DIR..." +rm -rf $TEMP_DIR + +echo "# migration test script complete." + From f3fceaf9d687b4d5bffef61768fd302f25342ba4 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 18 Dec 2012 10:45:48 +0300 Subject: [PATCH 0202/2668] Changed buildDir for migration test. --- plugins/frontlinesms-core/test/migration/gradle.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 plugins/frontlinesms-core/test/migration/gradle.properties diff --git a/plugins/frontlinesms-core/test/migration/gradle.properties b/plugins/frontlinesms-core/test/migration/gradle.properties new file mode 100644 index 000000000..6d3328a27 --- /dev/null +++ b/plugins/frontlinesms-core/test/migration/gradle.properties @@ -0,0 +1 @@ +buildDir=../../../../../migation-test-temp From 6945f25db750cc8551259a03a218aa0a4a75b961 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 18 Dec 2012 13:12:56 +0300 Subject: [PATCH 0203/2668] Fixed migration test grails shutdown. --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 910d0d58d..2f79fab6a 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -119,7 +119,11 @@ class MigrationSpec { def grailsServer, testOutput try { println "# Starting grails server on port $serverPort..." - grailsServer = executeInBackground "echo \"# grails executable: `which grails`\"; cd $contextPath && grails -Dserver.port=$serverPort prod run-app" + grailsServer = ['grails', + "-Dserver.port=$serverPort", + '--non-interactive', + 'prod', + 'run-app'].execute(null, new File(EXECUTE_BASE_DIRECTORY, contextPath)) println "# Waiting for grails server to start..." boolean startedOk = false try { From 5d6a1a56cfcf29f962559e6e63149f5cbf80fe48 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 19 Dec 2012 12:13:03 +0300 Subject: [PATCH 0204/2668] Fixed typo in english translation. --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index f73376ffe..f610c91cc 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -607,7 +607,7 @@ intellismsfconnection.serverName.label=Server Name intellismsfconnection.serverPort.label=Server Port intellismsfconnection.emailUserName.label=Username intellismsfconnection.emailPassword.label=Password -intellismsfconnection.description=Send an receive messages through an Intellisms account +intellismsfconnection.description=Send and receive messages through an Intellisms account intellismsfconnection.global.info=You will need to configure an account with Intellisms (www.intellisms.co.uk). intelliSmsFconnection.send.validator.invalid = You cannot configure a connection without SEND or RECEIVE functionality intelliSmsFconnection.receive.validator.invalid = You cannot configure a connection without SEND or RECEIVE functionality From 027d6c0256c8c9191f874743f1a2818d3ed1aa92 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Wed, 2 Jan 2013 13:05:41 +0300 Subject: [PATCH 0205/2668] Test fixes on I18nUtilService --- plugins/frontlinesms-core/application.properties | 2 +- .../test/integration/frontlinesms2/I18nUtilServiceSpec.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index c4b302c3c..60ce1063a 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Thu Dec 13 10:40:00 EAT 2012 +#Wed Jan 02 10:57:59 EAT 2013 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy index 33d986fc7..2244ba1d2 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy @@ -8,7 +8,7 @@ class I18nUtilServiceSpec extends IntegrationSpec { def 'get a list of available translations'() { expect: - i18nUtilService.getAllTranslations() == [ar:'Arabic', de:'Deutsch', '':'English', es:'Español', fr:'French', in_ID:'Indonesian', sw:'Kiswahili', pt:'Português', ru:'Русский'] + i18nUtilService.getAllTranslations() == [ar:'Arabic', de:'Deutsch', '':'English', es:'Español', fr:'French', in_ID:'Indonesian', jp:'Japanese', sw:'Kiswahili', pt:'Português', ru:'Русский'] } @Unroll From f79688f1ee3842dfa9589c8cb24f38e903e79d13 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 3 Jan 2013 11:38:48 +0300 Subject: [PATCH 0206/2668] added smpp outgoing route --- .../grails-app/conf/BuildConfig.groovy | 2 +- .../domain/frontlinesms2/Fconnection.groovy | 6 +- .../frontlinesms2/SmppFconnection.groovy | 56 +++++++++++++++++++ .../camel/smpp/SmppPostProcessor.groovy | 19 +++++++ .../camel/smpp/SmppPreProcessor.groovy | 39 +++++++++++++ 5 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy create mode 100644 plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPostProcessor.groovy create mode 100644 plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 6293c703e..16e8f1ead 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -70,7 +70,7 @@ grails.project.dependency.resolution = { compile('net.frontlinesms.core:camel-smslib:0.0.7') { //excludes 'smslib' } - ['mail', 'http'].each { compile camel(it) } + ['mail', 'http', 'smpp'].each { compile camel(it) } compile 'net.frontlinesms.core:serial:1.0.1' compile 'net.frontlinesms.core:at-modem-detector:0.8' runtime 'org.rxtx:rxtx:2.1.7' diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index e90783504..b53df5ddb 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -21,12 +21,14 @@ class Fconnection { if(Environment.current == Environment.PRODUCTION) { [SmslibFconnection, ClickatellFconnection, - IntelliSmsFconnection] + IntelliSmsFconnection, + SmppFconnection] } else { [SmslibFconnection, ClickatellFconnection, IntelliSmsFconnection, - SmssyncFconnection] + SmssyncFconnection, + SmppFconnection] } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy new file mode 100644 index 000000000..f075eb54e --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy @@ -0,0 +1,56 @@ +package frontlinesms2 + +import frontlinesms2.camel.smpp.* + +import org.apache.camel.Exchange +import org.apache.camel.builder.RouteBuilder +import org.apache.camel.model.RouteDefinition +import frontlinesms2.camel.exception.* + +class SmppFconnection extends Fconnection { + static final configFields = [name:null, url:null, port:null, username:null, password:null, fromNumber:null] + static final defaultValues = [] + static String getShortName() { 'smpp' } + + String url + String port + String username + String password + String fromNumber + + static constraints = { + url blank:false + port blank:false + username blank:false + password blank:false + fromNumber blank:true + } + + static passwords = ['password'] + + static mapping = { + password column: 'smpp_password' + } + + List getRouteDefinitions() { + return new RouteBuilder() { + @Override void configure() {} + List getRouteDefinitions() { + return [from("seda:out-${SmppFconnection.this.id}") + .onException(RuntimeException) + .handled(true) + .beanRef('fconnectionService', 'handleDisconnection') + .end() + .setHeader(Fconnection.HEADER_FCONNECTION_ID, simple(SmppFconnection.this.id.toString())) + .process(new SmppPreProcessor()) + .to(SmppFconnection.this.fullUrl) + .process(new SmppPostProcessor()) + .routeId("out-internet-${SmppFconnection.this.id}")] + } + }.routeDefinitions + } + + private getFullUrl(){ + return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=3000&transactionTimer=5000&systemType=producer" + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPostProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPostProcessor.groovy new file mode 100644 index 000000000..5160c34df --- /dev/null +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPostProcessor.groovy @@ -0,0 +1,19 @@ +package frontlinesms2.camel.smpp + +import frontlinesms2.* +import org.apache.camel.* +import frontlinesms2.camel.exception.* + +class SmppPostProcessor implements Processor { + public void process(Exchange exchange) throws Exception { + def log = { println "SmppPostProcessor.process() : $it" } + log 'ENTRY' + log "in.body:" + exchange.in.body + byte[] bytes = exchange.in.getBody(byte[].class); + log "in.body as byte[]:" + bytes + String text = new String(bytes, "UTF-8").trim(); + log "in.body as byte[] as String:" + text + log "in.body got as a string" + exchange.in.getBody(String.class) + log 'EXIT' + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy new file mode 100644 index 000000000..0d1aed48f --- /dev/null +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy @@ -0,0 +1,39 @@ +package frontlinesms2.camel.smpp + +import frontlinesms2.* +import org.apache.camel.* + +class SmppPreProcessor implements Processor { + public void process(Exchange x) throws Exception { + def log = { println "SmppPreProcessor.process() : $it" } + log 'ENTRY' + + // URL-encode body + def d = x.in.body + x.in.headers['frontlinesms.dispatch.id'] = d.id + x.in.body = urlEncode(d.text) + + def destination = d.dst + if(destination && destination.charAt(0)=='+') destination = destination.substring(1) + set x, 'dst', destination + + // Add auth details to header + log "Calculating connection ID..." + def connectionId = x.fconnectionId + log "connectionId=$connectionId" + def connection = SmppFconnection.get(connectionId) + log "connection=$connection" + + log 'EXIT' + } + + private def set(Exchange x, String header, String value) { + println "PreProcessor.set() : header=$header; value=$value" + x.in.headers["smpp.$header"] = urlEncode(value) + } + + private String urlEncode(String s) throws UnsupportedEncodingException { + println "PreProcessor.urlEncode : s=$s -> ${URLEncoder.encode(s, "UTF-8")}" + return URLEncoder.encode(s, "UTF-8"); + } +} \ No newline at end of file From 9925a6dc3a08f48b3aeb4a7125fdd8caca67dfca Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 3 Jan 2013 12:35:22 +0300 Subject: [PATCH 0207/2668] Fixed CORE-1823 bug --- plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 7a10da30d..d137fa82a 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -40,6 +40,7 @@ modules = { resource url:[dir:'js', file:'magicwand.js'], disposition:'head' resource url:[dir:'js', file:'selectmenuTools.js'], disposition:'head' resource url:[dir:'js', file:"activity/popupCustomValidation.js"], disposition:'head' + resource url:[dir:'js', file:'/settings/connectionTooltips.js'] resource url:[dir:'js', file:"guiders-1.2.8.js"], disposition:'head' resource url:[dir:'css', file:"guiders-1.2.8.css"], disposition:'head' @@ -99,7 +100,6 @@ modules = { settings { dependsOn "common" resource url:[dir:'js', file:'/settings/basicAuthValidation.js'] - resource url:[dir:'js', file:'/settings/connectionTooltips.js'] } overrides { From 2d46ba839a3120615a7bc61492c10ed0c3177230 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 3 Jan 2013 15:17:58 +0300 Subject: [PATCH 0208/2668] fixed CORE-1811 --- .../grails-app/views/webconnection/_confirm.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp index c23e4337e..aaee3fab9 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_confirm.gsp @@ -4,6 +4,6 @@ - + From 327e58fea0483dc814e1b19363d7b90b6da7f0ee Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 3 Jan 2013 15:22:54 +0300 Subject: [PATCH 0209/2668] added support for incoming routes --- .../frontlinesms2/SmppFconnection.groovy | 46 +++++++++++++------ .../SmppTranslationService.groovy | 38 +++++++++++++++ .../camel/smpp/SmppPreProcessor.groovy | 3 +- 3 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy index f075eb54e..63863507f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy @@ -8,8 +8,8 @@ import org.apache.camel.model.RouteDefinition import frontlinesms2.camel.exception.* class SmppFconnection extends Fconnection { - static final configFields = [name:null, url:null, port:null, username:null, password:null, fromNumber:null] - static final defaultValues = [] + static final configFields = [name:null, url:null, port:null, username:null, password:null, fromNumber:null, send:null , receive:null] + static defaultValues = [send:true, receive:true] static String getShortName() { 'smpp' } String url @@ -17,6 +17,8 @@ class SmppFconnection extends Fconnection { String username String password String fromNumber + Boolean send = true + Boolean receive = true static constraints = { url blank:false @@ -36,21 +38,39 @@ class SmppFconnection extends Fconnection { return new RouteBuilder() { @Override void configure() {} List getRouteDefinitions() { - return [from("seda:out-${SmppFconnection.this.id}") - .onException(RuntimeException) - .handled(true) - .beanRef('fconnectionService', 'handleDisconnection') - .end() - .setHeader(Fconnection.HEADER_FCONNECTION_ID, simple(SmppFconnection.this.id.toString())) - .process(new SmppPreProcessor()) - .to(SmppFconnection.this.fullUrl) - .process(new SmppPostProcessor()) - .routeId("out-internet-${SmppFconnection.this.id}")] + def definitions = [] + + if(SmppFconnection.this.send){ + definitions << from("seda:out-${SmppFconnection.this.id}") + .setHeader("CamelSmppSourceAddr", simple(SmppFconnection.this.fromNumber)) + .onException(RuntimeException) + .handled(true) + .beanRef('fconnectionService', 'handleDisconnection') + .end() + .setHeader(Fconnection.HEADER_FCONNECTION_ID, simple(SmppFconnection.this.id.toString())) + .process(new SmppPreProcessor()) + .to(SmppFconnection.this.sendingUrl) + .process(new SmppPostProcessor()) + .routeId("out-internet-${SmppFconnection.this.id}") + } + + if(SmppFconnection.this.receive){ + definitions << from(SmppFconnection.this.receivingUrl) + .setHeader(Fconnection.HEADER_FCONNECTION_ID, simple(SmppFconnection.this.id.toString())) + .beanRef('smppTranslationService', 'process') + .to('seda:incoming-fmessages-to-store') + .routeId("in-${SmppFconnection.this.id}") + } + return definitions } }.routeDefinitions } - private getFullUrl(){ + private getSendingUrl(){ return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=3000&transactionTimer=5000&systemType=producer" } + + private getReceivingUrl(){ + return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=3000&transactionTimer=5000&systemType=consumer" + } } \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy new file mode 100644 index 000000000..696b7bbfa --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy @@ -0,0 +1,38 @@ +package frontlinesms2 + +import org.apache.camel.Processor +import org.apache.camel.Exchange + +class SmppTranslationService implements Processor { + static final String INTERNATIONAL_SYMBOL = '+' + static transactional = false + + void process(Exchange exchange) { + log { t-> + println "SmppTranslationService.process ${t}" + } + println("exchange ${exchange}") + def i = exchange.in + println("in: ${i}") + if(i.getHeader('CamelSmppSourceAddr')) { + Fmessage message = new Fmessage(inbound:true) + def messageBody = i.body + def messageSource = i.getHeader('CamelSmppSourceAddr') + def messageDate = i.getHeader('CamelSmppDoneDate') + + message.src = messageSource + message.text = messageBody + message.date = Date.parse("YYMMDDhhmm",messageDate) + + log "message source is ${message.src}" + log "message body is ${message.text}" + log "message sent on ${message.date}" + + + exchange.out.body = message + } else { + exchange.setProperty(Exchange.ROUTE_STOP, Boolean.TRUE); + } + + } +} diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy index 0d1aed48f..204566425 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy @@ -16,7 +16,8 @@ class SmppPreProcessor implements Processor { def destination = d.dst if(destination && destination.charAt(0)=='+') destination = destination.substring(1) set x, 'dst', destination - + //Setting the destination of the message + x.in.setHeader("CamelSmppDestAddr", d.dst) // Add auth details to header log "Calculating connection ID..." def connectionId = x.fconnectionId From 10545fab4ea205f0281f3b8afbf6297e499ec206 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 3 Jan 2013 15:33:19 +0300 Subject: [PATCH 0210/2668] D --- .../grails-app/conf/CoreBootStrap.groovy | 1 + .../grails-app/i18n/messages.properties | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index b8a2f1e5b..70c084cda 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -209,6 +209,7 @@ class CoreBootStrap { serverPort:993, username:'mr.testy@zoho.com', password:'mister').save(failOnError:true) new ClickatellFconnection(name:"Clickatell Mock Server", apiId:"api123", username:"boris", password:"top secret").save(failOnError:true) new IntelliSmsFconnection(name:"IntelliSms Mock connection", send:true, username:"johnmark", password:"pass_word").save(failOnError:true) + new SmppFconnection(name:'Vanuatu', send:true, receive:true, url:'127.0.0.1', port:'5775', fromNumber:'FrontlineSMS', username:'pavel', password:'wpsd').save(failOnError:true) } private def dev_initRealSmslibFconnections() { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index f73376ffe..53a9e828e 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -1011,3 +1011,19 @@ dynamicfield.sender_name.label=Sender Name dynamicfield.sender_number.label=Sender Number dynamicfield.recipient_number.label=Recipient Number dynamicfield.recipient_name.label=Recipient Name + +# Smpp Fconnection +smppfconnection.label=Smpp Account +smppfconnection.type.label=Type +smppfconnection.name.label=Name + +smppfconnection.send.label=Use for sending +smppfconnection.receive.label=Use for receiving +smppfconnection.url.label=SMSC Url +smppfconnection.port.label=SMSC Port +smppfconnection.username.label=Username +smppfconnection.password.label=Password +smppfconnection.fromNumber.label=From Number +smppfconnection.description=Send an receive messages through an SMSC +smppfconnection.global.info=You will need to get an account with your phone network of choice. +smppfconnection.send.validator.invalid = You cannot configure a connection without SEND or RECEIVE fuctionality. \ No newline at end of file From 5bc5a44034f17bf82e257bdcb3b521a6e46c2181 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 4 Jan 2013 09:26:30 +0300 Subject: [PATCH 0211/2668] Fixed Bugs on Kiswahili version --- .../grails-app/i18n/messages.properties | 10 ++++++++++ .../grails-app/i18n/messages_sw.properties | 11 ++++++++++- .../grails-app/views/archive/standard.gsp | 2 +- .../grails-app/views/contact/show.gsp | 3 ++- .../grails-app/views/export/messageWizard.gsp | 5 ----- .../grails-app/views/layouts/archive.gsp | 2 +- .../grails-app/views/layouts/settings.gsp | 2 +- .../grails-app/views/message/standard.gsp | 2 +- .../grails-app/views/status/show.gsp | 3 ++- .../help/core/settings/7.translatingfrontlinesms.txt | 6 +++--- .../web-app/js/message/moreActions.js | 2 +- 11 files changed, 32 insertions(+), 16 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index f73376ffe..93b79860c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -76,6 +76,7 @@ status.connection.none=You have no connections configured. status.devises.header=Detected devices status.detect.modems=Detect Modems status.modems.none=No devices have been detected yet. +status.header=Status connectionstatus.not_connected=Not connected connectionstatus.connecting=Connecting @@ -226,6 +227,13 @@ smssyncfconnection.global.info=Download the SMSSync app from > {0} contact.all.contacts=Waasiliani wote ({0}) contact.create=Unda mwasiliani mpya contact.groups.header=Vikundi diff --git a/plugins/frontlinesms-core/grails-app/views/archive/standard.gsp b/plugins/frontlinesms-core/grails-app/views/archive/standard.gsp index 087c37b40..3e0555b1c 100644 --- a/plugins/frontlinesms-core/grails-app/views/archive/standard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/archive/standard.gsp @@ -1,7 +1,7 @@ - ${pageTitle?:params.action.capitalize()} + <g:message code="archive.header.${pageTitle?:params.action}"/> diff --git a/plugins/frontlinesms-core/grails-app/views/contact/show.gsp b/plugins/frontlinesms-core/grails-app/views/contact/show.gsp index 9019ddf32..565c05bcb 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/show.gsp @@ -1,7 +1,7 @@ <%@ page import="frontlinesms2.Contact" %> - ${contactsSection ? "Contacts >> ${contactsSection.name}" : 'Contacts'} + <g:message code="${contactsSection ? 'contact.header.group' : 'contact.header'}" args= "[contactsSection?.name]"/> $(function() { @@ -20,3 +20,4 @@ + diff --git a/plugins/frontlinesms-core/grails-app/views/export/messageWizard.gsp b/plugins/frontlinesms-core/grails-app/views/export/messageWizard.gsp index aa63ea5a0..dd1305250 100644 --- a/plugins/frontlinesms-core/grails-app/views/export/messageWizard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/export/messageWizard.gsp @@ -14,8 +14,3 @@ - -function updateExportInfo() { - $(".ui-dialog-title").html("Export Messages: ${reportName}"); -} - diff --git a/plugins/frontlinesms-core/grails-app/views/layouts/archive.gsp b/plugins/frontlinesms-core/grails-app/views/layouts/archive.gsp index 0407189ac..7a22af165 100644 --- a/plugins/frontlinesms-core/grails-app/views/layouts/archive.gsp +++ b/plugins/frontlinesms-core/grails-app/views/layouts/archive.gsp @@ -2,7 +2,7 @@ - Archive >> <g:layoutTitle/> + <g:message code="archive.header"/> <g:layoutTitle/> diff --git a/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp b/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp index 8c4f6af6b..bf47f1c28 100644 --- a/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp +++ b/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp @@ -2,7 +2,7 @@ - <g:layoutTitle default="Settings"/> + <g:message code="settings.general.header"/> diff --git a/plugins/frontlinesms-core/grails-app/views/message/standard.gsp b/plugins/frontlinesms-core/grails-app/views/message/standard.gsp index 08d4b9a15..01a9c2be4 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/standard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/standard.gsp @@ -1,7 +1,7 @@ - ${pageTitle?:params.action.capitalize()} + <g:message code="message.header.${pageTitle?:params.action}" /> diff --git a/plugins/frontlinesms-core/grails-app/views/status/show.gsp b/plugins/frontlinesms-core/grails-app/views/status/show.gsp index 2bb4042ab..852c67309 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/show.gsp @@ -2,7 +2,8 @@ - + <g:message code="status.header"/> +
    diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/7.translatingfrontlinesms.txt b/plugins/frontlinesms-core/web-app/help/core/settings/7.translatingfrontlinesms.txt index 1bbaa5665..05aef7f9c 100644 --- a/plugins/frontlinesms-core/web-app/help/core/settings/7.translatingfrontlinesms.txt +++ b/plugins/frontlinesms-core/web-app/help/core/settings/7.translatingfrontlinesms.txt @@ -34,10 +34,10 @@ Right-click on messages.properties and select "Copy" from the menu that appears. 5.Once open, you should see something similar to the below: - <# FrontlineSMS English translation by the FrontlineSMS team, Nairobi> + # FrontlineSMS English translation by the FrontlineSMS team, Nairobi language.name=English - <# Common action imperatives - to be used for button labels and similar> + # Common action imperatives - to be used for button labels and similar action.ok=OK action.close=Close action.cancel=Cancel @@ -52,7 +52,7 @@ Right-click on messages.properties and select "Copy" from the menu that appears. action.send=Send action.export=Export - <#Connections:> + #Connections: connection.creation.failed = Connection could not be created {0} connection.route.destroyed = Destroyed route from {0} to {1} connection.route.connecting = Connecting... diff --git a/plugins/frontlinesms-core/web-app/js/message/moreActions.js b/plugins/frontlinesms-core/web-app/js/message/moreActions.js index 6fba97172..4a4478d55 100644 --- a/plugins/frontlinesms-core/web-app/js/message/moreActions.js +++ b/plugins/frontlinesms-core/web-app/js/message/moreActions.js @@ -72,7 +72,7 @@ function exportAction() { data: params, beforeSend: function(){ showThinking(); }, success: function(data) { - hideThinking(); launchSmallPopup(i18n("smallpopup.fmessage.export.title"), data, i18n("action.export")); + hideThinking(); launchSmallPopup(i18n("smallpopup.messages.export.title"), data, i18n("action.export")); updateExportInfo(); } }); } From c3f7031d6aa73e77be9ceb422f36b9a1a0c8e714 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 4 Jan 2013 11:49:16 +0300 Subject: [PATCH 0212/2668] CORE-1815 fixed: Poll graph stats corrected --- .../domain/frontlinesms2/Poll.groovy | 2 +- .../frontlinesms2/domain/PollISpec.groovy | 25 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy index ecaecdf00..6e7b24844 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy @@ -82,7 +82,7 @@ class Poll extends Activity { } def getResponseStats() { - def totalMessageCount = getActivityMessages().count() + def totalMessageCount = this.messages.findAll { it.inbound && !it.isDeleted }.size() responses.sort {it.key?.toLowerCase()}.collect { def messageCount = it.liveMessageCount [id: it.id, diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/PollISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/PollISpec.groovy index 565447538..16afb5b27 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/PollISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/PollISpec.groovy @@ -25,7 +25,7 @@ class PollISpec extends grails.plugin.spock.IntegrationSpec { p.getActivityMessages().count() == 1 } - def 'Response stats are calculated correctly, even when messages are deleted'() { + def 'Response stats are calculated correctly, even when messages are deleted and there are outbound messages'() { given: def p = new Poll(name: 'Who is badder?') p.editResponses(choiceA:'Michael-Jackson', choiceB:'Chuck-Norris') @@ -40,9 +40,21 @@ class PollISpec extends grails.plugin.spock.IntegrationSpec { [id:cnId, value:"Chuck-Norris", count:0, percent:0], [id:ukId, value:"Unknown", count:0, percent:0] ] + when: + def outbound1 = new Fmessage(inbound:false, text:'who is badder in your opinion?') + outbound1.addToDispatches(new Dispatch(dst:"123", status:DispatchStatus.SENT, dateSent:new Date())) + p.addToMessages(outbound1) + p.save(failOnError:true, flush:true) + then: + p.responseStats == [ + [id:mjId, value:"Michael-Jackson", count:0, percent:0], + [id:cnId, value:"Chuck-Norris", count:0, percent:0], + [id:ukId, value:"Unknown", count:0, percent:0] + ] when: PollResponse.findByValue('Michael-Jackson').addToMessages(new Fmessage(text:'MJ', date: new Date(), inbound: true, src: '12345').save(failOnError:true, flush:true)) PollResponse.findByValue('Chuck-Norris').addToMessages(new Fmessage(text:'big charlie', date: new Date(), inbound: true, src: '12345').save(failOnError:true, flush:true)) + println "POLL MESSAGE COUNT: ${p.messages.size()}" then: p.responseStats == [ [id:mjId, value:'Michael-Jackson', count:1, percent:50], @@ -58,6 +70,17 @@ class PollISpec extends grails.plugin.spock.IntegrationSpec { [id:cnId, value:'Chuck-Norris', count:1, percent:100], [id:ukId, value:'Unknown', count:0, percent:0] ] + when: + def outbound = new Fmessage(inbound:false, text:'thanks for your response') + outbound.addToDispatches(new Dispatch(dst:"123", status:DispatchStatus.SENT, dateSent:new Date())) + p.addToMessages(outbound) + p.save(failOnError:true, flush:true) + then: + p.responseStats == [ + [id:mjId, value:'Michael-Jackson', count:0, percent:0], + [id:cnId, value:'Chuck-Norris', count:1, percent:100], + [id:ukId, value:'Unknown', count:0, percent:0] + ] } def "creating a new poll also creates a poll response with value 'Unknown'"() { From fd16fca21794e16b88ce25da6831d827071d020e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 4 Jan 2013 12:19:53 +0300 Subject: [PATCH 0213/2668] fixed bug : keywords displayed in confirm screen even after sorting is not enabled --- .../grails-app/views/webconnection/_validate.gsp | 13 ------------- .../views/webconnection/generic/_scripts.gsp | 8 +++++++- .../views/webconnection/ushahidi/_scripts.gsp | 10 +++++++++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index cde7f7e26..718924f7a 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -81,7 +81,6 @@ mediumPopup.addValidation('webconnection-confirm', confirmTabValidation); $("#tabs").bind("tabsshow", function(event, ui) { - updateConfirmationMessage(); webconnectionDialog.updateConfirmationScreen(); }); } @@ -114,16 +113,4 @@ function setPara(selecter, text) { $(selecter).html("

    " + text + "

    "); } - - function updateConfirmationMessage() { - var keywordConfirmationText; - if(!(isGroupChecked("blankKeyword"))) { - keywordConfirmationText = $('#keywords').val().toUpperCase(); - } else { - keywordConfirmationText = i18n("autoreply.blank.keyword"); - } - setPara("#keyword-confirm", keywordConfirmationText); - setPara("#autoreply-confirm", $('#messageText').val()); - } - diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp index e1e1f6c31..53644364a 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp @@ -4,7 +4,13 @@ var url = $("input[name=url]").val(); var httpMethod = $("input[name=httpMethod]:checked").val().toUpperCase(); var requestParameters = ""; - var keyword = $("input#keywords").val() || i18n("webconnection.none.label"); + var keyword = (function(){ + if($("input[name='sorting']:checked").attr('value') == "enabled") { + return $("input#keywords").val(); + } else { + return i18n("webconnection.none.label"); + } + })(); var apiKey = ('('+ i18n('webconnection.api.disabled') +')'); if ($("input[name=enableApi]").is(":checked")) apiKey = $("input[name=secret]").val(); diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp index 7de29b2a5..0156f0ac6 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp @@ -23,7 +23,15 @@ if(isCrowdMap) $("input[name=url]").val("https://" + $(this).val() + ".crowdmap.com" + "/frontlinesms/"); else $("input[name=url]").val($(this).val()); }); - var keyword = $("input[name=keywords]").val() || i18n("webconnection.none.label"); + + var keyword = (function(){ + if($("input[name='sorting']:checked").attr('value') == "enabled") { + return $("input#keywords").val(); + } else { + return i18n("webconnection.none.label"); + } + })(); + $("#confirm-service").html('

    ' + $("input[name=serviceType]:checked").val() + '

    '); $("#confirm-url").html('

    ' + $("input[name=url]").val() + '

    '); $("#confirm-fsmskey").html('

    ' + fsmsApiKey + '

    '); From 3bcf4c8d57117b661d4c8189551754fc29bd61cd Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 4 Jan 2013 14:21:11 +0300 Subject: [PATCH 0214/2668] poll message sending fails after editing or creating a poll --- .../grails-app/services/frontlinesms2/PollService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy index 5ac5d9c1a..91a97b83c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/PollService.groovy @@ -29,7 +29,7 @@ class PollService{ def message = messageSendService.createOutgoingMessage(params) message.save() poll.addToMessages(message) - MessageSendJob.defer(message) + messageSendService.send(message) } poll.save(failOnError:true) poll From 4b48fa34b2f0c8b0260b0f156e8985c36434e652 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 4 Jan 2013 14:37:29 +0300 Subject: [PATCH 0215/2668] Minor tweak to the connecting notification for connections --- .../controllers/frontlinesms2/ConnectionController.groovy | 1 + plugins/frontlinesms-core/grails-app/views/connection/show.gsp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 368f5bd5c..a9cfaba30 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -108,6 +108,7 @@ class ConnectionController extends ControllerUtils { } def createRoute() { + params.count = SystemNotification.countByRead(false) CreateRouteJob.triggerNow([connectionId:params.id]) params.createRoute = true flash.message = message(code: 'connection.route.connecting') diff --git a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp index 822806fda..f777e21e5 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp @@ -7,7 +7,7 @@ $(function() { var count = 0; - var oldSystemNotificationCount = $("div.system-notification").length; + var oldSystemNotificationCount = "${params.count}"; var connectionTimer = setInterval(refreshConnectionStatus, 2000); function refreshConnectionStatus() { $.get("${createLink(controller:'connection', action:'list', id:params?.id)}", function(data) { From c5840239e892d5297e80a2be7b1470b6500073a4 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 4 Jan 2013 15:26:48 +0300 Subject: [PATCH 0216/2668] sw i18n updates - removed redundancies and added a few missing entries --- .../grails-app/i18n/messages_sw.properties | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 0c2852660..c5a6630a9 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -35,16 +35,22 @@ connection.route.successNotification=Njia imeundwa katika {0} na mafanikio connection.route.failNotification=Imefeli kuunda njia katika {0}     Hariri Muunganisho connection.route.destroyNotification=Njia imekatika katika {0} connection.test.sent=Jaribio imetumwa kwa {0} na {1} na fanaka +connection.route.exception={1} # Connection exception messages connection.error.org.smslib.alreadyconnectedexception=Kifaa kimeshikamana tayari connection.error.org.smslib.gsmnetworkregistrationexception=Kimeshindwa kujiandikisha na mtandao wa GSM connection.error.org.smslib.invalidpinexception=PIN iliyotolewa si sahihi connection.error.org.smslib.nopinexception=PIN inahitajika lakini haijatolewa +connection.error.org.smslib.notconnectedexception={0} connection.error.org.smslib.nosuchportexception=Kituo tarishi hakipatikana au hakiwezi kufikiwa connection.error.java.io.ioexception=Kituo tarishi kilipata kasoro ifuatayo: {0} +connection.error.frontlinesms2.camel.exception.invalidapiidexception= {0} +connection.error.frontlinesms2.camel.exception.authenticationexception= {0} +connection.error.frontlinesms2.camel.exception.insufficientcreditexception={0} connection.error.serial.nosuchportexception=Kituo tarishi hakipatikani connection.error.org.apache.camel.runtimecamelexception=Hakiwezi kuungana na muunganisho + connection.header=Mazingira > Miunganisho > connection.list.none=Huna miunganisho iliyo sanidiwa connection.edit=Hariri mwunganisho @@ -71,6 +77,7 @@ status.devises.header=Vifaa vilivyotambulika status.detect.modems=Tambua modemu status.modems.none=Hakuna vifaa vinavyotambulika status.header=Hali + connectionstatus.not_connected=Haijaunganishwa connectionstatus.connecting=Inaunganishwa connectionstatus.connected=Imeunganishwa @@ -199,8 +206,11 @@ clickatellfconnection.name.label=Jina clickatellfconnection.apiId.label=Kitambulisho cha API clickatellfconnection.username.label=jina la mtumiaji clickatellfconnection.password.label=nywila +clickatellfconnection.sendToUsa.label=Tuma Risala Marekani +clickatellfconnection.fromNumber.label=Nambari inayotuma clickatellfconnection.description=Tuma na pokea risala kutumia akaunti ya Clickatell clickatellfconnection.global.info=Utahitaji kusanidi akanuti na Clickatell (www.clickatell.com). +clickatellFconnection.fromNumber.validator.invalid=Nambari ya kutuma inahitajika kutuma risala Marekani # Smssync Fconnection smssyncfconnection.label=SMSSync @@ -218,8 +228,8 @@ message.create.prompt=Andika risala message.character.count=Nafasi iliyobaki ni {0}. Risala {1} message.character.count.warning=Idadi ya maneno inaweza kuongezeka baada ya kufanya mabadilisho message.header.inbox=Risala -message.header.pending=Risala Zitakazotumwa message.header.sent=Risala Zilizotumwa +message.header.pending=Risala Zitakazotumwa message.header.trash=Takataka message.header.folder=Folda message.header.activityList=Matendo @@ -241,7 +251,7 @@ announcement.message.label=Risala announcement.message.none=Hakuna announcement.recipients.label=Wapokeaji announcement.create.message=Andika risala - +#TODO embed javascript values announcement.recipients.count=wapokeaji waliochaguliwa announcement.messages.count=risala zitatumwa announcement.moreactions.delete=Futa tangazo @@ -423,15 +433,14 @@ folder.moreactions.delete=Futa folda folder.moreactions.rename=Badilisha jina la folda folder.moreactions.export=Pakia folda + #TODO embed javascript values poll.reply.text=Jibu "{0} {1}" kujibu Ndio, "{2} {3}" kujibu La. poll.reply.text1={0} "{1} {2}" kujibu {3} -autoreply.moreactions.delete=Futa jibu la moja kwa moja -poll.reply.text6=Tafadhali jibu poll.reply.text2=Tafadhali jibu 'Ndio' au 'La' poll.reply.text3=ama -poll.reply.text4={0} {1} poll.reply.text5=Jibu +poll.reply.text6=Tafadhali jibu poll.message.send={0} {1} poll.recipients.validation.error=Chagua waasiliani wa kutumia risala frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name = {1} {0} "{2}" lazima liwe la kipekee @@ -610,6 +619,8 @@ intellismsfconnection.emailUserName.label=Jina la mtumiaji intellismsfconnection.emailPassword.label=Nywila intellismsfconnection.description=Tuma na upokee risala kwa kutumia akaunti ya Intellisms intellismsfconnection.global.info=Utahitajike kusanidi akaunti na Intellisms (www.intellisms.co.uk). +intelliSmsFconnection.send.validator.invalid=Huwezi kuunda mwunganisho bila utendaji wa KUTUMA au KUPOKEA +intelliSmsFconnection.receive.validator.invalid=Huwezi kuunda mwunganisho bila utendaji wa KUTUMA au KUPOKEA #Controllers contact.label=Mwasiliani @@ -880,7 +891,7 @@ webconnection.ushahidi.serviceType.ushahidi=Ushahidi webconnection.crowdmap.url.suffix.label=.crowdmap.com webconnection.ushahidi.subtitle=Muunganisho wa wavuti kwa {0} webconnection.ushahidi.service.label=Huduma: -webconnection.ushahidi.url.label=Anwani: +webconnection.ushahidi.url.label=Anuani ya kupelekwa ya Ushahidi: webconnection.ushahidi.fsmskey.label=Siri ya API ya FrontlineSMS: webconnection.ushahidi.crowdmapkey.label=Ufunguo wa API wa Crowdmap/Ushahidi: webconnection.ushahidi.keyword.label=Neno kuu: @@ -923,7 +934,7 @@ webconnection.generic.httpMethod.label=Mbinu ya Http: webconnection.generic.url.label=Anuani: webconnection.generic.keyword.label=Upangaji wa moja kwa moja: webconnection.generic.parameters.label=Habari iliyosanidiwa iliyotumwa kwa seva: -webconnection.generic.keyword.label=Neno kuu: +webconnection.generic.keyword.label=Upangaji wa moja kwa moja: webconnection.generic.key.label=Ufunguo wa API: frontlinesms2.Keyword.value.validator.error.frontlinesms2.UshahidiWebconnection.keyword.value=Thamana ya neno kuu si halali From 6a59ddc299da84d1a1e3dc65d958c1f4e7f4e319 Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 7 Jan 2013 10:02:16 +0300 Subject: [PATCH 0217/2668] Fixed failing internationalization test --- .../test/integration/frontlinesms2/I18nUtilServiceSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy index 33d986fc7..2244ba1d2 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/I18nUtilServiceSpec.groovy @@ -8,7 +8,7 @@ class I18nUtilServiceSpec extends IntegrationSpec { def 'get a list of available translations'() { expect: - i18nUtilService.getAllTranslations() == [ar:'Arabic', de:'Deutsch', '':'English', es:'Español', fr:'French', in_ID:'Indonesian', sw:'Kiswahili', pt:'Português', ru:'Русский'] + i18nUtilService.getAllTranslations() == [ar:'Arabic', de:'Deutsch', '':'English', es:'Español', fr:'French', in_ID:'Indonesian', jp:'Japanese', sw:'Kiswahili', pt:'Português', ru:'Русский'] } @Unroll From 0c4ff4c3a659f5a0ff11d71f953aec1d13369b48 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 10:41:34 +0300 Subject: [PATCH 0218/2668] MigrationSpec fix --- .../test/migration/src/main/groovy/MigrationSpec.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy index 2f79fab6a..289ac604b 100755 --- a/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy +++ b/plugins/frontlinesms-core/test/migration/src/main/groovy/MigrationSpec.groovy @@ -208,7 +208,6 @@ class MigrationSpec { assert poll1.question == "Who will win?" assert poll1.sentMessageText == "Who will win? Reply FOOTBALL A for 'manchester' or FOOTBALL B for 'barcelona'" assert poll1.autoreplyText == 'Thank you, ${recipient_name}, for participating in the football poll' - assert poll1.keywords*.value.sort() == [''] assert poll1.keywords.size() == 5 assert poll1.keywords*.value.sort() == ['A', 'B', 'BARCELONA', 'FOOTBALL', 'MANCHESTER'] ['A':false, 'B':false, 'BARCELONA':false, 'FOOTBALL':true, 'MANCHESTER':false].each { k, v -> From 34b1f5d10f5ddfce72be728a9415982817188feb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 15:21:08 +0300 Subject: [PATCH 0219/2668] updated i18n-compare script - now returns 0 or 1 exit code depending on completeness of translation --- plugins/frontlinesms-core/do/i18n-compare.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/i18n-compare.groovy b/plugins/frontlinesms-core/do/i18n-compare.groovy index 2cb64a4e7..c2d56a472 100644 --- a/plugins/frontlinesms-core/do/i18n-compare.groovy +++ b/plugins/frontlinesms-core/do/i18n-compare.groovy @@ -40,4 +40,8 @@ langName = other.get("language.name") double perc = ((master.size() - missingKeys.size()) / master.size()) * 100 println("Redundant entries: ${redundantKeys.size()}, MissingEntries: ${missingKeys.size()}") -println "${langName? langName + ' translation' : args[1]} is ${perc.round(2)}% complete" \ No newline at end of file +println "${langName? langName + ' translation' : args[1]} is ${perc.round(2)}% complete" +if (perc == 100) + System.exit 0 +else + System.exit 1 \ No newline at end of file From b2c084f487a6239ceb1cf50919638b62a71e5d3a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 15:21:30 +0300 Subject: [PATCH 0220/2668] updated do/release --- plugins/frontlinesms-core/do/release | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 9be40b090..0f4ef6e0e 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -6,7 +6,12 @@ then echo "FAILURE: Your repository is not clean. This script can only build from a clean repo" exit 1 fi -# TODO: i18n +# TODO: i18n ? Assert that Kiswahili translation is complete +echo "Checking for completeness of Kiswahili translation" +groovy do/i18n-compare.groovy grails-app/i18n/messages.properties grails-app/i18n/messages_sw.properties +RETVAL=$? +[ $RETVAL -eq 0 ] && echo "FAILURE: Swahili translation is incomplete" && exit 1 +echo "Swahili i18n is complete" # TODO: roll version numbers to non-snapshot echo "Rolling version numbers to non-snapshot" From 83d5502d593f931617a37081371cbd96b42f9ad9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 15:21:55 +0300 Subject: [PATCH 0221/2668] do/release fix --- plugins/frontlinesms-core/do/release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 0f4ef6e0e..58817bdf7 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -10,7 +10,7 @@ fi echo "Checking for completeness of Kiswahili translation" groovy do/i18n-compare.groovy grails-app/i18n/messages.properties grails-app/i18n/messages_sw.properties RETVAL=$? -[ $RETVAL -eq 0 ] && echo "FAILURE: Swahili translation is incomplete" && exit 1 +[ $RETVAL -ne 0 ] && echo "FAILURE: Swahili translation is incomplete" && exit 1 echo "Swahili i18n is complete" # TODO: roll version numbers to non-snapshot From e5e49471c324c10092aef018483f11027270d622 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 15:41:16 +0300 Subject: [PATCH 0222/2668] added commit step to do/release script --- plugins/frontlinesms-core/do/release | 41 +++++++++++++++++++--------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 58817bdf7..8b01e942b 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -1,31 +1,46 @@ #!/bin/bash -echo "Building new release" -echo "Checking for clean repository..." + +echo "### Building FrontlineSMS v2 release" + +# Read Application.properties to find release version +APP_VERSION=`sed '/^\#/d' application.properties | grep 'app.version' | tail -n 1 | cut -d "=" -f2-` +echo "# Read app version as $APP_VERSION" + +# Exit if app version indicates it is an RC +echo "$APP_VERSION" | grep -qi "rc" +if [ $? -eq 0 ]; + then echo "# FAILURE: application version is an RC, must update version number before release" && exit 1 +fi + +# Ensure git repo is clean +echo "# Checking for clean repository..." if test -n "$(git status --porcelain)" then - echo "FAILURE: Your repository is not clean. This script can only build from a clean repo" + echo "# FAILURE: Your repository is not clean. This script can only build from a clean repo" exit 1 fi -# TODO: i18n ? Assert that Kiswahili translation is complete -echo "Checking for completeness of Kiswahili translation" + +# Assert that Kiswahili translation is complete +echo "# Checking for completeness of Kiswahili translation" groovy do/i18n-compare.groovy grails-app/i18n/messages.properties grails-app/i18n/messages_sw.properties RETVAL=$? -[ $RETVAL -ne 0 ] && echo "FAILURE: Swahili translation is incomplete" && exit 1 -echo "Swahili i18n is complete" +[ $RETVAL -ne 0 ] && echo "# FAILURE: Swahili translation is incomplete" && exit 1 +echo "# Swahili i18n is complete" -# TODO: roll version numbers to non-snapshot -echo "Rolling version numbers to non-snapshot" +# Roll version numbers to non-snapshot +echo "# Rolling version numbers to non-snapshot" do/remove_snapshot_from_install_resource_directories -# TODO: do builds -echo "Building installers.." +# Do builds +echo "# Building installers.." grails prod BuildInstallers # TODO: test build in appropriate format for machine #### This can reuse elements of build_uninstall_install_test -# TODO: commit -#### git commit -m "Build for 2.a.b" +# Commit +git add -A +git commit -m "Built $APP_VERSION using do/release script" #### git push # TODO: tag commit From 327c0a0d99cc346a762f78d191be0b78a53eafe0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 16:16:26 +0300 Subject: [PATCH 0223/2668] updated do/release to update application version after build --- plugins/frontlinesms-core/do/release | 45 ++++++++++++++++------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 8b01e942b..0d8a2b310 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -1,10 +1,13 @@ #!/bin/bash +# FOR AUTOMATED BUILDING OF NEW RELEASES OF FRONTLINESMS +# Requirements: Groovy, Gradle. echo "### Building FrontlineSMS v2 release" - +read -sn 1 -p "## WARNING ## This script will make modifications to your working directory, and commit these changes. It will also create a tag for the newly built version. Press any key to continue or Ctrl+C to quit..." +echo "" # Read Application.properties to find release version APP_VERSION=`sed '/^\#/d' application.properties | grep 'app.version' | tail -n 1 | cut -d "=" -f2-` -echo "# Read app version as $APP_VERSION" +echo "# Read app version as ${APP_VERSION}" # Exit if app version indicates it is an RC echo "$APP_VERSION" | grep -qi "rc" @@ -27,37 +30,41 @@ RETVAL=$? [ $RETVAL -ne 0 ] && echo "# FAILURE: Swahili translation is incomplete" && exit 1 echo "# Swahili i18n is complete" +# Run migration tests +pushd test/migration +gradle run +if [ $? -eq 0 ]; + then echo "# FAILURE: migration tests did not pass, ensure you have valid migration set up" && exit 1 +fi +popd + # Roll version numbers to non-snapshot echo "# Rolling version numbers to non-snapshot" do/remove_snapshot_from_install_resource_directories -# Do builds +# Build installers echo "# Building installers.." grails prod BuildInstallers # TODO: test build in appropriate format for machine -#### This can reuse elements of build_uninstall_install_test +#### This can reuse elements of build_uninstall_install_test. Should exit 1 if this fails # Commit +echo "Committing and tagging build" git add -A -git commit -m "Built $APP_VERSION using do/release script" -#### git push - -# TODO: tag commit -#### git tag frontlinesms2.a.b -#### git push - -# TODO: prompt user for new snapshot version number -#### prompt for new snapshot number - -# TODO: roll version to new snapshot -#### similar to do/remove_snapshot_from_install_resource_directories +git commit -m "Built ${APP_VERSION} using do/release script" +git tag frontlinesms2.$APP_VERSION -# TODO: commit with new snapshot version -#### git commit -m "Rolled version numbers to 2.x.y snapshot after 2.a.b release" +# Roll version to new snapshot +echo "Enter the new snapshot application version for post-build. This should end with '-SNAPSHOT'." +read POST_BUILD_VERSION +sed -i "s/\(app\.version=\).*\$/\1${POST_BUILD_VERSION}/" application.properties +git commit -m "Rolled version numbers to 2.${POST_BUILD_VERSION} after 2.${APP_VERSION} release" -# TODO: git push --tags # TODO: upload builds #### CORE-1440 +# TODO: Push (uncomment the lines below and delete the TODO: when this script passes QA) +# git push +# git push --tags \ No newline at end of file From a19b43e6a43fa2bf0c41e26adab3a79878ddc6d2 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Mon, 7 Jan 2013 16:33:34 +0300 Subject: [PATCH 0224/2668] Radio now works in frontlinesms2.2.RC2 --- .../grails-app/migrations/changelog.groovy | 2 + .../migrations/radio-1.0.changelog.groovy | 32 + plugins/radio/RadioGrailsPlugin.groovy | 85 ++- .../radio/grails-app/conf/BuildConfig.groovy | 2 +- .../migrations/changelog-1.0.1.groovy | 8 - .../migrations/changelog-1.0.groovy | 596 ------------------ .../grails-app/migrations/changelog.groovy | 10 - .../views/message/_message_list.gsp | 2 +- .../views/message/_single_message_details.gsp | 3 + 9 files changed, 89 insertions(+), 651 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/migrations/radio-1.0.changelog.groovy delete mode 100644 plugins/radio/grails-app/migrations/changelog-1.0.1.groovy delete mode 100644 plugins/radio/grails-app/migrations/changelog-1.0.groovy delete mode 100644 plugins/radio/grails-app/migrations/changelog.groovy diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy index 25966c48f..17ddd8ae6 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy @@ -22,5 +22,7 @@ databaseChangeLog = { include file: 'changelog-1.0-rc2.groovy' include file: 'changelog-2.0.groovy' + + include file: 'radio-1.0.changelog.groovy' } diff --git a/plugins/frontlinesms-core/grails-app/migrations/radio-1.0.changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/radio-1.0.changelog.groovy new file mode 100644 index 000000000..fce66cf51 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/migrations/radio-1.0.changelog.groovy @@ -0,0 +1,32 @@ +databaseChangeLog = { + + changeSet(author: "geoffrey (generated)", id: "1357564215965-1") { + createTable(tableName: "radio_show") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "radio_showPK") + } + + column(name: "date_created", type: "timestamp") { + constraints(nullable: "false") + } + + column(name: "is_running", type: "boolean") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357564215965-2") { + createTable(tableName: "radio_show_activity") { + column(name: "radio_show_activities_id", type: "bigint") + + column(name: "activity_id", type: "bigint") + + column(name: "activities_idx", type: "integer") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357564215965-4") { + addForeignKeyConstraint(baseColumnNames: "activity_id", baseTableName: "radio_show_activity", constraintName: "FKE4CB28CD6E816952", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "activity", referencesUniqueColumn: "false") + } +} diff --git a/plugins/radio/RadioGrailsPlugin.groovy b/plugins/radio/RadioGrailsPlugin.groovy index 4a6f3200d..7e3b67d42 100644 --- a/plugins/radio/RadioGrailsPlugin.groovy +++ b/plugins/radio/RadioGrailsPlugin.groovy @@ -1,47 +1,62 @@ import frontlinesms2.radio.* +import org.codehaus.groovy.grails.plugins.PluginManagerHolder + class RadioGrailsPlugin { - // the plugin version - def version = "0.a7-SNAPSHOT" - // the version or versions of Grails the plugin is designed for - def grailsVersion = "2.0.3 > *" - // the other plugins this plugin depends on - def dependsOn = [core:"0.4-SNAPSHOT > *"] - // resources that are excluded from plugin packaging - // def pluginExcludes = ["grails-app/views/error.gsp"] - - // TODO Fill in these fields - def author = "FrontlineSMS team" - def authorEmail = "dev@frontlinesms.com" - def title = "FrontlineSMS:Radio" - def description = "" + // the plugin version + def version = "0.a7-SNAPSHOT" + // the version or versions of Grails the plugin is designed for + def grailsVersion = "2.0.3 > *" + // the other plugins this plugin depends on + def dependsOn = [core:"0.4-SNAPSHOT > *"] + // resources that are excluded from plugin packaging + // def pluginExcludes = ["grails-app/views/error.gsp"] + + // TODO Fill in these fields + def author = "FrontlineSMS team" + def authorEmail = "dev@frontlinesms.com" + def title = "FrontlineSMS:Radio" + def description = "" // URL to the plugin's documentation - def documentation = "https://github.com/frontlinesms/frontlinesms2" + def documentation = "https://github.com/frontlinesms/frontlinesms2" + + def doWithWebDescriptor = { xml -> + // TODO Implement additions to web.xml (optional), this event occurs before + } + + def doWithSpring = { + // TODO Implement runtime spring config (optional) + } - def doWithWebDescriptor = { xml -> - // TODO Implement additions to web.xml (optional), this event occurs before - } + def doWithDynamicMethods = { ctx -> + // TODO Implement registering dynamic methods to classes (optional) + } - def doWithSpring = { - // TODO Implement runtime spring config (optional) - } + def doWithApplicationContext = { applicationContext -> + // TODO Implement post initialization spring config (optional) + } - def doWithDynamicMethods = { ctx -> - // TODO Implement registering dynamic methods to classes (optional) + def onChange = { event -> + // TODO Implement code that is executed when any artefact that this plugin is + // watching is modified and reloaded. The event contains: event.source, + // event.application, event.manager, event.ctx, and event.plugin. } - def doWithApplicationContext = { applicationContext -> - // TODO Implement post initialization spring config (optional) - } + def onConfigChange = { event -> + // TODO Implement code that is executed when the project configuration changes. + // The event is the same as for 'onChange'. + } - def onChange = { event -> - // TODO Implement code that is executed when any artefact that this plugin is - // watching is modified and reloaded. The event contains: event.source, - // event.application, event.manager, event.ctx, and event.plugin. - } + def doWithConfig = { config -> + // Here we need to tell the database migrations plugin the change log is in the frontlinesms-core plugin + try { + def pluginManager = PluginManagerHolder.pluginManager + def plugin = pluginManager.getGrailsPlugin('frontlinesms-core') + def pluginDir = org.codehaus.groovy.grails.plugins.GrailsPluginUtils.getPluginDirForName('frontlinesms-core')?.path + config.grails.plugin.databasemigration.changelogLocation = "$pluginDir/grails-app/migrations" + } catch (Exception e) { + println "Error in doWithConfig $e" + } - def onConfigChange = { event -> - // TODO Implement code that is executed when the project configuration changes. - // The event is the same as for 'onChange'. - } + } } diff --git a/plugins/radio/grails-app/conf/BuildConfig.groovy b/plugins/radio/grails-app/conf/BuildConfig.groovy index d0ec95de0..bafa5e750 100644 --- a/plugins/radio/grails-app/conf/BuildConfig.groovy +++ b/plugins/radio/grails-app/conf/BuildConfig.groovy @@ -4,7 +4,7 @@ grails.project.test.reports.dir = "target/test-reports" grails.project.target.level = 1.6 //grails.project.war.file = "target/${appName}-${appVersion}.war" -grails.plugin.location.core = "../core" +grails.plugin.location.core = "../frontlinesms-core" grails.project.dependency.resolution = { // inherit Grails' default dependencies diff --git a/plugins/radio/grails-app/migrations/changelog-1.0.1.groovy b/plugins/radio/grails-app/migrations/changelog-1.0.1.groovy deleted file mode 100644 index 58ab00d47..000000000 --- a/plugins/radio/grails-app/migrations/changelog-1.0.1.groovy +++ /dev/null @@ -1,8 +0,0 @@ -databaseChangeLog = { - - changeSet(author: "geoffrey (generated)", id: "1341821687497-1") { - addColumn(tableName: "poll_response") { - column(name: "aliases", type: "varchar(255)") - } - } -} diff --git a/plugins/radio/grails-app/migrations/changelog-1.0.groovy b/plugins/radio/grails-app/migrations/changelog-1.0.groovy deleted file mode 100644 index 6d4945336..000000000 --- a/plugins/radio/grails-app/migrations/changelog-1.0.groovy +++ /dev/null @@ -1,596 +0,0 @@ -databaseChangeLog = { - - changeSet(author: "geoffrey (generated)", id: "1341462362191-1") { - createTable(tableName: "activity") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "activityPK") - } - - column(name: "date_created", type: "timestamp") { - constraints(nullable: "false") - } - - column(name: "sent_message_text", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-2") { - createTable(tableName: "announcement") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "announcementPK") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-3") { - createTable(tableName: "autoreply") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "autoreplyPK") - } - - column(name: "autoreply_text", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-4") { - createTable(tableName: "clickatell_fconnection") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "clickatell_fcPK") - } - - column(name: "api_id", type: "varchar(255)") - - column(name: "clickatell_password", type: "varchar(255)") - - column(name: "username", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-5") { - createTable(tableName: "contact") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "contactPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "email", type: "varchar(255)") - - column(name: "mobile", type: "varchar(255)") { - constraints(unique: "true") - } - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "notes", type: "varchar(1024)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-6") { - createTable(tableName: "custom_field") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "custom_fieldPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "contact_id", type: "bigint") - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "smart_group_id", type: "bigint") - - column(name: "value", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-7") { - createTable(tableName: "dispatch") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "dispatchPK") - } - - column(name: "date_sent", type: "timestamp") - - column(name: "dst", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "is_deleted", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "message_id", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "status", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-8") { - createTable(tableName: "email_fconnection") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "email_fconnecPK") - } - - column(name: "email_password", type: "varchar(255)") - - column(name: "receive_protocol", type: "varchar(255)") - - column(name: "server_name", type: "varchar(255)") - - column(name: "server_port", type: "integer") - - column(name: "username", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-9") { - createTable(tableName: "fconnection") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "fconnectionPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-10") { - createTable(tableName: "fmessage") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "fmessagePK") - } - - column(name: "archived", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "date", type: "timestamp") { - constraints(nullable: "false") - } - - column(name: "date_created", type: "timestamp") { - constraints(nullable: "false") - } - - column(name: "inbound", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "is_deleted", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "message_owner_id", type: "bigint") - - column(name: "read", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "src", type: "varchar(255)") - - column(name: "starred", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "text", type: "varchar(1600)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-11") { - createTable(tableName: "folder") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "folderPK") - } - - column(name: "date_created", type: "timestamp") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-12") { - createTable(tableName: "group_member") { - column(name: "group_id", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "contact_id", type: "bigint") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-13") { - createTable(tableName: "grup") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "grupPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-14") { - createTable(tableName: "intelli_sms_fconnection") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "intelli_sms_fPK") - } - - column(name: "email_password", type: "varchar(255)") - - column(name: "email_user_name", type: "varchar(255)") - - column(name: "send_password", type: "varchar(255)") - - column(name: "receive", type: "boolean") - - column(name: "receive_protocol", type: "varchar(255)") - - column(name: "send", type: "boolean") - - column(name: "server_name", type: "varchar(255)") - - column(name: "server_port", type: "integer") - - column(name: "username", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-15") { - createTable(tableName: "keyword") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "keywordPK") - } - - column(name: "activity_id", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "value", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-16") { - createTable(tableName: "log_entry") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "log_entryPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "content", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "date", type: "timestamp") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-17") { - createTable(tableName: "message_owner") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "message_ownerPK") - } - - column(name: "archived", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "deleted", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-18") { - createTable(tableName: "poll") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "pollPK") - } - - column(name: "autoreply_text", type: "varchar(255)") - - column(name: "question", type: "varchar(255)") - - column(name: "yes_no", type: "boolean") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-19") { - createTable(tableName: "poll_response") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "poll_responsePK") - } - - column(name: "key", type: "varchar(255)") - - column(name: "poll_id", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "value", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "responses_idx", type: "integer") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-20") { - createTable(tableName: "poll_response_fmessage") { - column(name: "poll_response_messages_id", type: "bigint") - - column(name: "fmessage_id", type: "bigint") - - column(name: "messages_idx", type: "integer") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-21") { - createTable(tableName: "radio_show") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "radio_showPK") - } - - column(name: "date_created", type: "timestamp") { - constraints(nullable: "false") - } - - column(name: "is_running", type: "boolean") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-22") { - createTable(tableName: "radio_show_activity") { - column(name: "radio_show_activities_id", type: "bigint") - - column(name: "activity_id", type: "bigint") - - column(name: "activities_idx", type: "integer") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-23") { - createTable(tableName: "search") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "searchPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "activity_id", type: "varchar(255)") - - column(name: "contact_string", type: "varchar(255)") - - column(name: "end_date", type: "timestamp") - - column(name: "group_id", type: "bigint") - - column(name: "in_archive", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "search_string", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "start_date", type: "timestamp") - - column(name: "status", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-24") { - createTable(tableName: "search_custom_fields") { - column(name: "custom_fields", type: "bigint") - - column(name: "custom_fields_idx", type: "varchar(255)") - - column(name: "custom_fields_elt", type: "varchar(255)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-25") { - createTable(tableName: "smart_group") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "smart_groupPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "contact_name", type: "varchar(255)") - - column(name: "email", type: "varchar(255)") - - column(name: "mobile", type: "varchar(255)") - - column(name: "name", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "notes", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-26") { - createTable(tableName: "smslib_fconnection") { - column(name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "smslib_fconnePK") - } - - column(name: "all_messages", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "baud", type: "integer") { - constraints(nullable: "false") - } - - column(name: "imsi", type: "varchar(255)") - - column(name: "pin", type: "varchar(255)") - - column(name: "port", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "receive", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "send", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "serial", type: "varchar(255)") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-27") { - createTable(tableName: "system_notification") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "system_notifiPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "read", type: "boolean") { - constraints(nullable: "false") - } - - column(name: "text", type: "varchar(511)") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-28") { - createTable(tableName: "trash") { - column(autoIncrement: "true", name: "id", type: "bigint") { - constraints(nullable: "false", primaryKey: "true", primaryKeyName: "trashPK") - } - - column(name: "version", type: "bigint") { - constraints(nullable: "false") - } - - column(name: "date_created", type: "timestamp") { - constraints(nullable: "false") - } - - column(name: "display_name", type: "varchar(255)") - - column(name: "display_text", type: "varchar(255)") - - column(name: "object_class", type: "varchar(255)") { - constraints(nullable: "false") - } - - column(name: "object_id", type: "bigint") { - constraints(nullable: "false") - } - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-29") { - addPrimaryKey(columnNames: "group_id, contact_id", constraintName: "group_memberPK", tableName: "group_member") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-30") { - createIndex(indexName: "mobile_unique_1341462362047", tableName: "contact", unique: "true") { - column(name: "mobile") - } - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-31") { - addForeignKeyConstraint(baseColumnNames: "contact_id", baseTableName: "custom_field", constraintName: "FK2ACD76AC6256D8C2", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "contact", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-32") { - addForeignKeyConstraint(baseColumnNames: "smart_group_id", baseTableName: "custom_field", constraintName: "FK2ACD76AC3BEF92BF", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "smart_group", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-33") { - addForeignKeyConstraint(baseColumnNames: "message_id", baseTableName: "dispatch", constraintName: "FK10F9447A3FBE872C", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "fmessage", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-34") { - addForeignKeyConstraint(baseColumnNames: "message_owner_id", baseTableName: "fmessage", constraintName: "FK9CA2E0E13742043", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "message_owner", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-35") { - addForeignKeyConstraint(baseColumnNames: "contact_id", baseTableName: "group_member", constraintName: "FKE926145A6256D8C2", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "contact", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-36") { - addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "group_member", constraintName: "FKE926145A9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-37") { - addForeignKeyConstraint(baseColumnNames: "activity_id", baseTableName: "keyword", constraintName: "FKCF751DE96E816952", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "activity", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-38") { - addForeignKeyConstraint(baseColumnNames: "poll_id", baseTableName: "poll_response", constraintName: "FK7FECF4C1FC80A752", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "poll", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-39") { - addForeignKeyConstraint(baseColumnNames: "fmessage_id", baseTableName: "poll_response_fmessage", constraintName: "FK76CBE69F92DDC012", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "fmessage", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-40") { - addForeignKeyConstraint(baseColumnNames: "activity_id", baseTableName: "radio_show_activity", constraintName: "FKE4CB28CD6E816952", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "activity", referencesUniqueColumn: "false") - } - - changeSet(author: "geoffrey (generated)", id: "1341462362191-41") { - addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "search", constraintName: "FKC9FA65A89083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") - } -} diff --git a/plugins/radio/grails-app/migrations/changelog.groovy b/plugins/radio/grails-app/migrations/changelog.groovy deleted file mode 100644 index 4e9d78124..000000000 --- a/plugins/radio/grails-app/migrations/changelog.groovy +++ /dev/null @@ -1,10 +0,0 @@ -databaseChangeLog = { - - changeSet(author: "geoffrey (generated)", id: "changelog") { - // TODO add changes and preconditions here - } - - include file: 'changelog-1.0.groovy' - - include file: 'changelog-1.0.1.groovy' -} diff --git a/plugins/radio/grails-app/views/message/_message_list.gsp b/plugins/radio/grails-app/views/message/_message_list.gsp index d7ffb4a1f..d7f8d50d6 100644 --- a/plugins/radio/grails-app/views/message/_message_list.gsp +++ b/plugins/radio/grails-app/views/message/_message_list.gsp @@ -52,7 +52,7 @@ - ${m.displayText?.truncate(50)} + ${m.messageOwner? m.messageOwner.getDisplayText(m).truncate(50) : m.text.truncate(50) } diff --git a/plugins/radio/grails-app/views/message/_single_message_details.gsp b/plugins/radio/grails-app/views/message/_single_message_details.gsp index 8fa5224ed..3a23710db 100644 --- a/plugins/radio/grails-app/views/message/_single_message_details.gsp +++ b/plugins/radio/grails-app/views/message/_single_message_details.gsp @@ -21,6 +21,9 @@

    + +

    ${messageInstance.receivedOn?.name}

    +

    From a230d0d99809d829dbee76ba5fce30cb8e175f67 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 7 Jan 2013 16:40:36 +0300 Subject: [PATCH 0225/2668] modifications to upload script --- plugins/frontlinesms-core/do/deploy_builds | 65 +++++++++++----------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index cc9d5ff52..d26095461 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -19,9 +19,13 @@ local_unix_path=`ls install/target/install4j/frontlinesms* | grep unix` r_path="http://www.frontlinesms.com/downloads/" -r_windows_path=$r_path`ls install/target/install4j/ | grep windows` -r_mac_path=$r_path`ls install/target/install4j/ | grep mac` -r_unix_path=$r_path`ls install/target/install4j/ | grep unix` +windows_file=`ls install/target/install4j/ | grep windows` +mac_file=`ls install/target/install4j/ | grep mac` +unix_file=`ls install/target/install4j/ | grep unix` + +r_windows_path=$r_path$windows_file +r_mac_path=$r_mac_path$mac_file +r_unix_path=$r_path$unix_file echo ">>>>>>>>>>> Uploading to"$remote_upload_path #uloading the builds @@ -33,57 +37,54 @@ echo "#### Uploading unix build..." curl -v -T $local_unix_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" #Cheking md5 of files -wget $r_windows_path echo "Checking md5 of Windows build" -declare local_hash=${$(md5sum `ls install/target/install4j/frontlinesms* | grep windows`)% *} -declare remote_hash=${$(md5sum `ls install/target/install4j/ | grep windows`)% *} +local_hash=$(md5sum `ls install/target/install4j/frontlinesms* | grep windows`) +declare remote_hash=`curl http://frontlinesms.com/downloads/checkmd5.php?filename=$windows_file` echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" -if[ local_hash -eq remote_hash ] - then - echo "md5sum okay ## oh yeah !!! " +echo "$local_hash" | grep -qi "$remote_hash" +if $? -eq 0 ; + then echo "md5sum okay ## oh yeah !!! " else echo "ooops md5sum not equal exiting script" - exit + exit 0 fi -wget $r_mac_path echo "Checking md5 of Mac build" -local_hash=${$(md5sum `ls install/target/install4j/frontlinesms* | grep mac`)% *} -remote_hash=${$(md5sum `ls install/target/install4j/ | grep mac`)% *} +local_hash=$(md5sum `ls install/target/install4j/frontlinesms* | grep mac`) +declare remote_hash=`curl http://frontlinesms.com/downloads/checkmd5.php?filename=$mac_file` echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" -if[ local_hash -eq remote_hash ] - then - echo "md5sum okay ## oh yeah !!! " +echo "$local_hash" | grep -qi "$remote_hash" +if $? -eq 0 ; + then echo "md5sum okay ## oh yeah !!! " else echo "ooops md5sum not equal exiting script" - exit + exit 0 fi -wget $r_unix_path -local_hash=${$(md5sum `ls install/target/install4j/frontlinesms* | grep unix`)% *} -remote_hash=${$(md5sum `ls install/target/install4j/ | grep unix`)% *} +local_hash=$(md5sum `ls install/target/install4j/frontlinesms* | grep unix`) +declare remote_hash=`curl http://frontlinesms.com/downloads/checkmd5.php?filename=$unix_file` echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" -if[ local_hash -eq remote_hash ] - then - echo "md5sum okay ## oh yeah !!! " +echo "$local_hash" | grep -qi "$remote_hash" +if $? -eq 0 ; + then echo "md5sum okay ## oh yeah !!! " else echo "ooops md5sum not equal exiting script" - exit + exit 0 fi exit ##Exiting so as not to upload link file -echo "#### Creating the xml file with file names" -touch build_links.php -echo "" >> build_links.php -echo "#### Uloading xml document with file names" -local_json_path="build_links.json" -curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" +#echo "#### Creating the xml file with file names" +#touch build_links.php +#echo "" >> build_links.php +#echo "#### Uloading xml document with file names" +#local_json_path="build_links.json" +#curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" -echo "#### Removing build_links.json... :(" -rm build_links.json +#echo "#### Removing build_links.json... :(" +#rm build_links.json echo "Complete .... :)" \ No newline at end of file From 6b2528bcdd2a6fafa45f274afcefaae3cdeef280 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 17:05:19 +0300 Subject: [PATCH 0226/2668] CORE-1824: updated do/build_unistall_install_test to allow skipping of build step --- .../do/build_uninstall_install_test | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_uninstall_install_test b/plugins/frontlinesms-core/do/build_uninstall_install_test index bcf6153b1..17a87d17e 100755 --- a/plugins/frontlinesms-core/do/build_uninstall_install_test +++ b/plugins/frontlinesms-core/do/build_uninstall_install_test @@ -16,16 +16,21 @@ ALL_USER_INSTALL_DIR=/opt/frontlinesms2 SETTINGS_DIR=~/.frontlinesms2 SERVER_PORT=8130 CONTEXT_PATH= +SKIP_BUILD_STEP_FLAG=$1 -echo "# clean target directories" -rm -rf $PROJECT_DIR/target/ -rm -rf target/ -rm -rf $PROJECT_DIR/install/target* -rm -rf $PROJECT_DIR/install/src/web-app/ +if [ "$SKIP_BUILD_STEP_FLAG" != "skipBuildStep" ]; then + echo "# clean target directories" + rm -rf $PROJECT_DIR/target/ + rm -rf target/ + rm -rf $PROJECT_DIR/install/target* + rm -rf $PROJECT_DIR/install/src/web-app/ -echo "# build-installers" -grails clean -grails -Dfrontlinesms2.build.confirmNotProd=true build-installers $@ + echo "# build-installers" + grails clean + grails -Dfrontlinesms2.build.confirmNotProd=true build-installers $@ +else + echo "# Skipping build step..." +fi echo "# uninstall old version" $INSTALL_DIR/uninstall -q || echo "# Could not run uninstaller in $INSTALL_DIR" From 7b625ff13306baaa6ee2fb9c0b8ddda657e28a88 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 7 Jan 2013 17:08:17 +0300 Subject: [PATCH 0227/2668] do/release now uses build_uninstall_install_test to check if installer works --- plugins/frontlinesms-core/do/release | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 0d8a2b310..4d3a90999 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -1,6 +1,6 @@ #!/bin/bash # FOR AUTOMATED BUILDING OF NEW RELEASES OF FRONTLINESMS -# Requirements: Groovy, Gradle. +# Requirements: Groovy, Gradle. Currently only works on linux. echo "### Building FrontlineSMS v2 release" read -sn 1 -p "## WARNING ## This script will make modifications to your working directory, and commit these changes. It will also create a tag for the newly built version. Press any key to continue or Ctrl+C to quit..." @@ -46,8 +46,11 @@ do/remove_snapshot_from_install_resource_directories echo "# Building installers.." grails prod BuildInstallers -# TODO: test build in appropriate format for machine -#### This can reuse elements of build_uninstall_install_test. Should exit 1 if this fails +# test build in appropriate format for machine (TODO: currently assumes linux) +do/build_uninstall_install_test skipBuildStep +if [ $? -ne 0 ]; + then echo "# FAILURE: build test failed, see output to debug" && exit 1 +fi # Commit echo "Committing and tagging build" From 98e9335893c22ba55fb255aebe7e2643b3fc1f09 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 7 Jan 2013 17:08:18 +0300 Subject: [PATCH 0228/2668] deploy script works --- plugins/frontlinesms-core/do/deploy_builds | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index d26095461..15305903c 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -39,12 +39,12 @@ curl -v -T $local_unix_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_p #Cheking md5 of files echo "Checking md5 of Windows build" local_hash=$(md5sum `ls install/target/install4j/frontlinesms* | grep windows`) +declare -a final_local_hash="(${local_hash[0]})"; declare remote_hash=`curl http://frontlinesms.com/downloads/checkmd5.php?filename=$windows_file` -echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" -echo "$local_hash" | grep -qi "$remote_hash" -if $? -eq 0 ; - then echo "md5sum okay ## oh yeah !!! " +echo "Local md5sum : $final_local_hash ## Remote md5sum : $remote_hash" +if [ $final_local_hash = $remote_hash ]; then + echo "md5sum okay ## oh yeah !!! "; else echo "ooops md5sum not equal exiting script" exit 0 @@ -52,24 +52,24 @@ fi echo "Checking md5 of Mac build" local_hash=$(md5sum `ls install/target/install4j/frontlinesms* | grep mac`) +declare -a final_local_hash="(${local_hash[0]})"; declare remote_hash=`curl http://frontlinesms.com/downloads/checkmd5.php?filename=$mac_file` -echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" -echo "$local_hash" | grep -qi "$remote_hash" -if $? -eq 0 ; - then echo "md5sum okay ## oh yeah !!! " +echo "Local md5sum : $final_local_hash ## Remote md5sum : $remote_hash" +if [ $final_local_hash = $remote_hash ]; then + echo "md5sum okay ## oh yeah !!! "; else echo "ooops md5sum not equal exiting script" exit 0 fi local_hash=$(md5sum `ls install/target/install4j/frontlinesms* | grep unix`) +declare -a final_local_hash="(${local_hash[0]})"; declare remote_hash=`curl http://frontlinesms.com/downloads/checkmd5.php?filename=$unix_file` -echo "Local md5sum : $local_hash ## Remote md5sum : $remote_hash" -echo "$local_hash" | grep -qi "$remote_hash" -if $? -eq 0 ; - then echo "md5sum okay ## oh yeah !!! " +echo "Local md5sum : $final_local_hash ## Remote md5sum : $remote_hash" +if [ $final_local_hash = $remote_hash ]; then + echo "md5sum okay ## oh yeah !!! " else echo "ooops md5sum not equal exiting script" exit 0 From 178ab4daf1d00671dd50bf50cd6d9a2eee931929 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 7 Jan 2013 17:41:51 +0300 Subject: [PATCH 0229/2668] deploy script now uploads php file that return the download links as JSON --- plugins/frontlinesms-core/do/deploy_builds | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index 15305903c..9396b5abb 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -77,14 +77,14 @@ fi exit ##Exiting so as not to upload link file -#echo "#### Creating the xml file with file names" -#touch build_links.php -#echo "" >> build_links.php -#echo "#### Uloading xml document with file names" -#local_json_path="build_links.json" +echo "#### Creating the xml file with file names" +touch build_links.php +echo "" >> build_links.php +echo "#### Uloading xml document with file names" +local_json_path="build_links.php" #curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" - -#echo "#### Removing build_links.json... :(" -#rm build_links.json +cat build_links.php +echo "#### Removing build_links.php... :(" +rm build_links.php echo "Complete .... :)" \ No newline at end of file From 5d5e8092541ad779cc0a97b28672bc1c2a86ccc6 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 8 Jan 2013 12:43:55 +0300 Subject: [PATCH 0230/2668] corrected i18n script with utf8 support --- plugins/frontlinesms-core/do/i18n-update.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/do/i18n-update.groovy b/plugins/frontlinesms-core/do/i18n-update.groovy index 1042959f5..7c4ff076d 100644 --- a/plugins/frontlinesms-core/do/i18n-update.groovy +++ b/plugins/frontlinesms-core/do/i18n-update.groovy @@ -30,9 +30,9 @@ String currentLine def existingSlaveLines = [] def newSlaveLines = [] -slave.eachLine { line -> existingSlaveLines << line } +slave.eachLine ("utf8") { line -> existingSlaveLines << line } -master.eachLine { masterLine -> +master.eachLine ("utf8") { masterLine -> if(masterLine.isAllWhitespace() || masterLine.trim().startsWith("#")) { // This is a comment or whitespace, preserve it newSlaveLines << masterLine @@ -49,7 +49,7 @@ master.eachLine { masterLine -> } } -new File(targetFile).withWriter { out -> +new File(targetFile).withWriter ("utf8") { out -> newSlaveLines.each { line -> out.writeLine(line) } From db191c0295d75051e223319f95faa8a45b259eb1 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 7 Jan 2013 17:56:48 +0300 Subject: [PATCH 0231/2668] Added do script to build and deploy a plugin. --- .../frontlinesms-core/do/build_deploy_plugin | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 plugins/frontlinesms-core/do/build_deploy_plugin diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin new file mode 100755 index 000000000..be6596269 --- /dev/null +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -0,0 +1,38 @@ +#!/bin/bash +set -e + +APP_NAME="frontlinesms-core" + +echo "# extract core version from application.properties" +CORE_VERSION=`grep "app.version=.*" application.properties | sed -r "s/app\.version=(.*)/\1/"` +echo "# Extracted core version as $CORE_VERSION" +rm plugin.xml || echo "# no plugin.xml present" +grails clean +grails package-plugin +NEW_PLUGIN_ZIP_NAME=$APP_NAME-$CORE_VERSION.zip +OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME +echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" +mv $OLD_PLUGIN_ZIP_NAME $NEW_PLUGIN_ZIP_NAME + +IVY_CACHE_DIR=~/.grails/ivy-cache/org.grails.plugins/$APP_NAME/zips +mkdir -p $IVY_CACHE_DIR +IVY_CACHED_ZIP=$IVY_CACHE_DIR/$NEW_PLUGIN_ZIP_NAME +echo "# Removing old plugin from local ivy cache at $IVY_CACHED_ZIP..." +rm $IVY_CACHED_ZIP || echo "# Old plugin was not found in ivy cache." + +echo "# Deploying to local ivy cache..." +cp $NEW_PLUGIN_ZIP_NAME $IVY_CACHED_ZIP + +echo "# deploy core plugin to remote plugin repo" +echo "# TODO skip maven deploy for non-SNAPSHOT builds" +echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" +ftp -n dev.frontlinesms.com << EOF +user m2repo $FRONTLINESMS_MAVEN_PASSWORD +cd org/grails/plugins/$APP_NAME +mkdir $CORE_VERSION +cd $CORE_VERSION +put $NEW_PLUGIN_ZIP_NAME +exit +EOF + +echo "# Plugin built and deployed to remote maven repo." From 8db6fb4e5a78d8935f1d327cb6063691cb5d2039 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 8 Jan 2013 12:47:55 +0300 Subject: [PATCH 0232/2668] Changed Fconnection.implementations to be a list instead of a method. --- .../domain/frontlinesms2/Fconnection.groovy | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index e90783504..5bc088d29 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -17,18 +17,10 @@ class Fconnection { static hasMany = [messages: Fmessage] - static def getImplementations() { - if(Environment.current == Environment.PRODUCTION) { - [SmslibFconnection, - ClickatellFconnection, - IntelliSmsFconnection] - } else { - [SmslibFconnection, - ClickatellFconnection, - IntelliSmsFconnection, - SmssyncFconnection] - } - } + static final def implementations = [SmslibFconnection, + ClickatellFconnection, + IntelliSmsFconnection, + SmssyncFconnection] static getNonnullableConfigFields = { clazz -> def fields = clazz.configFields From ef4e30d6f97d398aa69b6813d2839bb4e28659f8 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 8 Jan 2013 15:12:29 +0300 Subject: [PATCH 0233/2668] Created do/deploy_webapp script in install. --- .../install/do/deploy_webapp | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 plugins/frontlinesms-core/install/do/deploy_webapp diff --git a/plugins/frontlinesms-core/install/do/deploy_webapp b/plugins/frontlinesms-core/install/do/deploy_webapp new file mode 100755 index 000000000..68484b288 --- /dev/null +++ b/plugins/frontlinesms-core/install/do/deploy_webapp @@ -0,0 +1,28 @@ +#!/bin/bash + +set -e + +echo "# Building WAR..." +pushd .. + +function app_prop { + PROP_NAME=$1 + VAR_NAME=$2 + PROP_VALUE=`grep $PROP_NAME application.properties | cut -d= -f2` + eval "$VAR_NAME=$PROP_VALUE" +} +app_prop app.name APP_NAME +app_prop app.version APP_VERSION +echo "# App: $APP_NAME v$APP_VERSION" + +grails war +popd + +WEBAPP_DIR=web-app +echo "# Removing old web-app dir..." +rm -rf $WEBAPP_DIR +echo "# Unzipping war to new web-app dir..." +unzip ../target/$APP_NAME-$APP_VERSION.war -d $WEBAPP_DIR + +echo "# web-app deploy completed." + From ae6552c7b42bcc5e3c1c708b86b648c01fc60ae4 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 8 Jan 2013 15:13:30 +0300 Subject: [PATCH 0234/2668] Changed directory for exploded web-app. --- plugins/frontlinesms-core/install/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/install/.gitignore b/plugins/frontlinesms-core/install/.gitignore index 6879d0330..0076ca6ae 100644 --- a/plugins/frontlinesms-core/install/.gitignore +++ b/plugins/frontlinesms-core/install/.gitignore @@ -3,7 +3,7 @@ target/ target-custom-classes/ # Exploded web-app directory used at runtime and build time -src/web-app/ +web-app/ # Java class files should never be committed *.class From 67c75d09e7c11d2de9d6e48d052707cf971a1d68 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 8 Jan 2013 15:36:21 +0300 Subject: [PATCH 0235/2668] vaneyck|ekisa|sitati : fixed bug where DispatchRouterService was expecting incorrect id for routes --- .../services/frontlinesms2/DispatchRouterService.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index e23173426..f1345f2c3 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -45,7 +45,8 @@ class DispatchRouterService { def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } println "Id of prefered route ## $latestReceivedMessage.receivedOn" println "allOutRoutes ## $allOutRoutes" - def routeToTake = allOutRoutes.find{ it.id == "out-${latestReceivedMessage.receivedOn}" } + println "ALL ROUTE IDS ## ${allOutRoutes*.id}" + def routeToTake = allOutRoutes.find{ it.id.endsWith("-${latestReceivedMessage.receivedOn.id}") } println "Chosen Route ## $routeToTake" routeId = routeToTake?routeToTake.id:null } From 22f39ea08031593cf478a25d27600b0995895580 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 8 Jan 2013 17:20:11 +0300 Subject: [PATCH 0236/2668] added saving/edit test for SmppConnection --- .../ConnectionControllerISpec.groovy | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ConnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ConnectionControllerISpec.groovy index 4502b0a13..c92091219 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ConnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ConnectionControllerISpec.groovy @@ -95,6 +95,57 @@ class ConnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { conn.password == "test" } + def "can save a new SmppFconnection"() { + given: + controller.params.name = "Test SmppFconnection" + controller.params.connectionType = 'smpp' + controller.params.username = "test" + controller.params.password = "test" + controller.params.port = '5775' + controller.params.url = 'http://12.23.34.45' + controller.params.fromNumber = '+1223234' + controller.params.send = 'true' + controller.params.receive = 'true' + when: + controller.save() + then: + def conn = SmppFconnection.findByName("Test SmppFconnection") + conn.name == "Test SmppFconnection" + conn.username == "test" + conn.password == "test" + conn.port == '5775' + conn.url == 'http://12.23.34.45' + conn.fromNumber == '+1223234' + conn.send == true + conn.receive == true + } + + def "can edit an existingSmppFconnection"() { + given: + new SmppFconnection(name : "Test SmppFconnection", connectionType : 'smpp', username : "test", password : "test", port : '5775', url : 'http://12.23.34.45', fromNumber : '+1223234', send : 'true', receive : 'true').save(failOnError:true) + controller.params.name = "Testing SmppFconnection" + controller.params.connectionType = 'smpp' + controller.params.username = "testing" + controller.params.password = "testing" + controller.params.port = '5770' + controller.params.url = 'http://12.23.34.45' + controller.params.fromNumber = '+1223223' + controller.params.send = 'false' + controller.params.receive = 'false' + when: + controller.save() + then: + def conn = SmppFconnection.findByName("Testing SmppFconnection") + conn.name == "Testing SmppFconnection" + conn.username == "testing" + conn.password == "testing" + conn.port == '5770' + conn.url == 'http://12.23.34.45' + conn.fromNumber == '+1223223' + conn.send == false + conn.receive == false + } + def "sendTest redirects to the show LIST action"() { given: def emailConnection = new EmailFconnection(receiveProtocol:EmailReceiveProtocol.IMAP, name:"test connection", serverName:"imap.gmail.com", serverPort:"1234", username:"geof", password:"3123").save(flush:true, failOnError:true) From 0314afb2e64e7063fad36198812573b899762b20 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 8 Jan 2013 17:30:01 +0300 Subject: [PATCH 0237/2668] Updated do/build_uninstall_install_test to use do/uninstall_install_test --- .../do/build_uninstall_install_test | 72 +++---------------- .../do/uninstall_install_test | 70 ++++++++++++++++++ 2 files changed, 79 insertions(+), 63 deletions(-) create mode 100755 plugins/frontlinesms-core/do/uninstall_install_test diff --git a/plugins/frontlinesms-core/do/build_uninstall_install_test b/plugins/frontlinesms-core/do/build_uninstall_install_test index 17a87d17e..58b94f6e5 100755 --- a/plugins/frontlinesms-core/do/build_uninstall_install_test +++ b/plugins/frontlinesms-core/do/build_uninstall_install_test @@ -16,70 +16,16 @@ ALL_USER_INSTALL_DIR=/opt/frontlinesms2 SETTINGS_DIR=~/.frontlinesms2 SERVER_PORT=8130 CONTEXT_PATH= -SKIP_BUILD_STEP_FLAG=$1 -if [ "$SKIP_BUILD_STEP_FLAG" != "skipBuildStep" ]; then - echo "# clean target directories" - rm -rf $PROJECT_DIR/target/ - rm -rf target/ - rm -rf $PROJECT_DIR/install/target* - rm -rf $PROJECT_DIR/install/src/web-app/ +echo "# clean target directories" +rm -rf $PROJECT_DIR/target/ +rm -rf target/ +rm -rf $PROJECT_DIR/install/target* +rm -rf $PROJECT_DIR/install/src/web-app/ - echo "# build-installers" - grails clean - grails -Dfrontlinesms2.build.confirmNotProd=true build-installers $@ -else - echo "# Skipping build step..." -fi +echo "# build-installers" +grails clean +grails -Dfrontlinesms2.build.confirmNotProd=true build-installers $@ -echo "# uninstall old version" -$INSTALL_DIR/uninstall -q || echo "# Could not run uninstaller in $INSTALL_DIR" -$ALL_USER_INSTALL_DIR/uninstall -q || echo "# Could not run uninstaller in $ALL_USER_INSTALL_DIR" - -echo "# remove old install directory" -rm -rf $INSTALL_DIR/ || rm -rf $ALL_USER_INSTALL_DIR || echo "# Could not remove installation directory as it did not exist" - -echo "# remove old settings/database directory" -rm -rf $SETTINGS_DIR/ - -echo "# install new build" -$PROJECT_DIR/install/target/install4j/*.sh -q || echo "There was an error running the installer TODO supply a valid email address on commandline so this does not fail." - -echo "# run new install in background" -$INSTALL_DIR/*_Launcher || $ALL_USER_INSTALL_DIR/*_Launcher & -LAUNCHER_PROCESS_ID=`jobs -p` -LAUNCHER_PROCESS_GROUP_ID=`ps -j --pid $LAUNCHER_PROCESS_ID | tail -n1 | grep -Po -m2 "\w+" | grep -Pm2 "\w+" | tail -n1` -jobs -echo "Launched process ID: $LAUNCHER_PROCESS_ID with group $LAUNCHER_PROCESS_GROUP_ID" - -RESPONSE="000" -PING_URL=http://localhost:$SERVER_PORT$CONTEXT_PATH/status/show -echo "# Waiting for server to start" -echo "# Ping URL: $PING_URL" -until [ "$RESPONSE" -ne "000" ]; do - echo "# Pinging $PING_URL..." - RESPONSE=`curl -o /dev/null --silent --head --write-out '%{http_code}' $PING_URL` || echo "Setting response seems to give an error code" - echo "# Pinged server at $PING_URL and got response: $RESPONSE" - sleep 10 -done - -echo "# Final server response: $RESPONSE" -if [ "$RESPONSE" -eq "200" ]; then - echo "# Started FrontlineSMS successfully \\o/" - EXIT_CODE=0 -else - echo "# Error starting FrontlineSMS" - EXIT_CORE=1 -fi - -echo "# Killing FrontlineSMS instance" -CHILD_PROCESSES=`ps h -o pid -$LAUNCHER_PROCESS_GROUP_ID | tac | tail -n +2` -echo "# Detected processes: $CHILD_PROCESSES" -echo "# Excluding process: $LAUNCHER_PROCESS_GROUP_ID" -CHILD_PROCESSES=`echo "$CHILD_PROCESSES" | sed s/$LAUNCHER_PROCESS_GROUP_ID//` -echo "# Killing child processes: $CHILD_PROCESSES" -kill -TERM $CHILD_PROCESSES || echo "Kill doesn't give us a nice exit code BTW" - -echo "Exiting with code: $EXIT_CODE" -exit $EXIT_CODE +do/uninstall_install_test diff --git a/plugins/frontlinesms-core/do/uninstall_install_test b/plugins/frontlinesms-core/do/uninstall_install_test new file mode 100755 index 000000000..3b3c67a16 --- /dev/null +++ b/plugins/frontlinesms-core/do/uninstall_install_test @@ -0,0 +1,70 @@ +#!/bin/bash +set -e + +echo "#############################################" +echo "## This script aims to test new installers ##" +echo "## 1. Build installer ##" +echo "## 2. uninstall old installation ##" +echo "## 3. install new version ##" +echo "## 4. run new version ##" +echo "## 5. check that the server is working! ##" +echo "#############################################" + +PROJECT_DIR=../frontlinesms-core +INSTALL_DIR=~/frontlinesms2 +ALL_USER_INSTALL_DIR=/opt/frontlinesms2 +SETTINGS_DIR=~/.frontlinesms2 +SERVER_PORT=8130 +CONTEXT_PATH= + +echo "# uninstall old version" +$INSTALL_DIR/uninstall -q || echo "# Could not run uninstaller in $INSTALL_DIR" +$ALL_USER_INSTALL_DIR/uninstall -q || echo "# Could not run uninstaller in $ALL_USER_INSTALL_DIR" + +echo "# remove old install directory" +rm -rf $INSTALL_DIR/ || rm -rf $ALL_USER_INSTALL_DIR || echo "# Could not remove installation directory as it did not exist" + +echo "# remove old settings/database directory" +rm -rf $SETTINGS_DIR/ + +echo "# install new build" +$PROJECT_DIR/install/target/install4j/*.sh -q || echo "There was an error running the installer TODO supply a valid email address on commandline so this does not fail." + +echo "# run new install in background" +$INSTALL_DIR/*_Launcher || $ALL_USER_INSTALL_DIR/*_Launcher & +LAUNCHER_PROCESS_ID=`jobs -p` +LAUNCHER_PROCESS_GROUP_ID=`ps -j --pid $LAUNCHER_PROCESS_ID | tail -n1 | grep -Po -m2 "\w+" | grep -Pm2 "\w+" | tail -n1` +jobs +echo "Launched process ID: $LAUNCHER_PROCESS_ID with group $LAUNCHER_PROCESS_GROUP_ID" + +RESPONSE="000" +PING_URL=http://localhost:$SERVER_PORT$CONTEXT_PATH/status/show +echo "# Waiting for server to start" +echo "# Ping URL: $PING_URL" +until [ "$RESPONSE" -ne "000" ]; do + echo "# Pinging $PING_URL..." + RESPONSE=`curl -o /dev/null --silent --head --write-out '%{http_code}' $PING_URL` || echo "Setting response seems to give an error code" + echo "# Pinged server at $PING_URL and got response: $RESPONSE" + sleep 10 +done + +echo "# Final server response: $RESPONSE" +if [ "$RESPONSE" -eq "200" ]; then + echo "# Started FrontlineSMS successfully \\o/" + EXIT_CODE=0 +else + echo "# Error starting FrontlineSMS" + EXIT_CORE=1 +fi + +echo "# Killing FrontlineSMS instance" +CHILD_PROCESSES=`ps h -o pid -$LAUNCHER_PROCESS_GROUP_ID | tac | tail -n +2` +echo "# Detected processes: $CHILD_PROCESSES" +echo "# Excluding process: $LAUNCHER_PROCESS_GROUP_ID" +CHILD_PROCESSES=`echo "$CHILD_PROCESSES" | sed s/$LAUNCHER_PROCESS_GROUP_ID//` +echo "# Killing child processes: $CHILD_PROCESSES" +kill -TERM $CHILD_PROCESSES || echo "Kill doesn't give us a nice exit code BTW" + +echo "Exiting with code: $EXIT_CODE" +exit $EXIT_CODE + From 33650cd8e51d00e1a881efde9f0c737828edd752 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 8 Jan 2013 17:32:16 +0300 Subject: [PATCH 0238/2668] do/release now uses do/uninstall_install_test --- plugins/frontlinesms-core/do/release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 4d3a90999..51122f123 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -47,7 +47,7 @@ echo "# Building installers.." grails prod BuildInstallers # test build in appropriate format for machine (TODO: currently assumes linux) -do/build_uninstall_install_test skipBuildStep +do/uninstall_install_test if [ $? -ne 0 ]; then echo "# FAILURE: build test failed, see output to debug" && exit 1 fi From 8ae686fe9c1fb69fd0c6e02974bb2f2b1a09b877 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 8 Jan 2013 17:46:37 +0300 Subject: [PATCH 0239/2668] Added more padding to new features popup content. --- plugins/frontlinesms-core/web-app/css/help.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/css/help.css b/plugins/frontlinesms-core/web-app/css/help.css index ff66c4cc2..3934d288a 100644 --- a/plugins/frontlinesms-core/web-app/css/help.css +++ b/plugins/frontlinesms-core/web-app/css/help.css @@ -25,7 +25,7 @@ #modalBox.help .help-content { line-height:140%; } #modalBox.help #help-content { padding:17px; } -#modalBox.help #new-feature-content { padding:5px; } +#modalBox.help #new-feature-content { padding:15px; } #new-feature-buttonset label { float:left; padding:12px; } #new-feature-buttonset label input[type=checkbox] { margin-right:10px; } #modalBox.help .help-content h1 { font-weight:bold; font-size:150%; margin:0 0 17px 0; } From 8c3d8cc54fd318cf94160fcdc089ff05886d9714 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 9 Jan 2013 07:52:31 +0300 Subject: [PATCH 0240/2668] added SmppPreProcessorSpec --- .../camel/smpp/SmppPreProcessorSpec.groovy | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy new file mode 100644 index 000000000..9e9471b86 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy @@ -0,0 +1,92 @@ +package frontlinesms2.camel.smpp + +import spock.lang.* +import frontlinesms2.* +import frontlinesms2.camel.* + +import grails.buildtestdata.mixin.Build + +@Mock(SmppFconnection) +@Build(SmppFconnection) +class SmppPreProcessorSpec extends CamelUnitSpecification { + SmppPreProcessor p + + def setup() { + p = new SmppPreProcessor() + } + + def 'out_body should be set to message text'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + println "Smpp Exchange : $x" + p.process(x) + then: + 1 * x.out.setBody("simple") + } + + def 'out_body should be URL-encoded'() { + setup: + buildTestConnection() + def x = mockExchange("more complex") + when: + p.process(x) + then: + 1 * x.out.setBody("more+complex") + } + + def 'dispatch ID should be set in header'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + x.out.headers.'frontlinesms.dispatch.id' == '45678' + } + + def 'message destination should be set and stripped of leading plus'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + x.out.headers.'clickatell.dst' == '1234567890' + } + + def 'clickatell auth details should be set in header'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + println "x.out.headers :: ${x.out.headers}" + x.out.headers.'clickatell.apiId' == '11111' + x.out.headers.'clickatell.username' == 'bob' + x.out.headers.'clickatell.password' == 'secret' + x.out.headers.'clickatell.fromNumber' == null + + } + + def 'clickatell fromNumber should be set in header if sendToUsa is true'() { + setup: + buildTestConnection(true) + def x = mockExchange("simple") + when: + p.process(x) + then: + println "x.out.headers :: ${x.out.headers}" + x.out.headers.'clickatell.apiId' == '11111' + x.out.headers.'clickatell.username' == 'bob' + x.out.headers.'clickatell.password' == 'secret' + x.out.headers.'clickatell.fromNumber' == '%2B123321' + + } + + private SmppFconnection buildTestConnection() { + SmppFconnection.build(name : "Test SmppFconnection", username : "test", password : "test", port : '5775', url : 'http://12.23.34.45', fromNumber : '+1223234', send : 'true', receive : 'true') + } +} From 9033020b14e552115c6762fbc7e9d0f8e45e56f2 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 9 Jan 2013 10:47:34 +0300 Subject: [PATCH 0241/2668] Completed SmppPreProcessorSpec unit tests --- .../camel/smpp/SmppPreProcessor.groovy | 7 +--- .../camel/CamelUnitSpecification.groovy | 1 + .../camel/smpp/SmppPreProcessorSpec.groovy | 38 ++----------------- 3 files changed, 6 insertions(+), 40 deletions(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy index 204566425..f0367a7f3 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/smpp/SmppPreProcessor.groovy @@ -7,6 +7,7 @@ class SmppPreProcessor implements Processor { public void process(Exchange x) throws Exception { def log = { println "SmppPreProcessor.process() : $it" } log 'ENTRY' + log "Exchange:IN.HEADERS ${x.in.headers}" // URL-encode body def d = x.in.body @@ -18,12 +19,6 @@ class SmppPreProcessor implements Processor { set x, 'dst', destination //Setting the destination of the message x.in.setHeader("CamelSmppDestAddr", d.dst) - // Add auth details to header - log "Calculating connection ID..." - def connectionId = x.fconnectionId - log "connectionId=$connectionId" - def connection = SmppFconnection.get(connectionId) - log "connection=$connection" log 'EXIT' } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/CamelUnitSpecification.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/CamelUnitSpecification.groovy index 6cc44c264..4679b8c69 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/CamelUnitSpecification.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/CamelUnitSpecification.groovy @@ -21,6 +21,7 @@ class CamelUnitSpecification extends Specification { dst:'+1234567890', toString:{"mock body (Dispatch)"} ] + m.headers >> [:] return m } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy index 9e9471b86..b46462e64 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/smpp/SmppPreProcessorSpec.groovy @@ -23,7 +23,7 @@ class SmppPreProcessorSpec extends CamelUnitSpecification { println "Smpp Exchange : $x" p.process(x) then: - 1 * x.out.setBody("simple") + 1 * x.in.setBody("simple") } def 'out_body should be URL-encoded'() { @@ -33,7 +33,7 @@ class SmppPreProcessorSpec extends CamelUnitSpecification { when: p.process(x) then: - 1 * x.out.setBody("more+complex") + 1 * x.in.setBody("more+complex") } def 'dispatch ID should be set in header'() { @@ -43,7 +43,7 @@ class SmppPreProcessorSpec extends CamelUnitSpecification { when: p.process(x) then: - x.out.headers.'frontlinesms.dispatch.id' == '45678' + x.in.headers.'frontlinesms.dispatch.id' == '45678' } def 'message destination should be set and stripped of leading plus'() { @@ -53,37 +53,7 @@ class SmppPreProcessorSpec extends CamelUnitSpecification { when: p.process(x) then: - x.out.headers.'clickatell.dst' == '1234567890' - } - - def 'clickatell auth details should be set in header'() { - setup: - buildTestConnection() - def x = mockExchange("simple") - when: - p.process(x) - then: - println "x.out.headers :: ${x.out.headers}" - x.out.headers.'clickatell.apiId' == '11111' - x.out.headers.'clickatell.username' == 'bob' - x.out.headers.'clickatell.password' == 'secret' - x.out.headers.'clickatell.fromNumber' == null - - } - - def 'clickatell fromNumber should be set in header if sendToUsa is true'() { - setup: - buildTestConnection(true) - def x = mockExchange("simple") - when: - p.process(x) - then: - println "x.out.headers :: ${x.out.headers}" - x.out.headers.'clickatell.apiId' == '11111' - x.out.headers.'clickatell.username' == 'bob' - x.out.headers.'clickatell.password' == 'secret' - x.out.headers.'clickatell.fromNumber' == '%2B123321' - + x.in.headers.'smpp.dst' == '1234567890' } private SmppFconnection buildTestConnection() { From 0439fce766afe00338b8dbda8afec3560710b52a Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Wed, 9 Jan 2013 12:43:03 +0300 Subject: [PATCH 0242/2668] Updated the poll show view --- plugins/radio/grails-app/views/activity/poll/show.gsp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/radio/grails-app/views/activity/poll/show.gsp b/plugins/radio/grails-app/views/activity/poll/show.gsp index 97bf9936f..436bb21e2 100644 --- a/plugins/radio/grails-app/views/activity/poll/show.gsp +++ b/plugins/radio/grails-app/views/activity/poll/show.gsp @@ -3,7 +3,6 @@ <g:message code="poll.title" args="${[ownerInstance.name]}"/> -

    @@ -29,9 +33,5 @@ 0 - - - -
    \ No newline at end of file diff --git a/plugins/radio/grails-app/views/poll/create.gsp b/plugins/radio/grails-app/views/poll/create.gsp index 4d860b0fc..4cedc4d62 100644 --- a/plugins/radio/grails-app/views/poll/create.gsp +++ b/plugins/radio/grails-app/views/poll/create.gsp @@ -5,7 +5,6 @@ poll.question, poll.response, poll.sort, - poll.alias, poll.reply, poll.edit.message, poll.recipients, @@ -13,7 +12,6 @@ templates="/radioShow/selectShow, /poll/question, /poll/responses, - /poll/sorting, /poll/aliases, /poll/replies, /message/compose, diff --git a/plugins/radio/grails-app/views/subscription/_confirm.gsp b/plugins/radio/grails-app/views/subscription/_confirm.gsp new file mode 100644 index 000000000..576b6ef26 --- /dev/null +++ b/plugins/radio/grails-app/views/subscription/_confirm.gsp @@ -0,0 +1,38 @@ +
    + + +
    +
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    +
    diff --git a/plugins/radio/grails-app/views/subscription/create.gsp b/plugins/radio/grails-app/views/subscription/create.gsp new file mode 100644 index 000000000..5703bf3dc --- /dev/null +++ b/plugins/radio/grails-app/views/subscription/create.gsp @@ -0,0 +1,16 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + diff --git a/plugins/radio/grails-app/views/webconnection/_confirm.gsp b/plugins/radio/grails-app/views/webconnection/_confirm.gsp new file mode 100644 index 000000000..aaee3fab9 --- /dev/null +++ b/plugins/radio/grails-app/views/webconnection/_confirm.gsp @@ -0,0 +1,9 @@ +<%@ page import="frontlinesms2.Webconnection" %> +
    + + + + + + +
    diff --git a/plugins/radio/grails-app/views/webconnection/create.gsp b/plugins/radio/grails-app/views/webconnection/create.gsp new file mode 100644 index 000000000..699885669 --- /dev/null +++ b/plugins/radio/grails-app/views/webconnection/create.gsp @@ -0,0 +1,21 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + + + + diff --git a/plugins/radio/grails-app/views/webconnection/generic/_confirm.gsp b/plugins/radio/grails-app/views/webconnection/generic/_confirm.gsp new file mode 100644 index 000000000..51333e3f2 --- /dev/null +++ b/plugins/radio/grails-app/views/webconnection/generic/_confirm.gsp @@ -0,0 +1,12 @@ +<%@ page import="frontlinesms2.GenericWebconnection" %> +
    + + +
    +
    +

    + + + +
    + diff --git a/plugins/radio/grails-app/views/webconnection/ushahidi/_confirm.gsp b/plugins/radio/grails-app/views/webconnection/ushahidi/_confirm.gsp new file mode 100644 index 000000000..b23a106a6 --- /dev/null +++ b/plugins/radio/grails-app/views/webconnection/ushahidi/_confirm.gsp @@ -0,0 +1,12 @@ +<%@ page import="frontlinesms2.UshahidiWebconnection" %> +
    + + +
    +
    +

    + + + +
    + From cf8d0ca540bbf0f35e8a8d36070bd3026ac25f7f Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 10 Jan 2013 10:58:51 +0300 Subject: [PATCH 0247/2668] Radio Database Migrations update --- .../migrations/changelog-1.0.2.groovy | 315 ++++++++++++++++++ .../grails-app/migrations/changelog.groovy | 2 + 2 files changed, 317 insertions(+) create mode 100644 plugins/radio/grails-app/migrations/changelog-1.0.2.groovy diff --git a/plugins/radio/grails-app/migrations/changelog-1.0.2.groovy b/plugins/radio/grails-app/migrations/changelog-1.0.2.groovy new file mode 100644 index 000000000..e72be1093 --- /dev/null +++ b/plugins/radio/grails-app/migrations/changelog-1.0.2.groovy @@ -0,0 +1,315 @@ +databaseChangeLog = { + + changeSet(author: "geoffrey (generated)", id: "1357802293232-1") { + createTable(tableName: "autoforward") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "autoforwardPK") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-2") { + createTable(tableName: "autoforward_contact") { + column(name: "autoforward_contacts_id", type: "bigint") + + column(name: "contact_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-3") { + createTable(tableName: "autoforward_grup") { + column(name: "autoforward_groups_id", type: "bigint") + + column(name: "group_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-4") { + createTable(tableName: "autoforward_smart_group") { + column(name: "autoforward_smart_groups_id", type: "bigint") + + column(name: "smart_group_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-5") { + createTable(tableName: "fconnection_fmessage") { + column(name: "fconnection_messages_id", type: "bigint") + + column(name: "fmessage_id", type: "bigint") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-6") { + createTable(tableName: "generic_webconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "generic_webcoPK") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-7") { + createTable(tableName: "request_parameter") { + column(autoIncrement: "true", name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "request_paramPK") + } + + column(name: "version", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "connection_id", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "name", type: "varchar(255)") { + constraints(nullable: "false") + } + + column(name: "value", type: "varchar(255)") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-8") { + createTable(tableName: "smssync_dispatch") { + column(name: "connection_id", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "dispatch_id", type: "bigint") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-9") { + createTable(tableName: "smssync_fconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "smssync_fconnPK") + } + + column(name: "receive_enabled", type: "boolean") { + constraints(nullable: "false") + } + + column(name: "secret", type: "varchar(255)") + + column(name: "send_enabled", type: "boolean") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-10") { + createTable(tableName: "subscription") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "subscriptionPK") + } + + column(name: "default_action", type: "varchar(255)") { + constraints(nullable: "false") + } + + column(name: "group_id", type: "bigint") { + constraints(nullable: "false") + } + + column(name: "join_autoreply_text", type: "varchar(255)") + + column(name: "leave_autoreply_text", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-11") { + createTable(tableName: "ushahidi_webconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "ushahidi_webcPK") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-12") { + createTable(tableName: "webconnection") { + column(name: "id", type: "bigint") { + constraints(nullable: "false", primaryKey: "true", primaryKeyName: "webconnectionPK") + } + + column(name: "api_enabled", type: "boolean") { + constraints(nullable: "false") + } + + column(name: "http_method", type: "varchar(255)") { + constraints(nullable: "false") + } + + column(name: "secret", type: "varchar(255)") + + column(name: "url", type: "varchar(255)") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-13") { + addColumn(tableName: "clickatell_fconnection") { + column(name: "from_number", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-14") { + addColumn(tableName: "clickatell_fconnection") { + column(name: "send_to_usa", type: "boolean") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-15") { + addColumn(tableName: "fmessage") { + column(name: "owner_detail", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-16") { + addColumn(tableName: "keyword") { + column(name: "is_top_level", type: "boolean") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-17") { + addColumn(tableName: "keyword") { + column(name: "keywords_idx", type: "integer") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-18") { + addColumn(tableName: "keyword") { + column(name: "owner_detail", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-19") { + addColumn(tableName: "smslib_fconnection") { + column(name: "manufacturer", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-20") { + addColumn(tableName: "smslib_fconnection") { + column(name: "model", type: "varchar(255)") + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-21") { + addNotNullConstraint(columnDataType: "varchar(1600)", columnName: "TEXT", tableName: "FMESSAGE") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-22") { + addPrimaryKey(columnNames: "connection_id, dispatch_id", constraintName: "smssync_dispaPK", tableName: "smssync_dispatch") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-24") { + addForeignKeyConstraint(baseColumnNames: "autoforward_contacts_id", baseTableName: "autoforward_contact", constraintName: "FK8954F717D290A53C", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "autoforward", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-25") { + addForeignKeyConstraint(baseColumnNames: "contact_id", baseTableName: "autoforward_contact", constraintName: "FK8954F7176256D8C2", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "contact", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-26") { + addForeignKeyConstraint(baseColumnNames: "autoforward_groups_id", baseTableName: "autoforward_grup", constraintName: "FK3C39752FC133A1DB", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "autoforward", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-27") { + addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "autoforward_grup", constraintName: "FK3C39752F9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-28") { + addForeignKeyConstraint(baseColumnNames: "autoforward_smart_groups_id", baseTableName: "autoforward_smart_group", constraintName: "FK4D8334002A1445A5", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "autoforward", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-29") { + addForeignKeyConstraint(baseColumnNames: "smart_group_id", baseTableName: "autoforward_smart_group", constraintName: "FK4D8334003BEF92BF", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "smart_group", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-30") { + addForeignKeyConstraint(baseColumnNames: "fconnection_messages_id", baseTableName: "fconnection_fmessage", constraintName: "FKD49CD6FC51C23BBF", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "fconnection", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-31") { + addForeignKeyConstraint(baseColumnNames: "fmessage_id", baseTableName: "fconnection_fmessage", constraintName: "FKD49CD6FC92DDC012", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "fmessage", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-32") { + addForeignKeyConstraint(baseColumnNames: "connection_id", baseTableName: "request_parameter", constraintName: "FKF047F9F95F834456", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "webconnection", referencesUniqueColumn: "false") + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-33") { + addForeignKeyConstraint(baseColumnNames: "group_id", baseTableName: "subscription", constraintName: "FK1456591D9083EA62", deferrable: "false", initiallyDeferred: "false", referencedColumnNames: "id", referencedTableName: "grup", referencesUniqueColumn: "false") + } + + //> POLL, ALIAS AND KEYWORD TRANSFORMATIONS + changeSet(author: "sitati", id:"1355230052153-35") { + grailsChange{ + change{ + // first set all existing keywords as top-level, and as first in the keyword list for the poll + sql.executeUpdate("UPDATE keyword SET is_top_level = true, keywords_idx = 0") + sql.eachRow("SELECT * FROM POLL") { poll -> + println "MIGRATIONS:::::::::: about to migrate poll: ${poll}" + // check if poll has keywords (if not, it has automatic sorting disabled, no need to act on aliases) + def pollKeywordCount = 0 + sql.eachRow("SELECT * FROM keyword WHERE activity_id = ${poll.ID}") { pollKeyword -> pollKeywordCount += 1 } + if(pollKeywordCount) { + def pollKeywordIndex = 1 // because top level keyword already set as zero + sql.eachRow("SELECT * FROM POLL_RESPONSE WHERE POLL_ID = ${poll.ID}") { pollResponse -> + println "MIGRATIONS:::::::::: for poll: ${poll}, migrating poll response:::: ${pollResponse}" + pollResponse.ALIASES?.split(',').each { aliasValue -> + println "MIGRATIONS:::::::::: for poll: ${poll}, migrating poll response ${pollResponse}: alias::: ${aliasValue}" + sql.execute("INSERT INTO keyword (activity_id, owner_detail, value, is_top_level, keywords_idx) values ($poll.ID, $pollResponse.KEY, ${aliasValue.trim().toUpperCase()}, false, $pollKeywordIndex)") + pollKeywordIndex += 1 + } + } + } + else { + println "Poll had no keywords, skipping alias migration" + } + // update ${contact_name} and ${contact_number} substitutions to ${recipient_name} and ${recipient_number} + if(poll.AUTOREPLY_TEXT?.contains('${contact_name}') || poll.AUTOREPLY_TEXT?.contains('${contact_number}')) { + def newAutoreplyText = poll.AUTOREPLY_TEXT.replace('${contact_name}', '${recipient_name}').replace('${contact_number}', '${recipient_number}').replace('"', '\\"') + sql.executeUpdate("UPDATE poll SET AUTOREPLY_TEXT = $newAutoreplyText WHERE poll.ID = ${poll.id}") + } + } + } + } + } + + //> AUTOREPLY TRANSFORMATIONS + changeSet(author: "sitati", id:"1355230052153-36") { + grailsChange{ + change{ + sql.eachRow("SELECT * FROM AUTOREPLY") { autoreply -> + // update ${contact_name} and ${contact_number} substitutions to ${recipient_name} and ${recipient_number} + if(autoreply.AUTOREPLY_TEXT?.contains('${contact_name}') || autoreply.AUTOREPLY_TEXT?.contains('${contact_number}')) { + def newAutoreplyText = autoreply.AUTOREPLY_TEXT.replace('${contact_name}', '${recipient_name}').replace('${contact_number}', '${recipient_number}').replace('"', '\\"') + sql.executeUpdate("UPDATE autoreply SET AUTOREPLY_TEXT = '"+newAutoreplyText + "' WHERE autoreply.ID = ${autoreply.id}") + } + } + } + } + } + + changeSet(author: "geoffrey (generated)", id: "1357802293232-34") { + dropColumn(columnName: "ALIASES", tableName: "POLL_RESPONSE") + } + + //> CLICKATEL FCONNECTION TRANSFORMATIONS + changeSet(author: "sitati", id:"1355230052153-39") { + grailsChange{ + change{ + sql.executeUpdate("UPDATE clickatell_fconnection SET send_to_usa = false") + } + } + } +} diff --git a/plugins/radio/grails-app/migrations/changelog.groovy b/plugins/radio/grails-app/migrations/changelog.groovy index 4e9d78124..07f00f246 100644 --- a/plugins/radio/grails-app/migrations/changelog.groovy +++ b/plugins/radio/grails-app/migrations/changelog.groovy @@ -7,4 +7,6 @@ databaseChangeLog = { include file: 'changelog-1.0.groovy' include file: 'changelog-1.0.1.groovy' + + include file: 'changelog-1.0.2.groovy' } From d0ba8b6550f4a1917da01cb3990cafb1b5e0d07d Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 10 Jan 2013 11:29:06 +0300 Subject: [PATCH 0248/2668] Updated Radio i18n codes for the new activities --- plugins/radio/grails-app/i18n/messages.properties | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/radio/grails-app/i18n/messages.properties b/plugins/radio/grails-app/i18n/messages.properties index e6acab90f..14f3d228a 100644 --- a/plugins/radio/grails-app/i18n/messages.properties +++ b/plugins/radio/grails-app/i18n/messages.properties @@ -1026,10 +1026,16 @@ dynamicfield.recipient_name.label=Recipient Name poll.moreactions.radio.show.unassigned=Add to Radio Show autoreply.moreactions.radio.show.unassigned=Add to Radio Show announcement.moreactions.radio.show.unassigned=Add to Radio Show +subscription.moreactions.radio.show.unassigned=Add to Radio Show +webconnection.moreactions.radio.show.unassigned=Add to Radio Show +autoforward.moreactions.radio.show.unassigned=Add to Radio Show poll.moreactions.radio.show.assigned=Change Radio Show Assignment autoreply.moreactions.radio.show.assigned=Change Radio Show Assignment announcement.moreactions.radio.show.assigned=Change Radio Show Assignment +subscription.moreactions.radio.show.assigned=Change Radio Show Assignment +webconnection.moreactions.radio.show.assigned=Change Radio Show Assignment +autoforward.moreactions.radio.show.assigned=Change Radio Show Assignment activity.radioShow.assign=Assign to radio show activity.unassigned.defaultoption=No radio show @@ -1043,6 +1049,8 @@ radio.show.onair=On air radio.show.start.show=Start Show radio.show.stop.show=Stop Show +archive.radioshow=Radio Archive + radio.show.invalid.name=Another radio show with this name already exists radio.show.onair.error={0} show is already on air radioShow.title={0} show From e05cf95c3fb4b10842a95bdd73957ded5d06c216 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 10 Jan 2013 11:36:57 +0300 Subject: [PATCH 0249/2668] Updated radio version to 0.a8-SNAPSHOT --- plugins/radio/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/radio/application.properties b/plugins/radio/application.properties index 93db870de..ddeda82ac 100644 --- a/plugins/radio/application.properties +++ b/plugins/radio/application.properties @@ -3,5 +3,5 @@ app.grails.version=2.0.3 app.name=radio app.servlet.version=2.5 -app.version=0.a7-SNAPSHOT +app.version=0.a8-SNAPSHOT plugins.tomcat=2.0.3 From 85c6e64a4b12e8cfff8fa6ef95dc54569f752010 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 10 Jan 2013 12:25:01 +0300 Subject: [PATCH 0250/2668] Fixed installer build bug --- plugins/radio/install/radio.install.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/radio/install/radio.install.properties b/plugins/radio/install/radio.install.properties index 5ff536953..8a2221d8a 100644 --- a/plugins/radio/install/radio.install.properties +++ b/plugins/radio/install/radio.install.properties @@ -11,3 +11,4 @@ install4j.installer.ico=../../radio/install/src/install/resources/radio-installe install4j.installer.icns=../../radio/install/src/install/resources/radio-installer.icns install4j.splash.image=../../radio/install/src/assemble/resources/splash.png install4j.installer.icons.path=../../radio/install/src/install/resources +install4j.db.migrations=-Ddb.migrations=true From f9ab9926fe9e8f3e7b73048db3930d1ea9f9fff9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 10 Jan 2013 12:38:59 +0300 Subject: [PATCH 0251/2668] do/release now calls do/deploy_builds --- plugins/frontlinesms-core/do/release | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/do/release b/plugins/frontlinesms-core/do/release index 51122f123..06ac5b610 100755 --- a/plugins/frontlinesms-core/do/release +++ b/plugins/frontlinesms-core/do/release @@ -65,9 +65,9 @@ sed -i "s/\(app\.version=\).*\$/\1${POST_BUILD_VERSION}/" application.properties git commit -m "Rolled version numbers to 2.${POST_BUILD_VERSION} after 2.${APP_VERSION} release" -# TODO: upload builds -#### CORE-1440 +# Upload builds +do/deploy_builds -# TODO: Push (uncomment the lines below and delete the TODO: when this script passes QA) +# Push (uncomment the lines below and delete the TODO: when this script passes QA) # git push # git push --tags \ No newline at end of file From 41d651d3f771d423f2e14d6cfdad3f2565711159 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 7 Jan 2013 17:56:48 +0300 Subject: [PATCH 0252/2668] Added do script to build and deploy a plugin. --- .../frontlinesms-core/do/build_deploy_plugin | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 plugins/frontlinesms-core/do/build_deploy_plugin diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin new file mode 100755 index 000000000..be6596269 --- /dev/null +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -0,0 +1,38 @@ +#!/bin/bash +set -e + +APP_NAME="frontlinesms-core" + +echo "# extract core version from application.properties" +CORE_VERSION=`grep "app.version=.*" application.properties | sed -r "s/app\.version=(.*)/\1/"` +echo "# Extracted core version as $CORE_VERSION" +rm plugin.xml || echo "# no plugin.xml present" +grails clean +grails package-plugin +NEW_PLUGIN_ZIP_NAME=$APP_NAME-$CORE_VERSION.zip +OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME +echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" +mv $OLD_PLUGIN_ZIP_NAME $NEW_PLUGIN_ZIP_NAME + +IVY_CACHE_DIR=~/.grails/ivy-cache/org.grails.plugins/$APP_NAME/zips +mkdir -p $IVY_CACHE_DIR +IVY_CACHED_ZIP=$IVY_CACHE_DIR/$NEW_PLUGIN_ZIP_NAME +echo "# Removing old plugin from local ivy cache at $IVY_CACHED_ZIP..." +rm $IVY_CACHED_ZIP || echo "# Old plugin was not found in ivy cache." + +echo "# Deploying to local ivy cache..." +cp $NEW_PLUGIN_ZIP_NAME $IVY_CACHED_ZIP + +echo "# deploy core plugin to remote plugin repo" +echo "# TODO skip maven deploy for non-SNAPSHOT builds" +echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" +ftp -n dev.frontlinesms.com << EOF +user m2repo $FRONTLINESMS_MAVEN_PASSWORD +cd org/grails/plugins/$APP_NAME +mkdir $CORE_VERSION +cd $CORE_VERSION +put $NEW_PLUGIN_ZIP_NAME +exit +EOF + +echo "# Plugin built and deployed to remote maven repo." From 1bd28fbc640c88cc518ad742c72628bfeb5915c9 Mon Sep 17 00:00:00 2001 From: ivermac Date: Thu, 10 Jan 2013 14:28:56 +0300 Subject: [PATCH 0253/2668] added a script that detects all references of g:render with templates in both controllers and views --- plugins/frontlinesms-core/do/g_tag_detector | 1 + 1 file changed, 1 insertion(+) create mode 100755 plugins/frontlinesms-core/do/g_tag_detector diff --git a/plugins/frontlinesms-core/do/g_tag_detector b/plugins/frontlinesms-core/do/g_tag_detector new file mode 100755 index 000000000..d52a5646f --- /dev/null +++ b/plugins/frontlinesms-core/do/g_tag_detector @@ -0,0 +1 @@ +grep -rn --color "g:render template" grails-app/views/ grails-app/controllers/ From e91f761fa31f6ab129fa3f99da26ad72e7ad02fb Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 10 Jan 2013 14:42:28 +0300 Subject: [PATCH 0254/2668] attempted fix to smpptranslationservice tests --- .../IntelliSmsTranslationService.groovy | 2 +- .../SmppTranslationService.groovy | 17 ++++--- .../IntelliSmsTranslationServiceSpec.groovy | 6 +++ .../SmppTranslationServiceSpec.groovy | 46 +++++++++++++++++++ 4 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmppTranslationServiceSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IntelliSmsTranslationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IntelliSmsTranslationService.groovy index 7af688509..4541620d5 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IntelliSmsTranslationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IntelliSmsTranslationService.groovy @@ -6,7 +6,7 @@ import org.apache.camel.Exchange class IntelliSmsTranslationService implements Processor { static final String INTELLISMS_MESSAGING_ADDR = '@messaging.intellisoftware.co.uk' static final String INTERNATIONAL_SYMBOL = '+' - static transactional = false + static transactional = false //TODO please explain why this is not transactional void process(Exchange exchange) { println("exchange ${exchange}") diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy index 696b7bbfa..67c3593a8 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy @@ -4,21 +4,22 @@ import org.apache.camel.Processor import org.apache.camel.Exchange class SmppTranslationService implements Processor { - static final String INTERNATIONAL_SYMBOL = '+' - static transactional = false - void process(Exchange exchange) { - log { t-> + println "ENTRY" + def log = { t-> println "SmppTranslationService.process ${t}" } println("exchange ${exchange}") def i = exchange.in println("in: ${i}") - if(i.getHeader('CamelSmppSourceAddr')) { + println("in.headers: ${i.headers}") + println("in.getHeaders: ${i.getHeaders()}") + + if(i.headers['CamelSmppSourceAddr']) { Fmessage message = new Fmessage(inbound:true) def messageBody = i.body - def messageSource = i.getHeader('CamelSmppSourceAddr') - def messageDate = i.getHeader('CamelSmppDoneDate') + def messageSource = i.headers['CamelSmppSourceAddr'] + def messageDate = i.headers['CamelSmppDoneDate'] message.src = messageSource message.text = messageBody @@ -30,6 +31,8 @@ class SmppTranslationService implements Processor { exchange.out.body = message + log "IN::BODY ${exchange.in.body}" + log "OUT::BODY ${exchange.out.body}" } else { exchange.setProperty(Exchange.ROUTE_STOP, Boolean.TRUE); } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/IntelliSmsTranslationServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/IntelliSmsTranslationServiceSpec.groovy index 6b3a61a51..be9f585ee 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/IntelliSmsTranslationServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/IntelliSmsTranslationServiceSpec.groovy @@ -10,6 +10,12 @@ import frontlinesms2.* @TestFor(IntelliSmsTranslationService) class IntelliSmsTranslationServiceSpec extends Specification { + def setup() { + String.metaClass.truncate = { max=16 -> + delegate.size() <= max? delegate: delegate.substring(0, max-1) + '…' + } + } + def "incoming intellisms email message is translated into Fmessage"() { given: def testDate = "Fri, 20 Apr 2012 14:27:14 +0100" diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmppTranslationServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmppTranslationServiceSpec.groovy new file mode 100644 index 000000000..026a72663 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmppTranslationServiceSpec.groovy @@ -0,0 +1,46 @@ +package frontlinesms2.services + +import spock.lang.* +import grails.test.mixin.* + +import org.apache.camel.Exchange +import org.apache.camel.Message +import frontlinesms2.* + +@TestFor(SmppTranslationService) +class SmppTranslationServiceSpec extends Specification { + def setup() { + String.metaClass.truncate = { max=16 -> + delegate.size() <= max? delegate: delegate.substring(0, max-1) + '…' + } + } + def "incoming smpp message is translated into Fmessage"() { + given: + def messageText = "Test message" + def source = "+254725672318" + def testDate = "Fri, 20 Apr 2012 14:27:14 +0100" + def date = new Date().parse("EEE, dd MMM yyyy hh:mm:ss Z", testDate).format("YYMMDDhhmm") + def testExchange = createTestExchange([source: source, body:messageText, date:date]) + println "Exchange HEADERS ${testExchange.in.headers}" + println "Exchange BODY ${testExchange.in.body}" + when: + service.process(testExchange) + then: + testExchange.out.body instanceof Fmessage + testExchange.out.body.src == "+254725672318" + testExchange.out.body.text == "Test message" + testExchange.out.body.date == testDate + } + + private Exchange createTestExchange(params = []) { + def x = Mock(Exchange) + def m = Mock(Message) + m.headers >> ['CamelSmppSourceAddr':params.source, 'CamelSmppDoneDate':params.date] + m.body >> params.body + x.in >> m + def m2 = Mock(Message) + x.out >> m2 + x + } +} + From d114191266ecdffa33f42810b00a043555173449 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 10 Jan 2013 14:47:00 +0300 Subject: [PATCH 0255/2668] [CORE-1828] Fixed contact count for groups in the menu view and header --- .../controllers/frontlinesms2/ContactController.groovy | 2 +- plugins/frontlinesms-core/grails-app/views/contact/_header.gsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index be3006e72..98e177a7c 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -65,7 +65,7 @@ class ContactController extends ControllerUtils { } def contactList = contactSearchService.contactList(params) def contactInstanceList = contactList.contactInstanceList - def contactInstanceTotal = contactList.contactInstanceTotal + def contactInstanceTotal = Contact.count() def contactInstance = (params.contactId ? Contact.get(params.contactId) : (contactInstanceList ? contactInstanceList[0] : null)) def usedFields = contactInstance?.customFields ?: [] def usedFieldNames = [] diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp index 12036719b..34bdce7d9 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp @@ -1,6 +1,6 @@
    -

    ${contactsSection.name} (${contactInstanceTotal})

    +

    ${contactsSection.name} (${contactGroupInstanceTotal})

    Date: Thu, 10 Jan 2013 14:57:44 +0300 Subject: [PATCH 0256/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt --- .../help/core/activities/10.web_connection_api.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt b/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt index 6d0e6791f..fce462872 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt @@ -8,7 +8,7 @@ In the Web Connection walkthrough, you will be given the option to enable the Fr ## API Details -The URL for a specific Activity's API endpoint will be showin in the activity's header. +The URL for a specific Activity's API endpoint will be shown in in the activity's header. The Web Connection API expects a JSON Map with the following parameters: - secret @@ -16,7 +16,7 @@ The Web Connection API expects a JSON Map with the following parameters: - recipients ### secret (required if Api Secret is set in Web Connection instance) -When configuring a Web Connection, you will be prompted to enter a Api Secret. Incoming requests will only be processed if the secret parameter matches what was set up in the Web Connection walkthough. If no secret was provided, the secret parameter can be left out of a request. +When configuring a Web Connection, you will be prompted to enter an Api Secret. Incoming requests will only be processed if the secret parameter matches what was set up in the Web Connection walkthough. If no secret was provided, the secret parameter can be left out of a request. ### message (required) This is the message body that will be sent out as the SMS. Substitution variables of the type used within FrontlineSMS are supported (so, for example, ${contact_name} will be replaced with the receiving contact's name). As with any SMS, extra cost may be incurred if this message body is longer than 160 characters. @@ -38,7 +38,7 @@ The value parameter here can either be a 'name', which takes a literal string re #### address -This represents a phone number. It must be accompanied by a 'value' attribute, which represents the phone number to send to. Phone numbers should be passed in international format without spaces or brackets. +This represents a phone number. It must be accompanied by a 'value' attribute, which represents the phone number to send to. Phone numbers should be parsed in international format without spaces or brackets. Below is an example of a valid requestst body, utilising all the valid combinations of recipient types. @@ -74,4 +74,4 @@ This will be accompanied by an error message stating what was missing in the req ### 401 (Authentication required) -This error code will occur when the Web Connection requires a 'secret' parameter and none was supplied, or the secret provided was incorrect. The body will specify which of these two conditions occurred, as it will either be "no secret provided" or "invalid secret" \ No newline at end of file +This error code will occur when the Web Connection requires a 'secret' parameter and none was supplied, or the secret provided was incorrect. The body will specify which of these two conditions occurred, as it will either be "no secret provided" or "invalid secret" From 908d0245a6b42e0d20ace307b67ad3e4a3cb76f5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 10 Jan 2013 15:13:24 +0300 Subject: [PATCH 0257/2668] Updated plugin deploy script to be more generic. --- plugins/frontlinesms-core/do/build_deploy_plugin | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index be6596269..e0f98784f 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -1,15 +1,16 @@ #!/bin/bash set -e -APP_NAME="frontlinesms-core" +echo "# extract app name from application.properties..." +APP_NAME=`grep '^app.name=' application.properties | cut -d= -f2 | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` echo "# extract core version from application.properties" -CORE_VERSION=`grep "app.version=.*" application.properties | sed -r "s/app\.version=(.*)/\1/"` -echo "# Extracted core version as $CORE_VERSION" +PLUGIN_VERSION=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") +echo "# Extracted plugin version as $PLUGIN_VERSION" rm plugin.xml || echo "# no plugin.xml present" grails clean grails package-plugin -NEW_PLUGIN_ZIP_NAME=$APP_NAME-$CORE_VERSION.zip +NEW_PLUGIN_ZIP_NAME=$APP_NAME-$PLUGIN_VERSION.zip OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" mv $OLD_PLUGIN_ZIP_NAME $NEW_PLUGIN_ZIP_NAME @@ -28,9 +29,12 @@ echo "# TODO skip maven deploy for non-SNAPSHOT builds" echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" ftp -n dev.frontlinesms.com << EOF user m2repo $FRONTLINESMS_MAVEN_PASSWORD +mkdir org +mkdir org/grails/plugins +mkdir org/grails/plugins/$APP_NAME cd org/grails/plugins/$APP_NAME -mkdir $CORE_VERSION -cd $CORE_VERSION +mkdir $PLUGIN_VERSION +cd $PLUGIN_VERSION put $NEW_PLUGIN_ZIP_NAME exit EOF From b65e5d9c9f7494070fd4b1fbbc3fd574fe2b7058 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 10 Jan 2013 15:13:47 +0300 Subject: [PATCH 0258/2668] Updated platform core version to allow geb functional tests to work. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 6293c703e..16b6072d8 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -90,7 +90,7 @@ grails.project.dependency.resolution = { runtime ":csv:0.3.1" compile ":quartz2:0.2.3-frontlinesms" - compile ':platform-core:1.0.RC2' + compile ':platform-core:1.0.RC3-frontlinesms' test ":code-coverage:1.2.5" test ":codenarc:0.17" From 861023ae7a2283a99230535ea18cdbdc54739cc3 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 10 Jan 2013 15:15:23 +0300 Subject: [PATCH 0259/2668] tests for CORE-1828 --- .../frontlinesms2/contact/GroupViewSpec.groovy | 18 ++++++++++++++++++ .../frontlinesms2/page/PageContact.groovy | 1 + 2 files changed, 19 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy index ea7e75852..d55bc3733 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy @@ -81,6 +81,24 @@ class GroupViewSpec extends GroupBaseSpec { then: waitFor { !footer.prevPage.disabled } } + + def "All Contacts count should be displayed, no matter which contact section is currently displayed"() { + given: + createTestGroups() + createManyContactsAddToGroups() + (111..190).each { + Contact.build(name:"Contact${it}", mobile:"987654321${it}", notes:'notes') + } + def friendsGroup = Group.findByName("Friends") + when: + to PageContactShow + then: + bodyMenu.allContactsCount == 160 + when: + to PageContactShow, friendsGroup + then: + bodyMenu.allContactsCount == 160 + } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy index 8531d4ede..988819d75 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy @@ -36,6 +36,7 @@ class BodyMenu extends geb.Module { smartGroupIsDisplayed { smartGroupInstance -> $("title").text().contains(smartGroupInstance.name) } + allContactsCount { $('a[href="/frontlinesms-core/contact/show"]').text().find(/\d+/) as Integer} } } From 543eb1a97b2ee6e28aed3c27543d1c16408e9870 Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Thu, 10 Jan 2013 16:06:06 +0300 Subject: [PATCH 0260/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt --- .../core/activities/3a.manually_categorising.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt index 5940daffc..abc46d38c 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt @@ -1,14 +1,14 @@ -# Manually Categorising a Message +# Manually Categorizing a Message -A Poll will attempt to automatically categorise incoming responses according to the message content. This allows FrontlineSMS to show you the results of polls in easy to read tables and visually represented as graphs. Sometimes however, it can be difficult for the system to recognise responses and may not be able to automatically categorise them. In these cases, it is possible to manually categorise a message, or multiple messages under the correct response. +A Poll will attempt to automatically categorize incoming responses according to the message content. This allows FrontlineSMS to show you the results of polls in easy-to-read tables and visually represented as charts. If the keyword is not present or incorrectly spelled, the system will not recognize responses and may not be able to automatically categorize them. In these cases, it is possible to manually categorize a message, or multiple messages under the correct response. -![Manually Categorise a Response][6] +![Manually Categorize a Response][6] -### Manually Categorising a Message/Messages +### Manually Categorizing a Message/Messages -1. Select the Activity you want to export. -2. From the message list, select the message or messages you wish to categorise using the checkboxes. -3. From the message details, open the drop down box called "Categorise Response". +1. Select the Activity you want to work with. +2. From the message list, select the message or messages you wish to categorize using the checkboxes. +3. From the message details, open the drop down box called "Categorize Response". 4. From this list choose the appropriate response for the message or messages. _**Note:** For [Yes/No Polls][2], the only categories available will be Yes or No. For [Multiple Choice Polls][2] the available categories will be the same in number and >name as the multiple choice options you entered when creating the Poll._ From 649a34c669816bd77be2bee7e45e77c9b898d859 Mon Sep 17 00:00:00 2001 From: ivermac Date: Thu, 10 Jan 2013 16:07:19 +0300 Subject: [PATCH 0261/2668] changed 'display:style' to 'style' --- .../grails-app/views/contact/_single_contact_view.gsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp index 18e5eb057..e40b56aca 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp @@ -137,16 +137,16 @@ function refreshMessageStats(data) { $(function() { setInterval(refreshMessageStats, 15000); var clear; - $( "td > input[type=text]" ).each(function( index) { + /*$( "td > input[type=text]" ).each(function( index) { if( $(this).val() == ''){ clear = $(this).next(); clear.attr("style","display:none"); } else{ clear = $(this).next(); - clear.removeAttr("display:style"); + clear.removeAttr("style"); } - }); + });*/ }); From 9886752e6a54ad81aaf2d49aeff220ea4a77f35c Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 10 Jan 2013 16:14:28 +0300 Subject: [PATCH 0262/2668] When i select a contact and then unselect it the select all contacts checkbox gets checked automatically --- plugins/frontlinesms-core/web-app/js/check_li.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/check_li.js b/plugins/frontlinesms-core/web-app/js/check_li.js index 3a5b8c60b..9c942af9c 100644 --- a/plugins/frontlinesms-core/web-app/js/check_li.js +++ b/plugins/frontlinesms-core/web-app/js/check_li.js @@ -143,9 +143,9 @@ function checkAll(itemTypeString) { function updateCheckAllBox(count) { // Check whether all messages are checked - if(count === $('#main-list tbody tr :checkbox').size() && !$('#main-list :checkbox')[0].checked) { + if(count === $('#main-list tbody tr :checkbox').size() && ($('#main-list tbody tr :checkbox').size() > 0) && !$('#main-list :checkbox')[0].checked) { $('#main-list :checkbox')[0].checked = true; - } else if(count === $('#main-list li:not(:first-child) input:checkbox').size() && !$('#main-list li input:checkbox')[0].checked) { + } else if(count === $('#main-list li:not(:first-child) input:checkbox').size() && ($('#main-list li input:checkbox')[0]) && !$('#main-list li input:checkbox')[0].checked) { $('#main-list :checkbox')[0].checked = true; } else if($('#main-list :checkbox')[0].checked) { $('#main-list :checkbox')[0].checked = false; From 5e3a3ebb6ba7a32202389127a22a41613ca6e55a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 10 Jan 2013 17:01:35 +0300 Subject: [PATCH 0263/2668] updated autoreply ui --- .../grails-app/i18n/messages.properties | 13 +++++++------ .../grails-app/views/activity/generic/_sorting.gsp | 9 +++++---- plugins/frontlinesms-core/web-app/css/wizard.css | 1 + 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 006dba532..ad50b8ceb 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -278,7 +278,7 @@ archive.header=Archive autoreply.enter.keyword=Enter keyword autoreply.create.message=Enter autoreply message -activity.autoreply.sort.description=FrontlineSMS can automatically reply to incoming messages that begin with a keyword, and move the incoming message into this activity. You can do this for all messages, or only those that match one of the specified keywords. +activity.autoreply.sort.description=If people send in messages beginning with a particular keyword, FrontlineSMS can automatically process the messages on your system. activity.autoreply.disable.sorting.description=Messages will not be automatically replied to and moved into this activity autoreply.confirm=Confirm autoreply.name.label=Message @@ -991,15 +991,16 @@ subscription.moreactions.edit=Edit subscription subscription.moreactions.export=Export subscription # Generic activity sorting -activity.generic.sorting=Automatic sorting -activity.generic.sort.header=Automatic sorting -activity.generic.sort.description=FrontlineSMS can automatically move incoming messages into this activity. You can do this for all messages, or only those that match one of the specified keywords. -activity.generic.keywords.title=Enter keywords that messages must match. You can enter multiple keywords, separated by commas: +activity.generic.sorting=Automatic processing +activity.generic.sorting.subtitle=Process messages automatically using a keyword (optional) +activity.generic.sort.header=Process messages automatically using a keyword (optional) +activity.generic.sort.description=If people send in messages beginning with a particular keyword, FrontlineSMS can automatically process the messages on your system. +activity.generic.keywords.title=Enter keywords for activity. You can enter multiple keywords separated by commas: activity.generic.no.keywords.title=Do not use a keyword activity.generic.no.keywords.description=All incoming messages that do not match any other keywords will trigger this activity activity.generic.disable.sorting=Do not automatically sort messages activity.generic.disable.sorting.description=Messages will not be automatically moved into this activity -activity.generic.enable.sorting=Sort incoming messages that match a keyword +activity.generic.enable.sorting=Process responses containing a keyword automatically activity.generic.sort.validation.unique.error=Keywords must be unique activity.generic.keyword.in.use=The keyword {0} is already in use by activity {1} activity.generic.global.keyword.in.use=Activity {0} is set to receive all messages that do not match other keywords. You can only have one active activity with this setting diff --git a/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp b/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp index 200cf7b5f..fecf2134d 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/generic/_sorting.gsp @@ -8,10 +8,7 @@ -
    - - -
    +
    • +
    +
    + +
    function sortingOptionChanged() { diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index 4cedb736f..ec9e96e4e 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -49,6 +49,7 @@ form#categorize_subscription p.info { padding:5px 0px; line-height: 1.1em;} ul.sorting-options input[type=radio] { margin:5px; display:inline-block; } ul.sorting-options label.sorting-option-label { font-weight: bold; } div.sorting-option { padding:5px 5px 10px 25px; } +div.activity-keyword { padding-left:25px; } div.sorting-option input#keywords { display: block; margin-top:5px; } #connectionForm label[for=connectionType] { font-weight: bold } From d7bf5fd6cb6558e4402fad910f762a8576b08739 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 10:52:56 +0300 Subject: [PATCH 0264/2668] Added Japanese to the expected language list in ChangeLanguageSpec --- .../functional/frontlinesms2/settings/ChangeLanguageSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ChangeLanguageSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ChangeLanguageSpec.groovy index 22088c470..a0a8051ee 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ChangeLanguageSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ChangeLanguageSpec.groovy @@ -9,7 +9,7 @@ class ChangeLanguageSpec extends grails.plugin.geb.GebSpec { when: to PageGeneralSettings then: - languageList.children()*.text()== ["English", "Arabic", "Deutsch", "English", "Español", "French", "Indonesian", "Kiswahili", "Português", "Русский"] + languageList.children()*.text()== ["English", "Arabic", "Deutsch", "English", "Español", "French", "Indonesian", 'Japanese', "Kiswahili", "Português", "Русский"] } def 'Can change language of the application'() { From f940b488ceddd069e13d3bc733b115cba7669641 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 11 Jan 2013 10:53:31 +0300 Subject: [PATCH 0265/2668] Fixed failing PhonesAndConnectionsFSpec --- plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp b/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp index bf47f1c28..da82848ad 100644 --- a/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp +++ b/plugins/frontlinesms-core/grails-app/views/layouts/settings.gsp @@ -2,7 +2,7 @@ - <g:message code="settings.general.header"/> + <g:layoutTitle default="${g.message(code:'settings.general.header')}"/> From 4dbf8277c144fec851606c3a8c9ed9614499f2af Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 11:07:16 +0300 Subject: [PATCH 0266/2668] Minor format fix. --- .../controllers/frontlinesms2/ContactController.groovy | 6 ++---- .../functional/frontlinesms2/contact/GroupCedSpec.groovy | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index 98e177a7c..986951292 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -83,13 +83,11 @@ class ContactController extends ControllerUtils { flash.message = message(code:'contact.not.found') redirect(action: 'show') return false - } - else if(params.groupId && !contactList.contactsSection) { + } else if(params.groupId && !contactList.contactsSection) { flash.message = message(code:'group.not.found') redirect(action: 'show') return false - } - else if(params.smartGroupId && !contactList.contactsSection) { + } else if(params.smartGroupId && !contactList.contactsSection) { flash.message = message(code:'smartgroup.not.found') redirect(action: 'show') return false diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy index 3c65a58f4..d055ee9c1 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy @@ -1,7 +1,8 @@ package frontlinesms2.contact -import frontlinesms2.popup.* import frontlinesms2.* +import frontlinesms2.popup.* +import spock.lang.* class GroupCedSpec extends GroupBaseSpec { @@ -18,7 +19,7 @@ class GroupCedSpec extends GroupBaseSpec { waitFor { bodyMenu.getGroupLink "People" } assert Group.count() == (initNumGroups + 1) } - + def 'More action dropdown has option to rename the group and it works'() { given: createTestGroupsAndContacts() @@ -30,13 +31,13 @@ class GroupCedSpec extends GroupBaseSpec { when: header.moreGroupActions.value("rename").click() then: - waitFor{ at RenameGroupPopup } + waitFor { at RenameGroupPopup } when: groupName.value("Renamed Group") ok.jquery.trigger("click") then: at PageContactShow - waitFor{ bodyMenu.getGroupLink "Renamed Group" } + waitFor { bodyMenu.getGroupLink "Renamed Group" } header.groupHeaderTitle.text().equalsIgnoreCase('Renamed Group (2)') } From 176f16f77d8ba9457dd9efe746d5925b3cdd99ce Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 11:08:24 +0300 Subject: [PATCH 0267/2668] Removed unused value from ContactController model. --- .../controllers/frontlinesms2/ContactController.groovy | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index 986951292..62d49fbeb 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -54,7 +54,6 @@ class ContactController extends ControllerUtils { uniqueFieldInstanceList: unusedFields, fieldInstanceList: CustomField.findAll(), groupInstanceList: Group.findAll(), - groupInstanceTotal: Group.count(), smartGroupInstanceList: SmartGroup.list()] render view:'/contact/_single_contact_view', model:model } @@ -105,7 +104,6 @@ class ContactController extends ControllerUtils { uniqueFieldInstanceList: unusedFields, fieldInstanceList: CustomField.findAll(), groupInstanceList: Group.findAll(), - groupInstanceTotal: Group.count(), smartGroupInstanceList: SmartGroup.list()] } @@ -118,7 +116,6 @@ class ContactController extends ControllerUtils { uniqueFieldInstanceList: CustomField.getAllUniquelyNamed(), fieldInstanceList: CustomField.findAll(), groupInstanceList: Group.findAll(), - groupInstanceTotal: Group.count(), smartGroupInstanceList: SmartGroup.list()] << contactSearchService.contactList(params) } From 3f56387217dce1b7a4f4c04d9457a54430d831b5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 11:25:27 +0300 Subject: [PATCH 0268/2668] Fixed count of group members in contact show view. --- .../controllers/frontlinesms2/ContactController.groovy | 1 + .../grails-app/domain/frontlinesms2/Group.groovy | 4 ++++ .../grails-app/domain/frontlinesms2/SmartGroup.groovy | 4 ++++ .../frontlinesms-core/grails-app/views/contact/_header.gsp | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index 62d49fbeb..4023d38f7 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -97,6 +97,7 @@ class ContactController extends ControllerUtils { contactInstanceList: contactInstanceList, contactInstanceTotal: contactInstanceTotal, contactsSection: contactList.contactsSection, + contactsSectionContactTotal: contactList.contactsSection?.countMembers(), contactFieldInstanceList: usedFields, contactGroupInstanceList: contactGroupInstanceList, contactGroupInstanceTotal: contactGroupInstanceList.size(), diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Group.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Group.groovy index f5c717532..a6d4c0648 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Group.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Group.groovy @@ -28,6 +28,10 @@ class Group { Contact.findAll("FROM Contact c, GroupMembership m WHERE m.group=? AND m.contact=c ORDER BY c.name", [this]).collect{ it[0] } } + def countMembers() { + Group.executeQuery("SELECT COUNT(*) From GroupMembership m WHERE m.group=?", [this])[0] + } + def addToMembers(Contact c) { GroupMembership.create(c, this) } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy index 822e6e766..e6e9542da 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy @@ -34,6 +34,10 @@ class SmartGroup { def getMembers() { getMembersByName(null, [:]) } + + def countMembers() { + return countMembersByName(null, [:]) + } def getMembersByName(String searchString, Map pageParams) { def query = getMembersByNameQuery(searchString) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp index 34bdce7d9..d19f28b3e 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_header.gsp @@ -1,6 +1,6 @@
    -

    ${contactsSection.name} (${contactGroupInstanceTotal})

    +

    ${contactsSection.name} (${contactsSectionContactTotal})

    Date: Fri, 11 Jan 2013 11:54:12 +0300 Subject: [PATCH 0269/2668] ConnectionFSpec fixes --- .../frontlinesms2/connection/ConnectionFSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy index b0f0fcc37..fab20011d 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy @@ -150,8 +150,8 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { then: basicInfo("smslib") == "Connect to USB, serial and bluetooth modems or phones" basicInfo("smssync") == "Use an Android phone with the Smssync app installed to send and receive SMS with FrontlineSMS" - basicInfo("clickatell") == "Send an receive messages through a Clickatell account" - basicInfo("intellisms") == "Send an receive messages through an Intellisms account" + basicInfo("clickatell") == "Send and receive messages through a Clickatell account" + basicInfo("intellisms") == "Send and receive messages through an Intellisms account" } def 'can set up a new Smssync connection with no secret'() { From 85794159c2b5afd99893ede10b5aa11ed4de7850 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 12:08:54 +0300 Subject: [PATCH 0270/2668] Fixed smart group content count when subsearching by contact name. --- .../frontlinesms2/ContactController.groovy | 2 +- .../domain/frontlinesms2/SmartGroup.groovy | 2 +- .../frontlinesms2/ContactSearchService.groovy | 32 +++++++++---------- .../SmartGroupControllerISpec.groovy | 4 +-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index 4023d38f7..d7ccb78fd 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -97,7 +97,7 @@ class ContactController extends ControllerUtils { contactInstanceList: contactInstanceList, contactInstanceTotal: contactInstanceTotal, contactsSection: contactList.contactsSection, - contactsSectionContactTotal: contactList.contactsSection?.countMembers(), + contactsSectionContactTotal: contactList.contactsSectionContactTotal, contactFieldInstanceList: usedFields, contactGroupInstanceList: contactGroupInstanceList, contactGroupInstanceTotal: contactGroupInstanceList.size(), diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy index e6e9542da..d55ef8a88 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy @@ -36,7 +36,7 @@ class SmartGroup { } def countMembers() { - return countMembersByName(null, [:]) + return countMembersByName(null) } def getMembersByName(String searchString, Map pageParams) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy index f0681f85e..fcbd9405f 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy @@ -4,40 +4,40 @@ class ContactSearchService { static transactional = true def contactList(params) { + def contactsSection = params?.groupId? Group.get(params.groupId): params.smartGroupId? SmartGroup.get(params.smartGroupId): null [contactInstanceList: getContacts(params), - contactInstanceTotal: countContacts(params), - contactsSection: params?.groupId? Group.get(params.groupId): params.smartGroupId? SmartGroup.get(params.smartGroupId): null] + contactInstanceTotal: Contact.count(), + contactsSection: contactsSection, + contactsSectionContactTotal: countContacts(params)] } private def getContacts(params) { def searchString = getSearchString(params) if(params.groupId) { - if (!Group.get(params.groupId)) { - return [] - } - else { - GroupMembership.searchForContacts(asLong(params.groupId), searchString, params.sort, + if (Group.get(params.groupId)) { + return GroupMembership.searchForContacts(asLong(params.groupId), searchString, params.sort, params.max, params.offset) } + return [] } else if(params.smartGroupId) { - SmartGroup.getMembersByNameIlike(asLong(params.smartGroupId), searchString, [max:params.max, offset:params.offset]) - } else Contact.findAllByNameIlikeOrMobileIlike(searchString, searchString, params) + return SmartGroup.getMembersByNameIlike(asLong(params.smartGroupId), searchString, [max:params.max, offset:params.offset]) + } + return Contact.findAllByNameIlikeOrMobileIlike(searchString, searchString, params) } private def countContacts(params) { def searchString = getSearchString(params) if(params.groupId) { - if (!Group.get(params.groupId)) { - return 0 - } - else { - GroupMembership.countSearchForContacts(asLong(params.groupId), searchString) + if (Group.get(params.groupId)) { + return GroupMembership.countSearchForContacts(asLong(params.groupId), searchString) } + return 0 } else if(params.smartGroupId) { - SmartGroup.countMembersByNameIlike(asLong(params.smartGroupId), searchString) - } else Contact.countByNameIlikeOrMobileIlike(searchString, searchString) + return SmartGroup.countMembersByNameIlike(asLong(params.smartGroupId), searchString) + } + return Contact.countByNameIlikeOrMobileIlike(searchString, searchString) } private def getSearchString(params) { diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/SmartGroupControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/SmartGroupControllerISpec.groovy index 8f1994332..6cf8485c7 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/SmartGroupControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/SmartGroupControllerISpec.groovy @@ -24,13 +24,13 @@ class SmartGroupControllerISpec extends grails.plugin.spock.IntegrationSpec { def model = controller.show() then: model.contactInstanceList*.name.sort() == ['Alfred', 'Charles'] - model.contactInstanceTotal == 2 + model.contactsSectionContactTotal == 2 when: controller.params.searchString = 'ED' model = controller.show() then: model.contactInstanceList*.name == ['Alfred'] - model.contactInstanceTotal == 1 + model.contactsSectionContactTotal == 1 } def 'CREATE returns a smartgroup instance'() { From 68c0796ff5f550a955fa5cf770ae415dd56c96cb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 11 Jan 2013 12:09:52 +0300 Subject: [PATCH 0271/2668] ConnectionControllerSpec fixes --- .../frontlinesms2/controllers/ConnectionControllerSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy index 8c5b203e8..25cdc510c 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy @@ -5,7 +5,7 @@ import frontlinesms2.* import spock.lang.* @TestFor(ConnectionController) -@Mock([Fconnection, FconnectionService]) +@Mock([Fconnection, FconnectionService, SystemNotification]) class ConnectionControllerSpec extends Specification { def "test that createRoute actually calls FconnectionService"() { setup: From 58bcf3b56c37248e34fa0c34216f07fddc1b41c1 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 11 Jan 2013 12:13:05 +0300 Subject: [PATCH 0272/2668] [CORE-1831] Fixed clicking on Autoforwards in the Activity Archive screen --- .../frontlinesms2/MessageController.groovy | 1 + .../controllers/ArchiveControllerSpec.groovy | 45 ++++++++++++------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index 0a15ad40f..3b5d327dd 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -118,6 +118,7 @@ class MessageController extends ControllerUtils { def poll() { redirect(action: 'activity', params: params) } def webconnection() { redirect(action: 'activity', params: params) } + def autoforward() { redirect(action: 'activity', params: params) } def announcement() { redirect(action: 'activity', params: params) } def autoreply() { redirect(action: 'activity', params: params) } def subscription() { redirect(action: 'activity', params: params) } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy index 6f71e1954..c13d0a480 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy @@ -4,24 +4,39 @@ import frontlinesms2.* import spock.lang.* import groovy.lang.MetaClass; +import grails.buildtestdata.mixin.Build @TestFor(ArchiveController) -@Mock([Folder, Fmessage]) +@Mock([Folder, Fmessage, Autoforward, Contact]) +@Build([Contact, Autoforward]) + class ArchiveControllerSpec extends Specification { - def "deleted folders do not appear in the archive section"() { - given: - def folder = new Folder(name:'rain', archived:true).save() - assert folder.archived - when: - controller.folderList() - then: - model.folderInstanceList == [folder] - when: - folder.deleted = true + def "deleted folders do not appear in the archive section"() { + given: + def folder = new Folder(name:'rain', archived:true).save() + assert folder.archived + when: + controller.folderList() + then: + model.folderInstanceList == [folder] + when: + folder.deleted = true folder.save() - controller.folderList() - then: - !model.folderInstanceList - } + controller.folderList() + then: + !model.folderInstanceList + } + + def "the autoforward action should redirect to the activity action"() { + given: + def autoforward = Autoforward.build(contacts:[Contact.build(mobile:"+2345678")], sentMessageText:'some forward text') + when: + params.messageSection = "activity" + params.ownerId = autoforward.id + controller.autoforward() + then: + response.redirectUrl == "/archive/activity?messageSection=activity&ownerId=${autoforward.id}" + + } } From 3b91ac6f0039a359e293a038966acb706a7d0608 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 11 Jan 2013 12:24:38 +0300 Subject: [PATCH 0273/2668] changed functional test for contact count (CORE-1828) into an integration test --- .../contact/GroupViewSpec.groovy | 21 +------------------ .../controller/ContactControllerISpec.groovy | 11 ++++++++++ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy index d55bc3733..300205b53 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupViewSpec.groovy @@ -80,26 +80,7 @@ class GroupViewSpec extends GroupBaseSpec { contactList.selectContact 1 then: waitFor { !footer.prevPage.disabled } - } - - def "All Contacts count should be displayed, no matter which contact section is currently displayed"() { - given: - createTestGroups() - createManyContactsAddToGroups() - (111..190).each { - Contact.build(name:"Contact${it}", mobile:"987654321${it}", notes:'notes') - } - def friendsGroup = Group.findByName("Friends") - when: - to PageContactShow - then: - bodyMenu.allContactsCount == 160 - when: - to PageContactShow, friendsGroup - then: - bodyMenu.allContactsCount == 160 - } - + } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy index eb9de112c..61cbf6064 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy @@ -198,5 +198,16 @@ class ContactControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.flash.message == 'Smart Group not found' } + def "should give correct total contact count even when in a group"() { + given: + makeGroupMember() + when: + controller.params.groupId = g.id + def response = controller.show() + then: + response.contactInstanceTotal == 2 + response.contactsSectionContactTotal == 1 + } + } From e0d4ae7261b067df6c8c94d32cdab549f13b8de8 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 12:43:53 +0300 Subject: [PATCH 0274/2668] Udpated app version to SNAPSHOT. --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 9329a1ccd..7bb96fb61 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0-rc2 +app.version=2.0-rc3-SNAPSHOT From 4ffa19c09ebc5d741c2565b751d532f339a28788 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 12:44:08 +0300 Subject: [PATCH 0275/2668] Fixed test logging so hopefully tests are a little faster. --- plugins/frontlinesms-core/grails-app/conf/Config.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/Config.groovy b/plugins/frontlinesms-core/grails-app/conf/Config.groovy index edfb02cb1..9e3ea4638 100644 --- a/plugins/frontlinesms-core/grails-app/conf/Config.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/Config.groovy @@ -96,7 +96,7 @@ log4j = { threshold:org.apache.log4j.Level.WARN } development { console name:'dev', threshold:org.apache.log4j.Level.INFO } - test { console name:'test', threshold:org.apache.log4j.Level.INFO } + test { console name:'test', threshold:org.apache.log4j.Level.WARN } } root { From 6aced6220908a6f153d955ba212a27c51508a58f Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 11 Jan 2013 12:56:45 +0300 Subject: [PATCH 0276/2668] improved on the detect command --- plugins/frontlinesms-core/do/g_tag_detector | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/g_tag_detector b/plugins/frontlinesms-core/do/g_tag_detector index d52a5646f..3d26bfebf 100755 --- a/plugins/frontlinesms-core/do/g_tag_detector +++ b/plugins/frontlinesms-core/do/g_tag_detector @@ -1 +1,2 @@ -grep -rn --color "g:render template" grails-app/views/ grails-app/controllers/ +#grep -rn --color "g:render template" grails-app/views/ grails-app/controllers/ +grep -rn --color 'render template' grails-app/views/ && egrep -rnw --color "(render|g\.render)" grails-app/controllers/ From f986d54348dac8cec3108265f2bd49c928baa8f4 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 14:48:05 +0300 Subject: [PATCH 0277/2668] Fixed build-without-splash launcher. --- .../do/add_launcher_without_splash | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 plugins/frontlinesms-core/do/add_launcher_without_splash diff --git a/plugins/frontlinesms-core/do/add_launcher_without_splash b/plugins/frontlinesms-core/do/add_launcher_without_splash new file mode 100755 index 000000000..7acdbd5fb --- /dev/null +++ b/plugins/frontlinesms-core/do/add_launcher_without_splash @@ -0,0 +1,20 @@ +#!/usr/bin/env groovy +import javax.xml.parsers.DocumentBuilderFactory +def buildXml = new File('install', 'build.install4j') +println buildXml.absolutePath +def builder = DocumentBuilderFactory.newInstance().newDocumentBuilder() +def conf = builder.parse(buildXml.newInputStream()).documentElement +def child = { node, childName -> node.childNodes.find { it.nodeName == childName } } + +def launcherXml = ['launchers', 'launcher'].inject(conf, child) + +def noSplashLauncher = launcherXml.cloneNode(true) +child(noSplashLauncher, 'splashScreen').setAttribute('show', 'false') +def exeNode = child(noSplashLauncher, 'executable') +exeNode.setAttribute('name', exeNode.getAttribute('name') + '_no_splash') + +child(conf, 'launchers').appendChild(noSplashLauncher) +child(conf, 'launchers').childNodes*.nodeName + +buildXml.text = conf as String + From cd4227385403324be5bb14dee8f97897132657e2 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 14:48:29 +0300 Subject: [PATCH 0278/2668] Added comment to explain why localhost:8080 is not a valid URL. --- .../test/unit/frontlinesms2/GenericWebconnectionSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy index 1753c3fb7..9d780ba84 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy @@ -42,7 +42,7 @@ class GenericWebconnectionSpec extends CamelUnitSpecification { 'http://127.0.0.1:8080/frontlinesms-core' | true 'http://127.0.0.1' | true 'www.example.com/index.html' | false - 'http://localhost:8080/frontlinesms-core' | false + 'http://localhost:8080/frontlinesms-core' | false // currently fails because of http://jira.grails.org/browse/GRAILS-5509, http://jira.grails.org/browse/GRAILS-1692, https://issues.apache.org/jira/browse/VALIDATOR-248 'http//www.example.com/index.php' | false 'https://http://home/frontlinesms' | false 'http://....home.com' | false From 7f132f22275960c0b7cad6114968e434bb851651 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 11 Jan 2013 14:59:45 +0300 Subject: [PATCH 0279/2668] ContactControllerISpec fix --- .../frontlinesms2/controller/ContactControllerISpec.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy index 61cbf6064..1b3a90839 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy @@ -200,9 +200,11 @@ class ContactControllerISpec extends grails.plugin.spock.IntegrationSpec { def "should give correct total contact count even when in a group"() { given: + new Contact(name:'Gaetano').save(failOnError:true) makeGroupMember() when: controller.params.groupId = g.id + controller.beforeInterceptor() def response = controller.show() then: response.contactInstanceTotal == 2 From 7433ba20bdaca04b7ebe5db11a87221d0c9faf37 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 11 Jan 2013 15:32:01 +0300 Subject: [PATCH 0280/2668] added exit status messages to check if the command found matches --- plugins/frontlinesms-core/do/g_tag_detector | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/g_tag_detector b/plugins/frontlinesms-core/do/g_tag_detector index 3d26bfebf..f52ad626d 100755 --- a/plugins/frontlinesms-core/do/g_tag_detector +++ b/plugins/frontlinesms-core/do/g_tag_detector @@ -1,2 +1,7 @@ -#grep -rn --color "g:render template" grails-app/views/ grails-app/controllers/ grep -rn --color 'render template' grails-app/views/ && egrep -rnw --color "(render|g\.render)" grails-app/controllers/ +OUT=$? +if [ $OUT -eq 0 ];then + echo "Matches were found!" +else + echo "Matches were NOT found!" +fi \ No newline at end of file From 3e4627dd7c10c3c1f67a345f0d141a234dadb66d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 11 Jan 2013 16:15:26 +0300 Subject: [PATCH 0281/2668] Cleaned up connection type chooser so clicking name or description will result in the relevant type being selected. --- .../grails-app/views/connection/_type.gsp | 10 ++++++---- plugins/frontlinesms-core/web-app/css/wizard.css | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp index 8960c25fb..f92d35e4a 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp @@ -5,10 +5,12 @@
    • - - -

      +
    diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index 4cedb736f..ec2a165dc 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -8,7 +8,9 @@ background-position:top left; background-repeat:no-repeat; background-image:url("../images/icons/help.png"); } #tabs div.input, #tabs div.ui-tabs-panel div.confirm { margin:0 25px 25px 25px; } -#tabs div.input > label, #tabs h2 { font-size:110%; margin-bottom:15px; font-weight:bold; } +#tabs div.input label, #tabs h2 { font-size:110%; margin-bottom:15px; font-weight:bold; } +#tabs div.input label p { font-size:91%; font-weight:normal; } +#tabs div.input label p:last-child { margin-bottom:0; } #tabs div.input > label, #tabs div.confirm h2 { position:relative; left:-25px; } #tabs div.ui-tabs-panel div.confirm h2 { margin-bottom:10px; } @@ -21,7 +23,7 @@ #tabs div.input ul li { margin-bottom: 10px; } #tabs div.input ul label { margin-right: 15px; } -#tabs div.input ul.select li { position:relative; } +#tabs div.input ul.select li { position:relative; margin-bottom:0; } #tabs div.input ul.select li label { margin-left:20px; } #tabs div.input ul.select li input[type="radio"] { position:absolute; top:0; left:0; } #tabs div.input ul.select li input[type="text"] { display:block; margin-left:25px; margin-top:10px; } From da97ced00209c878352dbb18cf12173afd207eed Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 11 Jan 2013 16:17:46 +0300 Subject: [PATCH 0282/2668] Refractored connection javascript --- .../frontlinesms2/ConnectionController.groovy | 20 ++++++++++++------- .../views/connection/_connection_list.gsp | 2 +- .../grails-app/views/connection/show.gsp | 11 +++++----- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index a9cfaba30..4bcb45153 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -19,16 +19,23 @@ class ConnectionController extends ControllerUtils { def model = [connectionInstanceList:fconnectionInstanceList, fconnectionInstanceTotal:fconnectionInstanceTotal] - if(!params.id) params.id = fconnectionInstanceList[0]?.id - if(params.id) model << show() - render view:'show', model:model + if(params?.id) { + model << show() + def connectionInstance = model.connectionInstance + withFormat { + html { render view:'show', model:model } + json { + render( [id: connectionInstance.id , status: connectionInstance.status.i18n] as JSON) + } + } + } else { + params.id = fconnectionInstanceList[0]?.id + render view:'show', model:model + } } def show() { withFconnection { - if(params.createRoute) { - it.metaClass.getStatus = { ConnectionStatus.CONNECTING } - } [connectionInstance: it] << [connectionInstanceList: Fconnection.list(params), fconnectionInstanceTotal: Fconnection.list(params)] } @@ -108,7 +115,6 @@ class ConnectionController extends ControllerUtils { } def createRoute() { - params.count = SystemNotification.countByRead(false) CreateRouteJob.triggerNow([connectionId:params.id]) params.createRoute = true flash.message = message(code: 'connection.route.connecting') diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index 57e125d1b..674aa87b1 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -20,7 +20,7 @@
  • -
    +

    '${c.name}'

    ()

    - - - - - - - diff --git a/grails-app/views/archive/_header.gsp b/grails-app/views/archive/_header.gsp deleted file mode 100644 index 358114c87..000000000 --- a/grails-app/views/archive/_header.gsp +++ /dev/null @@ -1,17 +0,0 @@ -
    -
    - -

    ${messageSection} Archive

    -     - -

    ${messageSection} Archive

    -     - -

    Activity Archive

    -     - -

    ${messageSection} Archive

    -     - -
    -
    \ No newline at end of file diff --git a/grails-app/views/error.gsp b/grails-app/views/error.gsp deleted file mode 100644 index 7fcd77dfc..000000000 --- a/grails-app/views/error.gsp +++ /dev/null @@ -1,26 +0,0 @@ - - - FrontlineSMS Exception - - - -

    FrontlineSMS Exception

    - - - Error ${request.'javax.servlet.error.status_code'}: ${request.'javax.servlet.error.message'.encodeAsHTML()} ${LINE_BREAK} - Servlet: ${request.'javax.servlet.error.servlet_name'} ${LINE_BREAK} - URI: ${request.'javax.servlet.error.request_uri'}${LINE_BREAK} - - Exception Message: ${exception.message?.encodeAsHTML()} ${LINE_BREAK} - Caused by: ${exception.cause?.message?.encodeAsHTML()} ${LINE_BREAK} - Class: ${exception.className} ${LINE_BREAK} - At Line: [${exception.lineNumber}] ${LINE_BREAK} - - - -
    - - -
    - - \ No newline at end of file diff --git a/images/grid.png b/images/grid.png deleted file mode 100644 index 42e2d69d5bb2097a2572ef4036c201d64be13ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 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 - createSpec('unit', args) - } - createIntegrationTest = { Map args = [:] -> - createSpec('integration', args) - } - createSpec = { String type, Map args -> - def superClass - // map test superclass to Spock equivalent - switch (args["superClass"]) { - case "Controller${type.capitalize()}TestCase": - superClass = "ControllerSpec" - break - case "TagLibUnitTestCase": - superClass = "TagLibSpec" - break - // TODO add a case for Camel Route integration test case - default: - superClass = "${type.capitalize()}Spec" - } - createArtifact name: args["name"], suffix: "${args['suffix']}Spec", type: "Spec", path: "test/${type}", superClass: superClass - } - -} - - -boolean inFunctionalTestPhase = false - -eventTestPhaseStart = { name -> - inFunctionalTestPhase = (name == 'functional') -} - -eventTestStart = { name -> - if (inFunctionalTestPhase) { - def sql = Sql.newInstance("jdbc:hsqldb:mem:testDb", "sa", - "", "org.hsqldb.jdbcDriver") - sql.execute "SET REFERENTIAL_INTEGRITY FALSE" - sql.eachRow("SELECT * FROM INFORMATION_SCHEMA.SYSTEM_TABLES where TABLE_SCHEM = 'PUBLIC'") { row -> - sql.execute "DELETE FROM " + row.TABLE_NAME - } - - sql.execute "SET REFERENTIAL_INTEGRITY TRUE" - } - -} diff --git a/src/templates/artifacts/Controller.groovy b/src/templates/artifacts/Controller.groovy deleted file mode 100644 index 310a58115..000000000 --- a/src/templates/artifacts/Controller.groovy +++ /dev/null @@ -1,4 +0,0 @@ -@artifact.package@class @artifact.name@ { - - def index = { } -} diff --git a/src/templates/artifacts/DomainClass.groovy b/src/templates/artifacts/DomainClass.groovy deleted file mode 100644 index 5a611dcde..000000000 --- a/src/templates/artifacts/DomainClass.groovy +++ /dev/null @@ -1,5 +0,0 @@ -@artifact.package@class @artifact.name@ { - - static constraints = { - } -} diff --git a/src/templates/artifacts/Filters.groovy b/src/templates/artifacts/Filters.groovy deleted file mode 100644 index da8ca6042..000000000 --- a/src/templates/artifacts/Filters.groovy +++ /dev/null @@ -1,17 +0,0 @@ -@artifact.package@class @artifact.name@ { - - def filters = { - all(controller:'*', action:'*') { - before = { - - } - after = { - - } - afterView = { - - } - } - } - -} diff --git a/src/templates/artifacts/Script.groovy b/src/templates/artifacts/Script.groovy deleted file mode 100644 index 2ba402050..000000000 --- a/src/templates/artifacts/Script.groovy +++ /dev/null @@ -1,7 +0,0 @@ -includeTargets << grailsScript("Init") - -target(main: "The description of the script goes here!") { - // TODO: Implement script here -} - -setDefaultTarget(main) diff --git a/src/templates/artifacts/Service.groovy b/src/templates/artifacts/Service.groovy deleted file mode 100644 index 9eb1a5e6d..000000000 --- a/src/templates/artifacts/Service.groovy +++ /dev/null @@ -1,8 +0,0 @@ -@artifact.package@class @artifact.name@ { - - static transactional = true - - def serviceMethod() { - - } -} diff --git a/src/templates/artifacts/Spec.groovy b/src/templates/artifacts/Spec.groovy deleted file mode 100644 index 3124a480d..000000000 --- a/src/templates/artifacts/Spec.groovy +++ /dev/null @@ -1,9 +0,0 @@ -@artifact.package@import spock.lang.* -import grails.plugin.spock.* - -class @artifact.name@ extends @artifact.superclass@ { - def "feature method"() { - - } -} - diff --git a/src/templates/artifacts/TagLib.groovy b/src/templates/artifacts/TagLib.groovy deleted file mode 100644 index 8aea148eb..000000000 --- a/src/templates/artifacts/TagLib.groovy +++ /dev/null @@ -1,3 +0,0 @@ -@artifact.package@class @artifact.name@ { - -} diff --git a/src/templates/artifacts/Tests.groovy b/src/templates/artifacts/Tests.groovy deleted file mode 100644 index 37c12e243..000000000 --- a/src/templates/artifacts/Tests.groovy +++ /dev/null @@ -1,15 +0,0 @@ -@artifact.package@import grails.test.* - -class @artifact.name@ extends @artifact.superclass@ { - protected void setUp() { - super.setUp() - } - - protected void tearDown() { - super.tearDown() - } - - void testSomething() { - - } -} diff --git a/src/templates/artifacts/WebTest.groovy b/src/templates/artifacts/WebTest.groovy deleted file mode 100644 index d446d3533..000000000 --- a/src/templates/artifacts/WebTest.groovy +++ /dev/null @@ -1,54 +0,0 @@ -class @webtest.name.caps@Test extends grails.util.WebTest { - - // Unlike unit tests, functional tests are often sequence dependent. - // Specify that sequence here. - void suite() { - test@webtest.name.caps@ListNewDelete() - // add tests for more operations here - } - - def test@webtest.name.caps@ListNewDelete() { - webtest('@webtest.name.caps@ basic operations: view list, create new entry, view, edit, delete, view') { - invoke(url:'@webtest.name.lower@') - verifyText(text:'Home') - - verifyListPage(0) - - clickLink(label:'New @webtest.name.caps@') - verifyText(text:'Create @webtest.name.caps@') - clickButton(label:'Create') - verifyText(text:'Show @webtest.name.caps@', description:'Detail page') - clickLink(label:'List', description:'Back to list view') - - verifyListPage(1) - - group(description:'edit the one element') { - clickLink(label:'Show', description:'go to detail view') - clickButton(label:'Edit') - verifyText(text:'Edit @webtest.name.caps@') - clickButton(label:'Update') - verifyText(text:'Show @webtest.name.caps@') - clickLink(label:'List', description:'Back to list view') - } - - verifyListPage(1) - - group(description:'delete the only element') { - clickLink(label:'Show', description:'go to detail view') - clickButton(label:'Delete') - verifyXPath(xpath:"//div[@class='message']", text:/@webtest.name.caps@.*deleted./, regex:true) - } - - verifyListPage(0) - } - } - - String ROW_COUNT_XPATH = "count(//td[@class='actionButtons']/..)" - - def verifyListPage(int count) { - ant.group(description:"verify @webtest.name.caps@ list view with $count row(s)") { - verifyText(text:'@webtest.name.caps@ List') - verifyXPath(xpath:ROW_COUNT_XPATH, text:count, description:"$count row(s) of data expected") - } - } -} \ No newline at end of file diff --git a/src/templates/artifacts/hibernate.cfg.xml b/src/templates/artifacts/hibernate.cfg.xml deleted file mode 100644 index f0e8dbfed..000000000 --- a/src/templates/artifacts/hibernate.cfg.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - diff --git a/src/templates/scaffolding/Controller.groovy b/src/templates/scaffolding/Controller.groovy deleted file mode 100644 index a6fe78465..000000000 --- a/src/templates/scaffolding/Controller.groovy +++ /dev/null @@ -1,98 +0,0 @@ -<%=packageName ? "package ${packageName}\n\n" : ''%>class ${className}Controller { - - static allowedMethods = [save: "POST", update: "POST", delete: "POST"] - - def index = { - redirect(action: "list", params: params) - } - - def list = { - params.max = Math.min(params.max ? params.int('max') : 10, 100) - [${propertyName}List: ${className}.list(params), ${propertyName}Total: ${className}.count()] - } - - def create = { - def ${propertyName} = new ${className}() - ${propertyName}.properties = params - return [${propertyName}: ${propertyName}] - } - - def save = { - def ${propertyName} = new ${className}(params) - if (${propertyName}.save(flush: true)) { - flash.message = "\${message(code: 'default.created.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), ${propertyName}.id])}" - redirect(action: "show", id: ${propertyName}.id) - } - else { - render(view: "create", model: [${propertyName}: ${propertyName}]) - } - } - - def show = { - def ${propertyName} = ${className}.get(params.id) - if (!${propertyName}) { - flash.message = "\${message(code: 'default.not.found.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), params.id])}" - redirect(action: "list") - } - else { - [${propertyName}: ${propertyName}] - } - } - - def edit = { - def ${propertyName} = ${className}.get(params.id) - if (!${propertyName}) { - flash.message = "\${message(code: 'default.not.found.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), params.id])}" - redirect(action: "list") - } - else { - return [${propertyName}: ${propertyName}] - } - } - - def update = { - def ${propertyName} = ${className}.get(params.id) - if (${propertyName}) { - if (params.version) { - def version = params.version.toLong() - if (${propertyName}.version > version) { - <% def lowerCaseName = grails.util.GrailsNameUtils.getPropertyName(className) %> - ${propertyName}.errors.rejectValue("version", "default.optimistic.locking.failure", [message(code: '${domainClass.propertyName}.label', default: '${className}')] as Object[], "Another user has updated this ${className} while you were editing") - render(view: "edit", model: [${propertyName}: ${propertyName}]) - return - } - } - ${propertyName}.properties = params - if (!${propertyName}.hasErrors() && ${propertyName}.save(flush: true)) { - flash.message = "\${message(code: 'default.updated.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), ${propertyName}.id])}" - redirect(action: "show", id: ${propertyName}.id) - } - else { - render(view: "edit", model: [${propertyName}: ${propertyName}]) - } - } - else { - flash.message = "\${message(code: 'default.not.found.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), params.id])}" - redirect(action: "list") - } - } - - def delete = { - def ${propertyName} = ${className}.get(params.id) - if (${propertyName}) { - try { - ${propertyName}.delete(flush: true) - flash.message = "\${message(code: 'default.deleted.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), params.id])}" - redirect(action: "list") - } - catch (org.springframework.dao.DataIntegrityViolationException e) { - flash.message = "\${message(code: 'default.not.deleted.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), params.id])}" - redirect(action: "show", id: params.id) - } - } - else { - flash.message = "\${message(code: 'default.not.found.message', args: [message(code: '${domainClass.propertyName}.label', default: '${className}'), params.id])}" - redirect(action: "list") - } - } -} diff --git a/src/templates/scaffolding/create.gsp b/src/templates/scaffolding/create.gsp deleted file mode 100644 index 1adfd6bdc..000000000 --- a/src/templates/scaffolding/create.gsp +++ /dev/null @@ -1,61 +0,0 @@ -<% import grails.persistence.Event %> -<% import org.codehaus.groovy.grails.plugins.PluginManagerHolder %> -<%=packageName%> - - - - - - <g:message code="default.create.label" args="[entityName]" /> - - -
    - - -
    -
    -

    - -
    \${flash.message}
    -     - -
    - -
    -     - > -
    - - - <% excludedProps = Event.allEvents.toList() << 'version' << 'id' << 'dateCreated' << 'lastUpdated' - persistentPropNames = domainClass.persistentProperties*.name - props = domainClass.properties.findAll { persistentPropNames.contains(it.name) && !excludedProps.contains(it.name) } - Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[])) - display = true - boolean hasHibernate = PluginManagerHolder.pluginManager.hasGrailsPlugin('hibernate') - props.each { p -> - if (!Collection.class.isAssignableFrom(p.type)) { - if (hasHibernate) { - cp = domainClass.constrainedProperties[p.name] - display = (cp ? cp.display : true) - } - if (display) { %> - - - - - <% } } } %> - -
    - - - ${renderEditor(p)} -
    -
    -
    - -
    -     -
    - - diff --git a/src/templates/scaffolding/edit.gsp b/src/templates/scaffolding/edit.gsp deleted file mode 100644 index ce1f29334..000000000 --- a/src/templates/scaffolding/edit.gsp +++ /dev/null @@ -1,64 +0,0 @@ -<% import grails.persistence.Event %> -<% import org.codehaus.groovy.grails.plugins.PluginManagerHolder %> -<%=packageName%> - - - - - - <g:message code="default.edit.label" args="[entityName]" /> - - -
    - - - -
    -
    -

    - -
    \${flash.message}
    -     - -
    - -
    -     - > - - -
    - - - <% excludedProps = Event.allEvents.toList() << 'version' << 'id' << 'dateCreated' << 'lastUpdated' - persistentPropNames = domainClass.persistentProperties*.name - props = domainClass.properties.findAll { persistentPropNames.contains(it.name) && !excludedProps.contains(it.name) } - Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[])) - display = true - boolean hasHibernate = PluginManagerHolder.pluginManager.hasGrailsPlugin('hibernate') - props.each { p -> - if (hasHibernate) { - cp = domainClass.constrainedProperties[p.name] - display = (cp?.display ?: true) - } - if (display) { %> - - - - - <% } } %> - -
    - - - ${renderEditor(p)} -
    -
    -
    - - -
    -     -
    - - diff --git a/src/templates/scaffolding/list.gsp b/src/templates/scaffolding/list.gsp deleted file mode 100644 index 05533f9ef..000000000 --- a/src/templates/scaffolding/list.gsp +++ /dev/null @@ -1,61 +0,0 @@ -<% import grails.persistence.Event %> -<%=packageName%> - - - - - - <g:message code="default.list.label" args="[entityName]" /> - - -
    - - -
    -
    -

    - -
    \${flash.message}
    -     -
    - - - - <% excludedProps = Event.allEvents.toList() << 'version' - allowedNames = domainClass.persistentProperties*.name << 'id' << 'dateCreated' << 'lastUpdated' - props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) && !Collection.isAssignableFrom(it.type) } - Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[])) - props.eachWithIndex { p, i -> - if (i < 6) { - if (p.isAssociation()) { %> - - <% } else { %> - - <% } } } %> - - - - - - <% props.eachWithIndex { p, i -> - if (i == 0) { %> - - <% } else if (i < 6) { - if (p.type == Boolean.class || p.type == boolean.class) { %> - - <% } else if (p.type == Date.class || p.type == java.sql.Date.class || p.type == java.sql.Time.class || p.type == Calendar.class) { %> - - <% } else { %> - - <% } } } %> - - - -
    \${fieldValue(bean: ${propertyName}, field: "${p.name}")}\${fieldValue(bean: ${propertyName}, field: "${p.name}")}
    -
    -
    - -
    -
    - - diff --git a/src/templates/scaffolding/renderEditor.template b/src/templates/scaffolding/renderEditor.template deleted file mode 100644 index 79e528d4a..000000000 --- a/src/templates/scaffolding/renderEditor.template +++ /dev/null @@ -1,174 +0,0 @@ -<% if (property.type == Boolean.class || property.type == boolean.class) - out << renderBooleanEditor(domainClass, property) - else if (Number.class.isAssignableFrom(property.type) || (property.type.isPrimitive() && property.type != boolean.class)) - out << renderNumberEditor(domainClass, property) - else if (property.type == String.class) - out << renderStringEditor(domainClass, property) - else if (property.type == Date.class || property.type == java.sql.Date.class || property.type == java.sql.Time.class || property.type == Calendar.class) - out << renderDateEditor(domainClass, property) - else if (property.type == URL.class) - out << renderStringEditor(domainClass, property) - else if (property.isEnum()) - out << renderEnumEditor(domainClass, property) - else if (property.type == TimeZone.class) - out << renderSelectTypeEditor("timeZone", domainClass, property) - else if (property.type == Locale.class) - out << renderSelectTypeEditor("locale", domainClass, property) - else if (property.type == Currency.class) - out << renderSelectTypeEditor("currency", domainClass, property) - else if (property.type==([] as Byte[]).class) //TODO: Bug in groovy means i have to do this :( - out << renderByteArrayEditor(domainClass, property) - else if (property.type==([] as byte[]).class) //TODO: Bug in groovy means i have to do this :( - out << renderByteArrayEditor(domainClass, property) - else if (property.manyToOne || property.oneToOne) - out << renderManyToOne(domainClass, property) - else if ((property.oneToMany && !property.bidirectional) || (property.manyToMany && property.isOwningSide())) - out << renderManyToMany(domainClass, property) - else if (property.oneToMany) - out << renderOneToMany(domainClass, property) - - private renderEnumEditor(domainClass, property) { - return "" - } - - private renderStringEditor(domainClass, property) { - if (!cp) { - return "" - } - else { - if ("textarea" == cp.widget || (cp.maxSize > 250 && !cp.password && !cp.inList)) { - return "" - } - else { - if (cp.inList) { - return "" - } - else { - def sb = new StringBuffer("" - return sb.toString() - } - } - } - } - - private renderByteArrayEditor(domainClass, property) { - return "" - } - - private renderManyToOne(domainClass,property) { - if (property.association) { - return "" - } - } - - private renderManyToMany(domainClass, property) { - return "" - } - - private renderOneToMany(domainClass, property) { - def sw = new StringWriter() - def pw = new PrintWriter(sw) - pw.println() - pw.println "
      " - pw.println "" - pw.println "
    • \${${property.name[0]}?.encodeAsHTML()}
      • " - pw.println "      " - pw.println "
    " - pw.println "\${message(code: 'default.add.label', args: [message(code: '${property.referencedDomainClass.propertyName}.label', default: '${property.referencedDomainClass.shortName}')])}" - return sw.toString() - } - - private renderNumberEditor(domainClass, property) { - if (!cp) { - if (property.type == Byte.class) { - return "" - } - else { - return "" - } - } - else { - if (cp.range) { - return "" - } - else if (cp.inList) { - return "" - } - else { - return "" - } - } - } - - private renderBooleanEditor(domainClass, property) { - if (!cp) { - return "" - } - else { - def sb = new StringBuffer(" - sb << "${k}=\"${v}\" " - } - sb << "value=\"\${${domainInstance}?.${property.name}}\" />" - return sb.toString() - } - } - - private renderDateEditor(domainClass, property) { - def precision = (property.type == Date.class || property.type == java.sql.Date.class || property.type == Calendar.class) ? "day" : "minute"; - if (!cp) { - return "" - } - else { - if (!cp.editable) { - return "\${${domainInstance}?.${property.name}?.toString()}" - } - else { - def sb = new StringBuffer(" - sb << "${k}=\"${v}\" " - } - sb << "precision=\"${precision}\" value=\"\${${domainInstance}?.${property.name}}\" ${renderNoSelection(property)} />" - return sb.toString() - } - } - } - - private renderSelectTypeEditor(type, domainClass,property) { - if (!cp) { - return "" - } - else { - def sb = new StringBuffer(" - sb << "${k}=\"${v}\" " - } - sb << "value=\"\${${domainInstance}?.${property.name}}\" ${renderNoSelection(property)} />" - return sb.toString() - } - } - - private renderNoSelection(property) { - if (property.optional) { - if (property.manyToOne || property.oneToOne) { - return "noSelection=\"['null': '']\"" - } - else if (property.type == Date.class || property.type == java.sql.Date.class || property.type == java.sql.Time.class || property.type == Calendar.class) { - return "default=\"none\" noSelection=\"['': '']\"" - } - else { - return "noSelection=\"['': '']\"" - } - } - return "" - } -%> \ No newline at end of file diff --git a/src/templates/scaffolding/show.gsp b/src/templates/scaffolding/show.gsp deleted file mode 100644 index 517214857..000000000 --- a/src/templates/scaffolding/show.gsp +++ /dev/null @@ -1,64 +0,0 @@ -<% import grails.persistence.Event %> -<%=packageName%> - - - - - - <g:message code="default.show.label" args="[entityName]" /> - - -
    - - - -
    -
    -

    - -
    \${flash.message}
    -     -
    - - - <% excludedProps = Event.allEvents.toList() << 'version' - allowedNames = domainClass.persistentProperties*.name << 'id' << 'dateCreated' << 'lastUpdated' - props = domainClass.properties.findAll { allowedNames.contains(it.name) && !excludedProps.contains(it.name) } - Collections.sort(props, comparator.constructors[0].newInstance([domainClass] as Object[])) - props.each { p -> %> - - - <% if (p.isEnum()) { %> - - <% } else if (p.oneToMany || p.manyToMany) { %> - - <% } else if (p.manyToOne || p.oneToOne) { %> - - <% } else if (p.type == Boolean.class || p.type == boolean.class) { %> - - <% } else if (p.type == Date.class || p.type == java.sql.Date.class || p.type == java.sql.Time.class || p.type == Calendar.class) { %> - - <% } else if(!p.type.isArray()) { %> - - <% } %> - - <% } %> - -
    \${${propertyName}?.${p.name}?.encodeAsHTML()} -
      - -
    • \${${p.name[0]}?.encodeAsHTML()}
      • -       -
    -     		\${${propertyName}?.${p.name}?.encodeAsHTML()}\${fieldValue(bean: ${propertyName}, field: "${p.name}")}
    -
    -
    - - - - - -
    -
    - - diff --git a/src/templates/war/web.xml b/src/templates/war/web.xml deleted file mode 100644 index 521cf1c55..000000000 --- a/src/templates/war/web.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - /@grails.project.key@ - - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - - - webAppRootKey - @grails.project.key@ - - - - sitemesh - org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter - - - - charEncodingFilter - org.springframework.web.filter.DelegatingFilterProxy - - targetBeanName - characterEncodingFilter - - - targetFilterLifecycle - true - - - - - charEncodingFilter - /* - - - - sitemesh - /* - - - - org.codehaus.groovy.grails.web.util.Log4jConfigListener - - - - org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener - - - - - grails - org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet - 1 - - - - - gsp - org.codehaus.groovy.grails.web.pages.GroovyPagesServlet - - - - gsp - *.gsp - - - - - index.html - index.jsp - index.gsp - - - - - http://java.sun.com/jsp/jstl/core - /WEB-INF/tld/c.tld - - - http://java.sun.com/jsp/jstl/fmt - /WEB-INF/tld/fmt.tld - - - http://www.springframework.org/tags - /WEB-INF/tld/spring.tld - - - http://grails.codehaus.org/tags - /WEB-INF/tld/grails.tld - - - - \ No newline at end of file diff --git a/web-app/WEB-INF/applicationContext.xml b/web-app/WEB-INF/applicationContext.xml deleted file mode 100644 index 6f427963b..000000000 --- a/web-app/WEB-INF/applicationContext.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Grails application factory bean - - - - - - A bean that manages Grails plugins - - - - - - - - - - - - - - - - - - classpath*:**/grails-app/**/*.groovy - - - - - - utf-8 - - - \ No newline at end of file diff --git a/web-app/WEB-INF/sitemesh.xml b/web-app/WEB-INF/sitemesh.xml deleted file mode 100644 index a547b41ae..000000000 --- a/web-app/WEB-INF/sitemesh.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/web-app/WEB-INF/tld/c.tld b/web-app/WEB-INF/tld/c.tld deleted file mode 100644 index 22698c97d..000000000 --- a/web-app/WEB-INF/tld/c.tld +++ /dev/null @@ -1,563 +0,0 @@ - - - - - JSTL 1.1 core library - JSTL core - 1.1 - c - http://java.sun.com/jsp/jstl/core - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlCoreTLV - - - - - - Catches any Throwable that occurs in its body and optionally - exposes it. - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP - - -Name of the exported scoped variable for the -exception thrown from a nested action. The type of the -scoped variable is the type of the exception thrown. - - var - false - false - - - - - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - choose - org.apache.taglibs.standard.tag.common.core.ChooseTag - JSP - - - - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - - if - org.apache.taglibs.standard.tag.rt.core.IfTag - JSP - - -The test condition that determines whether or -not the body content should be processed. - - test - true - true - boolean - - - -Name of the exported scoped variable for the -resulting value of the test condition. The type -of the scoped variable is Boolean. - - var - false - false - - - -Scope for var. - - scope - false - false - - - - - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - - import - org.apache.taglibs.standard.tag.rt.core.ImportTag - org.apache.taglibs.standard.tei.ImportTEI - JSP - - -The URL of the resource to import. - - url - true - true - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -Name of the exported scoped variable for the -resource's content. The type of the scoped -variable is Reader. - - varReader - false - false - - - -Name of the context when accessing a relative -URL resource that belongs to a foreign -context. - - context - false - true - - - -Character encoding of the content at the input -resource. - - charEncoding - false - true - - - - - - The basic iteration tag, accepting many different - collection types and supporting subsetting and other - functionality - - forEach - org.apache.taglibs.standard.tag.rt.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP - - -Collection of items to iterate over. - - items - false - true - java.lang.Object - - - -If items specified: -Iteration begins at the item located at the -specified index. First item of the collection has -index 0. -If items not specified: -Iteration begins with index set at the value -specified. - - begin - false - true - int - - - -If items specified: -Iteration ends at the item located at the -specified index (inclusive). -If items not specified: -Iteration ends when index reaches the value -specified. - - end - false - true - int - - - -Iteration will only process every step items of -the collection, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. Its type depends -on the object of the underlying collection. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of type -javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Iterates over tokens, separated by the supplied delimeters - - forTokens - org.apache.taglibs.standard.tag.rt.core.ForTokensTag - JSP - - -String of tokens to iterate over. - - items - true - true - java.lang.String - - - -The set of delimiters (the characters that -separate the tokens in the string). - - delims - true - true - java.lang.String - - - -Iteration begins at the token located at the -specified index. First token has index 0. - - begin - false - true - int - - - -Iteration ends at the token located at the -specified index (inclusive). - - end - false - true - int - - - -Iteration will only process every step tokens -of the string, starting with the first one. - - step - false - true - int - - - -Name of the exported scoped variable for the -current item of the iteration. This scoped -variable has nested visibility. - - var - false - false - - - -Name of the exported scoped variable for the -status of the iteration. Object exported is of -type -javax.servlet.jsp.jstl.core.LoopTag -Status. This scoped variable has nested -visibility. - - varStatus - false - false - - - - - - Like <%= ... >, but for expressions. - - out - org.apache.taglibs.standard.tag.rt.core.OutTag - JSP - - -Expression to be evaluated. - - value - true - true - - - -Default value if the resulting value is null. - - default - false - true - - - -Determines whether characters <,>,&,'," in the -resulting string should be converted to their -corresponding character entity codes. Default value is -true. - - escapeXml - false - true - - - - - - - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' - - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag - JSP - - - - - Adds a parameter to a containing 'import' tag's URL. - - param - org.apache.taglibs.standard.tag.rt.core.ParamTag - JSP - - -Name of the query string parameter. - - name - true - true - - - -Value of the parameter. - - value - false - true - - - - - - Redirects to a new URL. - - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag - JSP - - -The URL of the resource to redirect to. - - url - false - true - - - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Removes a scoped variable (from a particular scope, if specified). - - remove - org.apache.taglibs.standard.tag.common.core.RemoveTag - empty - - -Name of the scoped variable to be removed. - - var - true - false - - - -Scope for var. - - scope - false - false - - - - - - Sets the result of an expression evaluation in a 'scope' - - set - org.apache.taglibs.standard.tag.rt.core.SetTag - JSP - - -Name of the exported scoped variable to hold the value -specified in the action. The type of the scoped variable is -whatever type the value expression evaluates to. - - var - false - false - - - -Expression to be evaluated. - - value - false - true - - - -Target object whose property will be set. Must evaluate to -a JavaBeans object with setter property property, or to a -java.util.Map object. - - target - false - true - - - -Name of the property to be set in the target object. - - property - false - true - - - -Scope for var. - - scope - false - false - - - - - - Creates a URL with optional query parameters. - - url - org.apache.taglibs.standard.tag.rt.core.UrlTag - JSP - - -Name of the exported scoped variable for the -processed url. The type of the scoped variable is -String. - - var - false - false - - - -Scope for var. - - scope - false - false - - - -URL to be processed. - - value - false - true - - - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - - context - false - true - - - - - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - - when - org.apache.taglibs.standard.tag.rt.core.WhenTag - JSP - - -The test condition that determines whether or not the -body content should be processed. - - test - true - true - boolean - - - - diff --git a/web-app/WEB-INF/tld/fmt.tld b/web-app/WEB-INF/tld/fmt.tld deleted file mode 100644 index 3b9a54a87..000000000 --- a/web-app/WEB-INF/tld/fmt.tld +++ /dev/null @@ -1,671 +0,0 @@ - - - - - JSTL 1.1 i18n-capable formatting library - JSTL fmt - 1.1 - fmt - http://java.sun.com/jsp/jstl/fmt - - - - Provides core validation features for JSTL tags. - - - org.apache.taglibs.standard.tlv.JstlFmtTLV - - - - - - Sets the request character encoding - - requestEncoding - org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag - empty - - -Name of character encoding to be applied when -decoding request parameters. - - value - false - true - - - - - - Stores the given locale in the locale configuration variable - - setLocale - org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag - empty - - -A String value is interpreted as the -printable representation of a locale, which -must contain a two-letter (lower-case) -language code (as defined by ISO-639), -and may contain a two-letter (upper-case) -country code (as defined by ISO-3166). -Language and country codes must be -separated by hyphen (-) or underscore -(_). - - value - true - true - - - -Vendor- or browser-specific variant. -See the java.util.Locale javadocs for -more information on variants. - - variant - false - true - - - -Scope of the locale configuration variable. - - scope - false - false - - - - - - Specifies the time zone for any time formatting or parsing actions - nested in its body - - timeZone - org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag - JSP - - -The time zone. A String value is interpreted as -a time zone ID. This may be one of the time zone -IDs supported by the Java platform (such as -"America/Los_Angeles") or a custom time zone -ID (such as "GMT-8"). See -java.util.TimeZone for more information on -supported time zone formats. - - value - true - true - - - - - - Stores the given time zone in the time zone configuration variable - - setTimeZone - org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag - empty - - -The time zone. A String value is interpreted as -a time zone ID. This may be one of the time zone -IDs supported by the Java platform (such as -"America/Los_Angeles") or a custom time zone -ID (such as "GMT-8"). See java.util.TimeZone for -more information on supported time zone -formats. - - value - true - true - - - -Name of the exported scoped variable which -stores the time zone of type -java.util.TimeZone. - - var - false - false - - - -Scope of var or the time zone configuration -variable. - - scope - false - false - - - - - - Loads a resource bundle to be used by its tag body - - bundle - org.apache.taglibs.standard.tag.rt.fmt.BundleTag - JSP - - -Resource bundle base name. This is the bundle's -fully-qualified resource name, which has the same -form as a fully-qualified class name, that is, it uses -"." as the package component separator and does not -have any file type (such as ".class" or ".properties") -suffix. - - basename - true - true - - - -Prefix to be prepended to the value of the message -key of any nested <fmt:message> action. - - prefix - false - true - - - - - - Loads a resource bundle and stores it in the named scoped variable or - the bundle configuration variable - - setBundle - org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag - empty - - -Resource bundle base name. This is the bundle's -fully-qualified resource name, which has the same -form as a fully-qualified class name, that is, it uses -"." as the package component separator and does not -have any file type (such as ".class" or ".properties") -suffix. - - basename - true - true - - - -Name of the exported scoped variable which stores -the i18n localization context of type -javax.servlet.jsp.jstl.fmt.LocalizationC -ontext. - - var - false - false - - - -Scope of var or the localization context -configuration variable. - - scope - false - false - - - - - - Maps key to localized message and performs parametric replacement - - message - org.apache.taglibs.standard.tag.rt.fmt.MessageTag - JSP - - -Message key to be looked up. - - key - false - true - - - -Localization context in whose resource -bundle the message key is looked up. - - bundle - false - true - - - -Name of the exported scoped variable -which stores the localized message. - - var - false - false - - - -Scope of var. - - scope - false - false - - - - - - Supplies an argument for parametric replacement to a containing - <message> tag - - param - org.apache.taglibs.standard.tag.rt.fmt.ParamTag - JSP - - -Argument used for parametric replacement. - - value - false - true - - - - - - Formats a numeric value as a number, currency, or percentage - - formatNumber - org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag - JSP - - -Numeric value to be formatted. - - value - false - true - - - -Specifies whether the value is to be -formatted as number, currency, or -percentage. - - type - false - true - - - -Custom formatting pattern. - - pattern - false - true - - - -ISO 4217 currency code. Applied only -when formatting currencies (i.e. if type is -equal to "currency"); ignored otherwise. - - currencyCode - false - true - - - -Currency symbol. Applied only when -formatting currencies (i.e. if type is equal -to "currency"); ignored otherwise. - - currencySymbol - false - true - - - -Specifies whether the formatted output -will contain any grouping separators. - - groupingUsed - false - true - - - -Maximum number of digits in the integer -portion of the formatted output. - - maxIntegerDigits - false - true - - - -Minimum number of digits in the integer -portion of the formatted output. - - minIntegerDigits - false - true - - - -Maximum number of digits in the -fractional portion of the formatted output. - - maxFractionDigits - false - true - - - -Minimum number of digits in the -fractional portion of the formatted output. - - minFractionDigits - false - true - - - -Name of the exported scoped variable -which stores the formatted result as a -String. - - var - false - false - - - -Scope of var. - - scope - false - false - - - - - - Parses the string representation of a number, currency, or percentage - - parseNumber - org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag - JSP - - -String to be parsed. - - value - false - true - - - -Specifies whether the string in the value -attribute should be parsed as a number, -currency, or percentage. - - type - false - true - - - -Custom formatting pattern that determines -how the string in the value attribute is to be -parsed. - - pattern - false - true - - - -Locale whose default formatting pattern (for -numbers, currencies, or percentages, -respectively) is to be used during the parse -operation, or to which the pattern specified -via the pattern attribute (if present) is -applied. - - parseLocale - false - true - - - -Specifies whether just the integer portion of -the given value should be parsed. - - integerOnly - false - true - - - -Name of the exported scoped variable which -stores the parsed result (of type -java.lang.Number). - - var - false - false - - - -Scope of var. - - scope - false - false - - - - - - Formats a date and/or time using the supplied styles and pattern - - formatDate - org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag - empty - - -Date and/or time to be formatted. - - value - true - true - - - -Specifies whether the time, the date, or both -the time and date components of the given -date are to be formatted. - - type - false - true - - - -Predefined formatting style for dates. Follows -the semantics defined in class -java.text.DateFormat. Applied only -when formatting a date or both a date and -time (i.e. if type is missing or is equal to -"date" or "both"); ignored otherwise. - - dateStyle - false - true - - - -Predefined formatting style for times. Follows -the semantics defined in class -java.text.DateFormat. Applied only -when formatting a time or both a date and -time (i.e. if type is equal to "time" or "both"); -ignored otherwise. - - timeStyle - false - true - - - -Custom formatting style for dates and times. - - pattern - false - true - - - -Time zone in which to represent the formatted -time. - - timeZone - false - true - - - -Name of the exported scoped variable which -stores the formatted result as a String. - - var - false - false - - - -Scope of var. - - scope - false - false - - - - - - Parses the string representation of a date and/or time - - parseDate - org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag - JSP - - -Date string to be parsed. - - value - false - true - - - -Specifies whether the date string in the -value attribute is supposed to contain a -time, a date, or both. - - type - false - true - - - -Predefined formatting style for days -which determines how the date -component of the date string is to be -parsed. Applied only when formatting a -date or both a date and time (i.e. if type -is missing or is equal to "date" or "both"); -ignored otherwise. - - dateStyle - false - true - - - -Predefined formatting styles for times -which determines how the time -component in the date string is to be -parsed. Applied only when formatting a -time or both a date and time (i.e. if type -is equal to "time" or "both"); ignored -otherwise. - - timeStyle - false - true - - - -Custom formatting pattern which -determines how the date string is to be -parsed. - - pattern - false - true - - - -Time zone in which to interpret any time -information in the date string. - - timeZone - false - true - - - -Locale whose predefined formatting styles -for dates and times are to be used during -the parse operation, or to which the -pattern specified via the pattern -attribute (if present) is applied. - - parseLocale - false - true - - - -Name of the exported scoped variable in -which the parsing result (of type -java.util.Date) is stored. - - var - false - false - - - -Scope of var. - - scope - false - false - - - - diff --git a/web-app/WEB-INF/tld/grails.tld b/web-app/WEB-INF/tld/grails.tld deleted file mode 100644 index 9bd036b8c..000000000 --- a/web-app/WEB-INF/tld/grails.tld +++ /dev/null @@ -1,550 +0,0 @@ - - - The Grails custom tag library - 0.2 - grails - http://grails.codehaus.org/tags - - - link - org.codehaus.groovy.grails.web.taglib.jsp.JspLinkTag - JSP - - action - false - true - - - controller - false - true - - - id - false - true - - - url - false - true - - - params - false - true - - true - - - form - org.codehaus.groovy.grails.web.taglib.jsp.JspFormTag - JSP - - action - false - true - - - controller - false - true - - - id - false - true - - - url - false - true - - - method - true - true - - true - - - select - org.codehaus.groovy.grails.web.taglib.jsp.JspSelectTag - JSP - - name - true - true - - - value - false - true - - - optionKey - false - true - - - optionValue - false - true - - true - - - datePicker - org.codehaus.groovy.grails.web.taglib.jsp.JspDatePickerTag - empty - - name - true - true - - - value - false - true - - - precision - false - true - - false - - - currencySelect - org.codehaus.groovy.grails.web.taglib.jsp.JspCurrencySelectTag - empty - - name - true - true - - - value - false - true - - true - - - localeSelect - org.codehaus.groovy.grails.web.taglib.jsp.JspLocaleSelectTag - empty - - name - true - true - - - value - false - true - - true - - - timeZoneSelect - org.codehaus.groovy.grails.web.taglib.jsp.JspTimeZoneSelectTag - empty - - name - true - true - - - value - false - true - - true - - - checkBox - org.codehaus.groovy.grails.web.taglib.jsp.JspCheckboxTag - empty - - name - true - true - - - value - true - true - - true - - - hasErrors - org.codehaus.groovy.grails.web.taglib.jsp.JspHasErrorsTag - JSP - - model - false - true - - - bean - false - true - - - field - false - true - - false - - - eachError - org.codehaus.groovy.grails.web.taglib.jsp.JspEachErrorTag - JSP - - model - false - true - - - bean - false - true - - - field - false - true - - false - - - renderErrors - org.codehaus.groovy.grails.web.taglib.jsp.JspEachErrorTag - JSP - - model - false - true - - - bean - false - true - - - field - false - true - - - as - true - true - - false - - - message - org.codehaus.groovy.grails.web.taglib.jsp.JspMessageTag - JSP - - code - false - true - - - error - false - true - - - default - false - true - - false - - - remoteFunction - org.codehaus.groovy.grails.web.taglib.jsp.JspRemoteFunctionTag - empty - - before - false - true - - - after - false - true - - - action - false - true - - - controller - false - true - - - id - false - true - - - url - false - true - - - params - false - true - - - asynchronous - false - true - - - method - false - true - - - update - false - true - - - onSuccess - false - true - - - onFailure - false - true - - - onComplete - false - true - - - onLoading - false - true - - - onLoaded - false - true - - - onInteractive - false - true - - true - - - remoteLink - org.codehaus.groovy.grails.web.taglib.jsp.JspRemoteLinkTag - JSP - - before - false - true - - - after - false - true - - - action - false - true - - - controller - false - true - - - id - false - true - - - url - false - true - - - params - false - true - - - asynchronous - false - true - - - method - false - true - - - update - false - true - - - onSuccess - false - true - - - onFailure - false - true - - - onComplete - false - true - - - onLoading - false - true - - - onLoaded - false - true - - - onInteractive - false - true - - true - - - formRemote - org.codehaus.groovy.grails.web.taglib.jsp.JspFormRemoteTag - JSP - - before - false - true - - - after - false - true - - - action - false - true - - - controller - false - true - - - id - false - true - - - url - false - true - - - params - false - true - - - asynchronous - false - true - - - method - false - true - - - update - false - true - - - onSuccess - false - true - - - onFailure - false - true - - - onComplete - false - true - - - onLoading - false - true - - - onLoaded - false - true - - - onInteractive - false - true - - true - - - invokeTag - org.codehaus.groovy.grails.web.taglib.jsp.JspInvokeGrailsTagLibTag - JSP - - it - java.lang.Object - true - NESTED - - - tagName - true - true - - true - - - diff --git a/web-app/WEB-INF/tld/spring.tld b/web-app/WEB-INF/tld/spring.tld deleted file mode 100644 index 1bc7091f0..000000000 --- a/web-app/WEB-INF/tld/spring.tld +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - 1.1.1 - - 1.2 - - Spring - - http://www.springframework.org/tags - - Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller - - - - - htmlEscape - org.springframework.web.servlet.tags.HtmlEscapeTag - JSP - - - Sets default HTML escape value for the current page. - Overrides a "defaultHtmlEscape" context-param in web.xml, if any. - - - - defaultHtmlEscape - true - true - - - - - - - - escapeBody - org.springframework.web.servlet.tags.EscapeBodyTag - JSP - - - Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - htmlEscape - false - true - - - - javaScriptEscape - false - true - - - - - - - - message - org.springframework.web.servlet.tags.MessageTag - JSP - - - Retrieves the message with the given code, or text if code isn't resolvable. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - code - false - true - - - - arguments - false - true - - - - text - false - true - - - - var - false - true - - - - scope - false - true - - - - htmlEscape - false - true - - - - javaScriptEscape - false - true - - - - - - - - theme - org.springframework.web.servlet.tags.ThemeTag - JSP - - - Retrieves the theme message with the given code, or text if code isn't resolvable. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - code - false - true - - - - arguments - false - true - - - - text - false - true - - - - var - false - true - - - - scope - false - true - - - - htmlEscape - false - true - - - - javaScriptEscape - false - true - - - - - - - - hasBindErrors - org.springframework.web.servlet.tags.BindErrorsTag - JSP - - - Provides Errors instance in case of bind errors. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - errors - org.springframework.validation.Errors - - - - name - true - true - - - - htmlEscape - false - true - - - - - - - - nestedPath - org.springframework.web.servlet.tags.NestedPathTag - JSP - - - Sets a nested path to be used by the bind tag's path. - - - - nestedPath - java.lang.String - - - - path - true - true - - - - - - - - bind - org.springframework.web.servlet.tags.BindTag - JSP - - - Provides BindStatus object for the given bind path. - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - status - org.springframework.web.servlet.support.BindStatus - - - - path - true - true - - - - ignoreNestedPath - false - true - - - - htmlEscape - false - true - - - - - - - - transform - org.springframework.web.servlet.tags.TransformTag - JSP - - - Provides transformation of variables to Strings, using an appropriate - custom PropertyEditor from BindTag (can only be used inside BindTag). - The HTML escaping flag participates in a page-wide or application-wide setting - (i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml). - - - - value - true - true - - - - var - false - true - - - - scope - false - true - - - - htmlEscape - false - true - - - - - diff --git a/web-app/images/background copy.png b/web-app/images/background copy.png deleted file mode 100644 index f7d830912e757db06217703ba3828fb3e329ff02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15621 zcmXAwby$<{+r~$Ch)Ac1(%mH`ougB_dvpncAkvLA($Y1gL69z~0V5>_3>eZdfp_2E z`^Wa|pXWH9`@XmHIOlsj4Uf0RW6M)aQ4&*r@lDMj`{$172FT5)0s!!}ofQ;xbeueWJwZ;MUQDVA3QS%;o(|4#_5eWOYJr}kzTP2) z^v%Yly!z*e40TW73tT3ke0&6X>T3>WJW{pK%q1%?bO)ZjdxuFoTKpL!DJdf1g)SH2 z7yMs(P>cz%ny|Im0qAf8tloUsp9e$~+su;K{EiC5WuJV z`4c+;GX!8Y%EA%|i2e#7S2{P6`pa2Q3gbZS)YoRIj#uLEBF%8Qy>X0;co^8GRVg{i zMXb@Sb7gsc27RR#h!i5(x|jq2ic?>pR(tUfI89tXJuQ+1CVtO-)QA1_(#B@zac`!^ zOBMjw_6`62$i>@26CsHm;r{rI^%T>|lAze{Cf=c$M79l3e7I_K;q~9%yemoRSXtTI z-Cb52k~gy+Hwt@n{Q17$=)vtSTBR@G|JIl4p4FRW77>_tqlL<|o>U&+E`rX-ioN!uJX_3EBRz)| z?}9A7P`|EIOu82_&rgFN#L`|Q_tv6Upw z1(PiP71P*fa^08eslqD!z%Tkt1}gOD(mv?ovF1vhsgk1rfsg-Ux|R7eBAa!k7YN%F zI;uozqLsc8%-Z?#=O$AW=gs=G(nu$Wl)z?doJdxaWfVsE`VXjZ1c%)Cc!me%o5Z;A z(rqW2Ue*%U4AV3k)?#$UUD?hw1z?gzzU#*m!3>aRvSyG|G1f5FT2`rIqI)IuY!y!w z47LLYwtbF(oIz>{+9^i9_Xs>;sI;079ae7f~ah9oeY!sBowpsRO7Qax^Na=i{kI z^!Y^j;W@CcBwsxZj5)v@p)XR$@iWyjUuV*C@ak88ulT<4oxtG2U_w8++EOp9UdcdE zZ>Jh>A*;sVdw~vIk5dI-NQ@-w$v?w zT+FUSH8FmX!b7i{rdC4zIl6Kl=)2;jzgL%tD+sCy8npl~G92FG?Bsag=KE^l!PqLZ zFT%fUkR#atu+vruX>{=0o4bC`%FZ&bQK`|bQHJ-3)SpxqRP?;-GC@WX%Z;eLF@K}% zm^_VD0MlF1Td%~gq|lU>xT@#*?pjV;(xn*C=TUi@Q`l=6QK;crxe?R@yQd4|eb9e! zzpuPfCN#!wA$)}mC7h;``X%h`DMima0{yG2U@<7GP;Q-RoxL5M+VNYebWtf$i6p^! z*nH>Jj{C6taOrF8*UYcgHIFn;bAg&273>v~8j>0#QykvR=QSA;gaKE z<6rO?xVoLXac>zLS`T&yhgmz?P&&5%svkT}?@15q3`=~F#vzJbA+Dh}r4I+S`jAT) zN^Im#=byd}`*oRh$m?i4Lprl8xC4GZ!9L_%pqDqV>`3X@0gAf#93Q9tae^mXh9{49 zczv{ISIzgz+hRL-?y4ZKCGY1+6|~`0t=1Zwt{w~V;hWx*OoWcs1DNDULNrM#u`B>b1majv?H@4CAuN7Ve)=bw7-3{eL{QC zv+(_=O@$9EPj*kiPrm_`5v*vA7;%wuk!I+~+u%^*a- zKJE?FF*}VOr_?duz;dQjr=5vE>4YCF&Ei<^TgMNE6TbNr`^hNgZIah#W18Rm*}?(8 z*AzgTiua0HiW_;3{MzCT+-kxcGT(Vzq*g^cg*x93^EjAHE*cjYtGcPviSuyOi+H&8 zZvH#Di2YOWhhQg!GKY86!Yim``sd}RN{VV8GA@ZMS&h$HVi{+0q#RWg39RSO16Y&r zgMQNgbbQJCTjclWWd(B%2CZ`y4$a`SH%enSCqTf`fbZZc4tmjD-QsnwG zxeG{3^zcWerKWhxe`nTA2Rj})?mPHT)Y^Y)e*EPT-_FaBi8JQfl2VIh!i^7>uQ<>* zWrJ|wG&|ZGIrL4%jf-d16mm|TOty?eQ$+I-MNcPWKgqV!z~wROM%?tq`#rTT;>}Xt zK~Vgi7g(GzhS;@IKfZuD+!wWLPK>ha!+Tx_Yq~~S4vc>sXhU;_6Byv{eF}rGK~5~R zjd@Kr+pOp9-{buFW{x@M@uZpLBG;c$P0yU>g{ z>wEToHn9iM%4#doreW*J)%80lZ}t=$v?~g%&{5ha^`qOqa%_4^@~wWE{-yrCzR2m^ zdYd)m*5mgnZAkaE(D5SFto!CcW~>)#fM%e%=&)#yR7JMjyseM>et4UObhoI}a`!$N z!I;B%z+oWF1>NfyqmpaAo2V#@@#QL;yFD2$4Zz{_r0bFU6qU!yCNK8wMhY zRsV#L+HIV9Mt^!odR`a#-1A(eJiT0`nT=Ve_N2`3rK64Df67osl6)a4lOVMV{W0g& z!;kanj^{H81(^k5;XHS1R?u(Y5SZ=srVEKDqLb8jd+yy+JWR4%a@zd-hwphabnm&* z52M@$iTCbDzDH7z>GRqnUHM(P^&RG}9jC!PZ6OXfhqQ&F)9aT#L4PTpmKF=erPq5d zf<143-CS)_tcUx&d6=H)S_yb_TGy@J{r*z+L~cc4J$CV}+2h(WV(o)Ve?alY?=|Hc z>`zfMkEvJ5Bnnu`Uy~l7ctOx&z0WB35CHJw0|1V!004;` z0D#gn?fow$06>6GRZ&hqaP`>Y(C0#|zT6NxcJrt$lq|Htz4w^&kw+7RrV>$RSN*-F zE8Tb>f6GeT>G7iI>7SoPWrZ_PbDpg{;~t4Ldz8HVAu}(O=#r~6b6Jm^q*5MZj`^?S91v#{Ezm z$mCVXk-5#O@pw@2z1GMX0ONG_IzsI(P$;S9$^6Ss{%y^y*+@` z!?XVSTT~{EluFPMe|M%?1iPPi?zZM#D?h6Cu*}`)J<;mL>YZ8~J>ai|G1n>=xK2`q zoyVM8Zkn6-fgVnzW{$3ct0C~K*9yqKzPDGwJ>9$n)N@nVds4eZs`B4?Yb8P_}j&VJ`w;Xue08zK#$=-W% zhhdd^O(Ax3@;YWRf}p*Ogj3|U!Vd4XB%+!e3j`RBZ$Xmdd`!!t zMtT1#sdn`--jDZhnTlqIj*ONWJJLhC%|j4A{n2!S4c2%!i3UW-qEKS6Op*FoGYR#39$py{ z4xDjaqm;1Cn!)WYb1M)b55^{p9rD2u-=3rKi*T^~v+u?j(SrEaf zM+{18rgxh2cor4Fg80AKBr;A1Sx3emMhHNdFui$C<`Yq998)y*{~G>(YYZ0$?!4Zxa>LF>t%&=b)9>=3hzs z+O-KTu?VgU?y+>qeZ2^cZsn~bD(w#|E_F9U-TY0OPKMMuSc>mAhDT$}I{9R%&&L4J zj2bRM_P`dfwH>M{T{I&)IHBLT9HfE|H@2P6l3;XA@RqD_3+O8IDN*X}8|eQjVFGF( z5tf$mmoj(0U27h|P5{-0OGyIJ~|0EqG46r5l*M8Wn~w!r@2ciecl*_ne?7OQC{0*mAtfoPzK+2$7J@R=gCt-C_HpXvARIi32fI>ZPGaFf-GIBJYDFY zOfw8!R(@*zybKFqC;wG(MD3xVe*POTP_u*Xxp0yRr67$Px}gymGnsb#NoMZ_*@_7{Ev4DZX5s!HGqz^QcG$|v1_JzT zXTcIJ$=(|pF9vZ5jd~<0oIrSGvq*Dlv?lmeiIeTT3aBhQ&$Uch^1jyyB_ahgj>0n+ zKgsj(M}5*tbeEv^IeXYG{4im=P;ayW(ytC$v+Badu9&fsd<`T{>fSzH2joT_YfCR} z_x~})&$5=5BT|X?r@Vh0#kl)jutx`wH`kJ%oe~h=sZ?7wK>h^&4)UG^;Vb&3IB(B& zYyyK>3j~t9KiAST*+|sYKGXO>>jis>S$<@4d~+#sHX&zIL4s-O<<$g$4!fi+TEq0C z0EvkiBUGln`cI_Q8d_UUG?;)T-s}lr()RaXLXZYKiw_5(T>^4yXaVDoI;$|@rH~)pg((l%XO=YWw*2{<5bQI_0)Bc%z`AM*w%%7&NC0n z!25-OuL6o2+X1uR<5q`nXzd2-V|xSE{m&k=uO4kjRYSO}eBUWu6&-%Td?ebKB9GcI zP;d)20C8yHS?AIC1&H&=yUJS^!la`2!#l(XiWyFPI;uu?n*R00E2DwVK==x^=|lfM zxWp?=gJ@nhe5*I%*``#dqWaDl@9nmjf8}i8 ztT#WgvhCP4&aAlLAMLm||2BGkz|kHr9c@ z*A3r#g5xC%v^=XXGaf&cJb~#=+4;V7u<4Amt&Ok)F$i9R`d_3pyc+*zpJE~ zOTPR?d4`Zkn8C~YX-%n&`=mN*)eJ!cvxhqdtZite@mzhr?okHlNG+4(S(Q6~aOuog zt#%PC$ok#LhDEj@*AUvSsjXn~p9!+!G>a^3+>9Gp?k=E9wRdb)R|5-4_B1EEnYshr z@R{LB+hVgnB@C&~f7>v{KhVQ_j|^svG#pL0!iWXP0J@P>uxda4oRMKE4psoDd8jh@ zb6Ei{5Zew4J__&St-c6emwcV(E&zwD<^I$N$v8+NMRufF;Jq4YwBO=b5i}C$A&2jB zHu<~0<*lA($(tq_+p1f5ZoBmE$x~2o@(pwTw#U+QKMJN4m*AF{XLHh9f<(%1oo!`CK!EXavilkV3<{@An za;K(;X+ocz!$;;ku5ybPm4YL%13tl9CW~GK(u#B|Z<^gmTu~z~QAj1tD59@Ao2bt1_fOz1 zf`?|XsiywKFzZzYg5d12kQ+hzZbsr*QO_2*%__M9hibOI-SjUo?L@J*Gc~2!i}pnp zAU#V5p-?*4u#jDZQw6GU%M>l5yru;t6^{hsTkW@j>joEbwl)H-!gC{Wm0QOaX*e7R ztLuiUhD8H-56xxskOln2rqhK-R4~Dc$6ST$#ZF~1$I)Fc?`Ip<^Y&pPe~FW<<5~UNyI??PyfM8{$nW&4Tx4`dq?4n=7kfeMQK0Pw7h)r=)r+a{4#cxM8+%CHm39nN_gGYTqX}R+obA zYBP7h+O@b*(On8R8{X$8&{FAX?4Wh^!{$u!OANg{Tc@du^`cI?x57y;pwi_rZAZ2) zXP29iUXYNU%7wFvh(`T}aKd;g(ZCUKa6Ib(=i>bOzm6#}%(KT(ne5Jh7RxCLZsYhr zUa1SeGO$!mt=+F8>$Ch>$?rs|F?il(Nt#tIJPx%|Xi&$yhJlLA%qEuCtFqD?I%QhK zLAKDiPO7tNq_ZoD8|al)>G|?8$v9%m(E?Jv^S27+zfpy_?p?lm@3NR*Fa6~%m8c`T z-O)|?nM5eYXUm-x%|nlr)nOhZ_z(j|zI*ZWZ&;f1T-9o*?`}|NO0wk0!*NS3nK)fNvp&t z`R{`pZClPJd=ty|_W)8XiIEzI>YMO1SCePe$rKiDhu$TmRWxn-lW^Nd^{?}WX5?wB zqbn3HRM=M+7Z<766d_cN!u@N*YDb$ks|asFV(3fOWr@YK2RU~V#Z}(yc$BA9&&y6r zIL-+ByeHpCt-!8idbAO<{|7X@hnc>71x{7?^hojiVcShNiaEyT-EW`t(0zYgFELV^ zmQJ-+2-kXpA(<~?iymiJj&XIo#_b$(JpHlfZ3%KKJ!&7OF(SeGagQaK$ey0-Aq8nk zPmF_dtQ(_8@>lout^XcsPs3JRz07O>B5m_oT%{a&R(5^x)h3&gb@z*P`gf`YYt%5D zh*=~uKNGj48nZHG3Rrw+Sj#flW?7#b^YLiU>)b>zN}DQZbn4@1dsuJNlyd(Bj(Zh5 z5M}^R)0~Hyx3rx7*zsICWF?lE|8&iW1J^n_X?DBK$j^3Y@-Dv;Clc%!bJ>Ubka8@c zr-TL&y!>lr`)P?q(S>qHw&jrf!ZA3vXXQp_SPQSb8*UqA8qm`hQnk((;Hp0v;v$vJ zzDG#56}uzJFFe^M<}AO*ox`K#>JRYpD=hw(0Q~dZ6+WDSrn^M7@!NJF#`(C-y(T<7 zTp!{$Jt|o~BIzJ!fi8;0rKchVj7ZMlt6W-8$E(xnh)m4KyCzbB*F)fc#vo4{%7I3C z)~eEu!p(DPnZd`}1+t(MWJ{L#E(6Q(*=ICA%%HSUOK{C9i;w?2Km@v`>#n%aR0FS z*_LyzJ`}9}9q6_zUB<>1`&F_|>^j6fp+O?Arpy|grO$V^0QYm9f$3Q^K+RMhE24+WOZ}PBVQZ^LW9~@6{oJ+a z{fygQXvGCID=iu8NhZR*ke?QNKaRo>jfH^#oiweNjhS0h%+V zCl)R$FkRUZ-{{I9z9Y^gA_cqG5XVN*jPM&@Xg!mcG4yl8SE$0KCy2I{fuYyT$>wmV zlo9D}=4gP|QN|k8M*DYF2NhD1Njkr*q%*v3B?E@S;}%T%d<94 z`x;K*YUt7v>UEsN<#k$W-Z#i}Pz59F~Z{5CBjkTZ#qFo+F;XgXiGzFdySN)2$DdG?ai zyL<*pC8xlCo)J$4wM=~8t+phu+pq3CCy`x(YZYGT=+|Sp2)_z;rBp76(jHqx-?$P) zH{m2_$|&vC`W}Um%`b0ayJ?atlC-oW+LbX`8>G1;p+soBU0bvE6+FL-&U&(5Zlu}x z9iFr1ZfkKNY&NhO?ioJ|-S=dv0Ubt?o4l8NGey(?WEx5P8idDr5o-RDsweM{?@roG z+E&;MAmM}QI9fCXeZ9Z8tC=sJ(xI^z{H5sXAJ&MV4G+<)K&g#{q&k_DuoP3D^C?-U zczmXt`(y0&#|$Zg&2S^X*#c7%kB@&){Nsa0$hR!NBG`)B$I4{NW&$^2G{(Syf_84` zi;mOddfOYv4|Z3sguKehJwH&r3VpINCt&HRaPA|qpz0~jvr|)Y%IaK2bp|yGc`cup zW~(&+)?Rr3*hHXCG^}h<-H|BcQVqTprYXxYbO1+o2w~I;>0Rf#K6MZVsQ#>^yYWs8 zNOG;+f6Oa4>VV4b2Y+zqCTp@_mUsL)QdRq*&yusjQ5~pa#cz9^X?8zMQoJgaTp?Wy zEk^aPo15J5wjvIqN zQaXMdt+gk*L@!VYUoT14Rulll;FTk&wIbP*`^obldR#K{M zR>$hpukbu$Qdg>W!=D`ymU-$o+YYO-C zd>u-a+hsAIV>t&LO&R)9txpHN4!u|$!G6L92cd4?`DOR<4qYmz#n5a@yu3ofuFq!z zN?u8NL%mlkT^agX87K3>PM@{a5 zV&BFx*giO?NxV12p4>r^wTZoNmJQkSRl9}C9_21IhIgl(aFq-^)pszPgpJY@4)*}urWY+h2VVFx*RbHx)0z3GuC&>}ed zI7P%xd^E$4GhRLvs*y@(sZfurHfeu`#!z&_*Iw-BM?O2F3h_gcp#QYt;?Df&;#JR* zIGucbALwdxkMv8&s*JUOl#3`P+dAG42zRSCc$8##%+|Jm$9h!tLwo#NmI|#L3Em@< zFLxeEPCW?Zfb$p46H87j+;=)4YB#D4lF2~%J!86N(tfG@XQRY|d!&mD@u|tZezPnH z;}MN7w&?_|$4S$nt{D^7M(I0x_(JtPu5#Sd*pzRK59od+^tH3cq15(opm~JRce$UL z%~6^mCFn$4xYz7P$By!Tw_wDUJ`Wk?5KJG9X9&?PTiRW3YU4k zxKS}gy=I{eI#Zgfa}76SWDlP5QIiGM%zEGZA-)?#+b6Rl@hPNwhhCqlFj6IUU|`WArb&EWCama{(_3{22VsLrvxGPY)z$LRLm zT{nN9caDy+?cddty42Cn^SZq2H7k_>+fthK76#)oVy70P0(X10G?rX`$~1V+6UBV& z{FApokFGqkJBc}<`6g#xJF)gqRK1C(<=1!vn1ps#+?t*NyE1kK?s z7ve8sIPWo2{nK?BR)4Wyy=}Os2yTu^p!lJ^`5L#QKZNV|-s3LXE%NroD!ZO3Ps81` zj%hWBX-o5C)2r1lI?<}%2<@~NW_GA<8X)x za4AMW!GG3-1h?Gbj}AgE(PWg0I^`$UAFQ+fX#9^CSHYC?#% z^nN{R9|NGh{U$C@L+K)IzYg=P$s{Tr&MCek{0)l`_Ge+d9T3zb){-U)?{=W|)2QG> z1RhO?PmlUEe@o9P#S*>pC?~ShOt|15u5Q3gx^T1F*qbxh$G{vcZef0j=yYVZ_}moB z6d{zv@^xo$pYSugW?BY|FB(ZvfVz#K zf^c$4Fl+WXZkrVWyEvt;nG2kVBam%MC>g62)dM74Tu9YeQ_1v8W+@aqkkoLyBM^ug zs6f)7ab`|zqV(InwQ?%O{lYFaE1RWc!8URG1|XC=%ja@WgLbGD^e2s^DHSjc&S1Y0 zb*u~HJ_j#Q*&GdYjDLA+NCnoAd|YkF!-Q@pihj zi|;?v3r?Y(1%7Vmtk*-WH{l{|69+yZKIW~4&zHlZ?78{CPQb?gDqVQ3&$zJz3!`GG zw~nVL@^|`z1k%{nSKWuhh$4lPH5WLeWgQH&B>Dau7e=MFb@^Fp|G1N`@qQ-O`j)Ad zbA4lWI%gIbxLC_9i2cfu51$g1tOSUDBrA7kuwcmpzIU()8ro))%>5UQ%K% z(X<`}<5{@SgdVJ$+oSP+;9TS_cu8k|6}ENTv58Rc`k|A2D=bw)qj4*p0#FT1()-px z)hOG6Bi=8^mYYN4U0ZD#q!|-wGMFnE!sZB8s17J^1*}RqHH@A4h}-iq@!B&i9K03b zIK}vLZ-GNka(Gn?b(fIQKf-*HCX7PGFa*iOV2d*HynMwJiyKUhxP^veQB%u;hs(DR#Er0Tes<{)$?NF5zl@^no z9Jc9}S+VdWIE@hq`G7P2fiqb~R3#5GLy@gJh4tN43_*uTcrjb;YD5;Dm4y+aSXSRf zmPQ$Zt+P=$yF6o^)2uglGIaxbw!cDGfofNK|BH_ZZm+599U6j|>S#y)vcTtsA9GJ# zzOyJDt#@&)^RSVuSTr!ZcV#5QJ<>NNl*0O#Y#a49x zhnv#&H&ANfF4Xdoaqgsy+6L6N*NGd_J}hzPO27ZchWJ5*u*O)pp{m_%k(Fa$@k^ zYU|+uotI7QYRkZfo3K8`4R+hfR0_8|4ABwA(_qWvhtx@}nmSfKM+$u+Rz~u*)=z1j zR6&;L?|+3mj=nx{FCKa^3=`6FZ=(Spc#QAeLV?7;cum+C8s^Zp)H~Ew+J)wbnStWvrN9|sQ7qiDvQ^?6NgcS9DZ@+0uVlz zAW4{NBI?5#zN?4pOye9`WcnW84O2~oC$nDF{bEqd{6y6g=O+}ZrzrXh?d5h(+#$!O zG5Ifdg*2y$o*pvDM73eOJ~%tOMgErbq8{0Kg)QMbHJWdBPd7R<@HL!y2fNOMdz9Xv z$;@0RAB9$d`g8lcsr_`+!tAKMrqU&ImBjm4T{oLR5sA^O|y?#Z?AN z(bKnvHv&d)B8)Kv6y1i2nk}X!@pmNmk-)16yt4t~oQgx1^cHtB;iS@|&S}@(&U}k% z?wud9Qg3wTAlf*cZJV$)0T^_yA&i^N7V!SCEfXElF|FecYnUmR`y-&pr)a%AHFC+R zt!ucZn=(72w%8l>^0(R8L4P*_S#Ci`$`muV?c&r$-euGY#M-h9QSHwaWOUhzPC0cf z`ct*-!?85}=h1zbJ(keCG+oHAJL9vIa+h4SAgxW}HTA{X$%1)VwQ)sQ!C5`L6Kk~H zy=!3->PD2%@=d>0V(6TETj!e{%dTBJFLR}3l%GYdyO~huXm{%`txc1J2iF zq^X@3jgbD4?+GNa3A!{chM$v1-Q>7Oq_APxmomIu9t9e7Elj1Tf;Z9 zspGTFK2L)sz49so5tjn;)C%B*F}p8tYJ`?dQfZ4-Gc@XcrS|i`VSL7AaJ|5$?UDu( z7cez1UTQOHDi0*@KT1F3_dBC2@NkQ+*PO2^Dk}Q*_pRnU?QFo}sx7eG{oX{LS5JcV z*L8eyW@b5EQb)5@=y`@-<-)=+&+b+wrkpz3Y@1?t7~xqHEcv{LA8`x{Q7(h)*pevV zp%h~zK+H|2Cd z;IPjqp%!V=(x|f*#_Popi*#G^kR>3%I8nl$dm2zgT>LTC_>nG8#><<0PojkiW2qd3 z^2YZ!h@$_m!>Bx&f~g_HRN&TT{I?J7eMSWN;=ZQ)9fc2-_X;&T>#Meni(I$3<+dd5 z3zPZa@+^Yd2NRbqkVei0>0LAl_`Q%3M^7|h++hA4brG>C^IUj``ND~R2nM3!XWL>z zgRa;}V`xRI-tOuL!anqopwu6m{7Jp}(qpU%4W2q;$kk{_6bt&1fP;&85pX9Zl(!8h zq}EzB?i|?v(vc#Tvu=GDPjIG%CPwbz@evhtX9Cp{cdBBnjU)b{{O{Z`GY8@byfq%! z_-Er`blWF^X5dYvWj{J2bu{VbJnc=%6JhW=Sg4Dbdp(MGNonXM(6#Qfasxfg7R zN4Pf1z0ce@F~pM+b(4xiEmmynX|d{P(+|@(eFo|{4&RPvPN*d3C#ZN>-7=7 zd=Q?9LeiE3pSX+S8`&XY0e?GHQZj+_f81?b(R7Y_tv_42N{!_EL=76x{4UDNP4hUS zJRi!w^ixmglHEtn*O&{ylf90QWF%qWkfXR!W& z(D&QKEz6o4#Wxb&Pxfh_kAn64wY@Pf#Y3`vDo%VjYgbiDe9H4<_DOyQQemTF-Nmb5 zg9Zq^6icJ3w`V~Dh!r^zWPcqzGTF1x;V-`N3QgoqO3h!MrP=qsq7=@^tWuHXD{20G z4)H)^@RF^md__k;Tg)z-1EbrXyb$-{ z)vO)^DjL&@(z)!+B4faBPqk*-*g_~UHKT_vCe9iq;Ut! zdi=zi8i``rh5ZrQ(yj`6wMJPj1oTgpv|jGmRcB9P-KYc zJ|)G)a+R-pDm%{LF06c5=}q_}V=J73Tah468TnqHwquQ3Rjh|zKV=FJ-D1m=NVqMB zTu#L~$`XMBB&ELyVyLPeuJ1_sAjl1fTk9|%#Rm+p&v8z59VcHdY1C*s%&LD^*hMdx z_Ga4B31`xkQ<+!ybXmL|XkaWzD=ghLE)Pq2}pn4coHLv}p$>`@_r)iu*Z@R^q84}u( zVl981=zw5F23&^$2mbkkFzNsv=>$9tD|)f~m0F%&%=$15?&s?RUHRsd1uqKp-Y*@w z^`952T-V+_ySkdQq|=I`5Al+(^9_|{0I7!NeO8^}dEqYLx^xwk<9tCHgmbpxS76}1 zvY);h%zI`ktY5OsfXi(@(~M=Mbfou$rL&x%eHV(9;-m~J+0wcSFwW@>%V4xlYv%lt_r&ZR4Z zHY+UaAT}~ZIp%no~(M8F7>acAdSVthF+ZMP32=4+;abI1%XiY``)f!*A1h7`M^r0JG?)0{JCc{92 zN;XA#|F zrVSW(R7=4wD<*aQX=F}j@mzO?q>Opr3I$z(9P}0+X9WWeBO1u#&U-i726AMMjIqyk zdVHNqo6r}okPDW-dktUJU;X(`scFziwT*M=bc3`&ZTElUDYCr64wKYruW#o!u~2Tj zDU zXC`(9#1B4x{QqdO!r64xns3;ly6|cZhMUo4dEpVCuLE#Mx`gTUnR#F_v1?c;kzW)0 zDBe_+eFa94AT2%4Ma_m9MN$l(M-Yj_#8d$g{V22Gw?6spDUmPI3to%AB{1kJ=O(cv!`ntrr88i~{KMzg z_dJv+t3mlw;&ZP$fV(I%&+Iqa@5CCB`qq-T4pDa9RpVGpn8`@W(l0Qmv==AuaH~^0 zpWz}uDJM5`kA{d>k63Tsl$8!s*nX<+B(9qFy4=cECSCF+ZCWiY!@3 zz$6P}@YFz!eTymrT{f(un$6(JuNv&gw4`Q4azgEt0ZUqX8gEc|B z2qVJg2aM^`=UHF*^rrcHCaXa)3MPYpD0PEf+$qVh5Uu*Wr!r!Xw0zwkrc{R4UWOJ# zZ2gISDlI4M`}Sn*lvmpR-xSP;x#l1KI7H>X<09JY&rZK^ zt;oLEO9CzPP?=awjMB!)6==PA!~C35ocX55Iaeuh=ZDvWRFO7sN@YR|=8dk_O4|$Z zo+}m4xFGK=+gfiTU;!5Y3TN19oDGZZf-fUi;AZe!=k&zQ3ac#`O7zwdH|;YyS`qmd zGcUrPkVvEx{|?!a@X1AcQ);CHrBwo3oCmfmdX+eQy!SBfWOkrL`=*isBbXCuTeydU z$%nqCenX2(;lwVx7T0!c(D9KsjhlLXgr&_7h~$URj#0t@<)Qmw6`PV7Yc`#uIS>Xu zu@Wrp8KvIg@_pNNSOZFX|0~Ccn@^)yFR{f3LhAkaKhZiAHtjmnWs8e^VNipcMV;-O z->YXh=&1a&X$F;@5>+$^T}cbum8-P6Xh>7``WrAeHv-}JiP$ZQH`qmlXJhOf@ODgP zg{rbCx*b$FUwffXZ4!SnE0p-(oBH7Ffk@cf1-R}T3SEKhz&y};pUL+q)SCSW!8!2uW>~B;?xH+>72q!IMXlWdI zoajDx3;HNSQf1J!?tx0a*vl7yH$1AQM);G^j6)$!Mh5@5-cEi188nT5VZvWisdeEI z6uFe9q&fQR7c+sYU*}#*DP0UtTg{m1v}uxLpKvTnMyma>VoQgyb3)64UyISlpt84- zsS{_2pSrtL$~tOx^wTbCu$5#ucyfKjSDeGZ$0(ifo&vq44N(-muEd-?Jtp-YIiD?& zLf6x$z#VL}S;Vp~((Z-12a+kGJgW~$m<0QXCrBUSesvC%Mdr-*R;Hc*62oj%lWCW; z#0c8Vm7S)sSJZ+jaVL>;STl?KVH7xXHHHX_wUoIOvtQll-_@b$OHcCDT#3@LTk!C3 zp0`B70w3X$VGDBsPo`Y|9euEiwC~|>=!~BQklPg*H(E2JvQnilKoQz#=8Z6gj9WScC!Vc&e{i%r|peX*9slu_7 z+aUg1K9KVH;|Yy2o`R|oas43iE+=Yg;D6Iy>8PIvMmIG07Yvhz%&K3>lrr~?1AU`> z%=2#B4OQl-%Yr;%#m$?_B+2aar2HZG9Mc8kQZ!%m*khFf&R>xRX4ndvn~bIHS94tB z-LHHZ#nP&XSIKF21a(wK;s=h*zLR2&AAu=yyVjtlw33f+<>#5eY z#(L9DG3qb3a=S!TM_(n~EFHM51LMUQW72*GGT{J=diVXUDnyCXJ!XiC`H!P|oAgGu zE?#!z;D#YkJmx=V34z-i9GGEh>JQ&7_@(&1(k04kD;us5kV4EnF8DaS8bIbIcDLoH z>WlBI!_DI-&r_G>$nU+xipTC<(0qZ!WL8_TkAJ}n!FiD$4m=B?GF5cX((H9Z694gp zw991Y1T-%7#{zTNiXdo>E71J3VFk2%<3FjhGh#r0zC-JM1X}Un=0R$JRbCN{+TCma zXu=Y|TfI>Srq-6kk1ju5lD0)(+Rbk#+jJfS->66PwNaI92ejI{%(MOWNGV_DVGtJk zwxr`}WjaMj{mR!C&D?(W4mdH*A?yIi0btb}cYsk)?0i;u|b~+gZoZ-Is~->g)@@ cKG6cGC5y!hhha3R|Cs<(-)Sk<%UgZ?KhAmFYybcN diff --git a/web-app/images/background.png b/web-app/images/background.png deleted file mode 100644 index f3f5facf622a8f68a893838dd2d9fad5e4f1661e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15631 zcmXAwWmp?s*M)<-6!+rp?(R;YIJ8(P?(R-;cZZ%e2`f6iu1ps)j=WAQ*XrB>?fw%9aRicB_ zRGfhL$do|o*kHV5dS)sVY~^UG;x&A&fe&(W@T6l!(QpX~!EyLntmrYQt4N1bB?)1r z(J>Q{J-<@BGN4~Ax1WK*G`I@=f~I2@+mJy}o%IT#Nh z>6;*34v>_G3C_==*9H{91HMdJm>&Q%*#KV{f{qse!TJBP{a^q_X;k=t^ZbiFVQo$%Pmpv$-JY>9JEV&L|PG;PIQmn&n8c5Bg*i zbBFL^?cPlR07c38(0_aP>OF&5H#5VZ(1!V$?ffU=JGHs_!Q0Vnjk6>Gu;(85`;C>O znIu>QG1%d)gzg&tn<-k62RQa?6P9Evpy+H}@6P$ZwUH}M>RekpIy_ue9+oyTo6rk* zvmX51ulH*I6e#)ve%S5Xrw!pY2~mLmw>vm>uL>fYO+g7a-#kuKcxgv_e<5F>9#%5% z)Mv&!(86&^kj;s^;|5WGmrh~&MK}L$xxd2-ffL{112ou*!}uk$Rhn49J*qHZ>$~^w zg8_isZl{4oMr63)Z()10Uhg*&uL?zUfZ(r6DJ}qjsVptK&P21sC^7&bTNJ|FAVqpV zK*ZXQNH&15Ie_-^g+E-Hc6d-4TN>3en9TJH(~nST#>nXga^^1_i<0EL{aW85Q=Ku{ z2S0USiaBFFn;{nrF!qF?z)OuGeNb=7W%Fa zPs2p!++0!mimWutIElC%*nZJ6!veH8-(|QNI+I|P8q0L%apvXc9f34wtW~+ZiX=3t za$eKi5FstM|C&_xGu6zvazzAKIt>J zG5g~uPoSnNr_-mCGIQuuRhL(9SEGHp`!uPOSY@gmP$&P1NBf`(Wig}XQ+2-Pg*K_S zb(KhERJC=bla54Lpuy{RM1vvKAq|-_t)j-y2R$Q{XcolH-mFx17&Va|A$-I1jnixX zp3L1@ujJjaV%1f}LNYwcJbKN*yR@$oNC#Oi|MJ|`QBD{uGVcOow()M5_L)e_c~v{P ztc>ldGcq&uYZPm=Y7{Pd`RlGK^2>YWx(y&9m{Oz448{x!)`>F+`6t?I+FKQ<6$ENx z!Vh)q)pj7#;%-^5pNCY%rkAt%a>ck-xKDCVa#wP9+P@fj8?v@lwslx3H60q3 z8(g>bI7S!>8G!UZ8JaZ9*XGyKEqB*;SA3}GR8Li}DOk21YWUkW-d5F4+;FstxKY>U z&=z23ZBA(2{;O{2I<+@7perE$RSXFuY7Mi7+>kubt;H2jSXX#EXD07jBH-73#ug2N#n)-}#69 z+~(ZDtICb~YyNAS>!{7bDc(Y+0s|hmxuG$cU9F?v5@?0#oOU}u0yShbLabX)XgDl5 zlJ#m=8rnf#)nKz5Lh(m&*TMtw15tr(?rnq5Qv&_%W9^d~Lrw*sBX(qhXx=T~ecyir zDuU@?tl_?gNQD@|LjL*sQ~gYk5ZFmQlt^%n)+hPRmC5JzdsD`3NA_7ZLv}mYnoC2d zo=usLS-hIvR&-sUi?>T+g#D|*)RKO_zLLEPnGid39lxV}-_Fa`UDSU5KH7mFVHU@j ziL+1f%;0@Q1wj=%4y$m6q-wOfVA>xkZ01UWIJ#S0FS-O&pF#3LYif?){J*1DWsI3A z)Nd7;)qGPflY97lXn*m5SdTix8LEBay%&=xW$Bfxx!MClU$^$snk;2 ztk12Fzj{vou!?AU`{fwh&OwomG;Y_N^aH_w4Yf_W{8Yz~afKPF$=XWq>(A-$6G9m^ z1uWB7Q_T|_NdkE{h3{85gE)IBZJ(LQSGBJ{zb9_y{bKx`;nSJ7U_H z9hNj|uJkhN0(&=y_wchRWsaaIs0|~>)G)(TY(W~Ms?Tle9G-zucEA)E!t0)Ken0k*7Cw5CTa$Cx zO6T0>$meS3K#a_dx-_Q5e=nbJ`@Se_e8kG*6*cftzS9}ESw9P1NVUG5jmuBZ4+vy` z+WfLn(&l$!F|%Wf<#f}9?Y=iJ_a1v9(jziseB0rE+q7|ntJk5IQ!o74;oSXP^euHk zW3)T3JEyMG*sk;1x3|^rEBK7GKwxI;zSrk3!Ta)3fsoi%@13s`_!szLhhQtvmEm<} zvU|;o;kvd*qv!Lzdj`5ZNFF1-S15WFk(d5>|63fB9;t7Vs_$W zBu3;#fuOjM(7uH0>)A_%%&g@seF5QH$=hTdApu9=zom@3 zFNo_mMg~VH`o_I^xJ>VLAy)%ln_lEMr8`&}hyIj7jPKu`8XvUhDj=!Esj2Vqa9MXR z7CdYlP`ycMp$Jq10DS2HfZ#9y;OQNDJOcncI01n3F93jW763r#l=AtPJOIEgtRyR? zFFd!p@OQjrEcfAFn+&-axsJnK@2{*Ym15VQ<_eHNH(syz5xIpX3EA-$_x{YiDe z_1?=mDNF$ND()OP-u5tYC+nLnU*^8|yK}oV)f|a5fb%0SvN-VGyz%WdwIxFI=-yg9 za|fENRGAUI{HdNf{lYuSO!H2(#wJH+ z#iRNLa_PZjBXE`YlIo{Wc2n^xP=`6X*}Vx#Z-M~zu|)JHh%9aq@3vQsrGKKmUNy0v z|MjjMJ@`v6^KkJ1OdO?oZc6)b2-&)LxTPTB$?_>kUw+0&%K9lF(Tt^M3uE%fYC98{ z&?t0FR+MzB@hY*Xg$-w{FR2ianb!Crr@L40xN!8Kc;@8p`MvKBR;%OM%XMmc%X+FO zV8;o4n#>}-slLzW-(z&w*T?){!USbAln*~FM&QVUY!ry$;YW|pQ{Rcg$n17ih>46Z z2vTmavt>P&U8Y%Dz*I=86I@|ju9aR?4}Rco)h`3VXZpLr)pj!0MK=%$FN6#D;jtUT zesbUU#)AeJuZc*s*QssmjfB%K_4tFzV;|k9AsBm_>%_QgwqiIL?z-03$nDIu{E;)k zqVttSKgQi`i?}S064-x9thZ;PwXNq}>RUHpKJO~+5xucktoRAyqi-x@LwiN#HmK|k zB9TcUAMesOe!4|)6XKe5iiv65HH*j?`EB} z#nX!aIO8J~5_J*mx0q3sWqd1 z%G1_E9=SK2)C42e{^FYdyN|IU*WqXZ7aNYik6p+eW05i83T61W_1pE6e|6uDp0(Jo zj`mr<9k6YIwTCE$-bpYq;qv#sNehZ1W+C}+&h@-R@9y~q^Isjd&Jf29$s(m50_rIe zqkP2+l_BBothE>={T4+-$nw=uG>FtDiAc1*{TRzdxv<$9N`J1e4KU0;a1%+#Jo@%l zLtfv$dUv7{2xBRksqyg#RNd)V#BFdLb#L&cqw(LqVjvPMjvM+0G@Sii{Ob(bbDKo` z$jRRLnAV#hvUM9N0Z)9tDDw*2$R@!VKhOb)>zcI8H)|O4mfYWFo zzk|K+`uc8qB{xhYM8+(|MbuJBMz!J(qFs>{Hy4}`>_JTzwpKa7ZG&^xFWf<$E0H2- z85`=wWh)lkY{hLuf(hq=Ki}i~E#eEY0Uij=-{WTP$bM)a3o?p3ht!T9uG+_db9e^h zr+Ja(0__-6vS>!iQjF{MppW}Dp8Ztm4(y+jWi1))9lCS?Up~5#Qyc;i)N?5Gf@1`D zo9FAmK{R!+Dxk4$OA4LDzy@K6*O3H(!Sv^53Wp{Nh-HuY!u+`cV{H{h>X>nViC7Lw z1l1}dSsuEtUjL@gbRMO9E^e<@jL840GqaPlzpx0+OJBb1HH6@+{A6z=G%~p(djnL7 zMZh;>V9q;MbAQ4fMb|$VcsnT!THJH?R>4p)krW{L&iAJSxr5U5!_-#@fZMCu6g}Lc zuOi$T>_XI`u>)qY$ydtHtTd@-i*rzjQK@S=@^LWh>GXIp(lYF{LK8t*0B?bG@JMT{ zJ22SBN9lJxj=1S;RSgIQNG@TQHQV4b$tsVA2gmX>Ga`HS9%rX>5)LZMZGeV$dOJEvItvOSHCyo3Qc zKXyaD;j}am+7%-pi%ABGQ6w(?HNV^MIC0M@$L|@n-TVo$muj zZjBCsKGiDyr%dPu*j=1PkB0G8x5h5dl~?M+v0zy(+U&V=7VMGRp1x64v9c%KaY{ny zrg+}=*cgD+oW4dSrP?xnL6?)iDqM>he%U}CBMTGPk-7B!q{6I@VwOwlfhEKavS-bUy9%yM+;%Yrz7Z55DKLGKvJV*_Z0T zxcyaIDuk3~EYY;EU={~KJ$fZsIk$T>K7?$MR9d}AsT~A5#skX+jy2l}#97b7<@iXM ze=bF9VvUsrRV!X0-8b(l1p&6Bcy+zJ5cBh`?m8n8D&i7hBP@TGB6~XNO;pWrL{sU) z0eDBjkTZ)fR$Ja7o!T9KbK_!8jkxr^*90CVn7N60dYB{U|Ybc*^KVojg4V90ig&ij3 zrrx`F1^QoiVu}UX?rIl|>3sCmc5@e{fVOxI4ad*S?CvRZZ}-NnH%xyD?8eH`i?f0i zK|G_j+ZNJwI$d8GnXk(k*e6S%i%b{{X_BVRXUEwcUeO?5FxSG#Q-a}7U`<`_d8j3J zVIxW3S>MT`PBb+6_!0NnQS^DG|N7+mF?F=eYh-;H1k2X9(ul<~ zknkqDcy8qkd+&?S|!+`MHZng_bg^4fc+i(}8U(K~5PfXSWM8|)EMg>d>&h9$${N>g0G2}!qcb7Ps2 zq$zikivPComLpVb^6u?ru(wW=!Z>Wvvt1gh`)zS!??v-R7|LjkByA|8+xfeJQ`iw& zI(L*@=3F0jq67=69#+Vj>X*b)1ZCKxV)I=hxV~EKl619sTJE&w`-{z45T~tnPniXU zhZ5DV*r{a;Bzsxt{adc44gNO$VU-#%rN%PrV4y;UwVf~MZ#Q7@#(E`MrN&uPOexkz zDGxJ!_oLkAHq?vt&tO{<%N9T8!U8#@nXJ?b4Y0hzK5aVNceC{1`zm9Yne!R5lF4E0 z>3qAf>dq)O=15-uk@w*i>=rap8>RMWSi*uRKdM9|y|dc&8}atoI$)>fzU{1oBfWNlv&=%`3r5Y zZVoWa`h5o33vS!Z&f85=zfP|Z?aSzP*bxyjIWsegX>Gyv^=!aMG0Y9L_?`QU*B7`K z?lmJ&;kX8Os-r0z1Rqkg>3$@#wb7GF4oc<123mreJ#4SAK&@Y9^rbJ1o;RNjN3P{t z^F*8N<^yJoZAE@#!-;!JZ2gUp%^&W-L5*c#(BjzP>WQhw@__w~=)C)VYVpWEs#K0nY25y%ro*B&ytR`DU@zID6hYdsbpbv9b z>_ynq?S*Q)dP65$h~e9I*s;0~*3P3b61ApU!*fMdp3<^NubmcjqQ2pet>O(n<}7jh zep*C2j?z~7`)Ph+Ec4SI#WnW9^@H!H_Khoz#AUox_T>R>L;diP)7XYZZn6eqxYo38 z%N!Tf4husQF)}8!_7uMxS!W0i22xd25?gqHPydqq9=^vo8%A@e)iOr6~v!cVORC;@1zjKPo zI;kOBs1Fx7v>9WslHM-aMdYvs)4${cd&i^t9cyVBlm=tAyxJopGZ0xLs9Fy;BMMFS zQcd(43yp+lzvni`BP75p&%*=`k{M}p(6s=M5Q~My4|;!YIi9&&;Z&tlg%r{fX8e@6r;e##?;O0=KcFl&8Ki z`^<1jf30b~*&MvXjqhe-Im0Q_1_|dVP8R9txFT_T%+wl5=aOZ~n6g1{wH*vz1v_ zIKRA`nB-~Gvo(RIYj?3c6XDXyiGc|ygBE+ zJ%mKISSk(hz}X#FySVJczemES98m?*5TY+bx%ZFxO<(nQdWFJm2MonXttNR}^rJ5Y z)ab7BsjhfDX=O9&cK1Shl_#CLViNb=LK{Q>;%bQ2a5JTrQlv7>L*58L>p8{f4lp_k zm2Orn{L1|v5*>z1QcoVXxFMa~O4PMtWx4j8_7?_sMCvq-K1k!#!;5}UDcrIgG$Fuc zLg4?~{~PfJ!3>G~qlHv+cn=$s8}MdV)x-$|e!5ny{^<$4@frGDj73}|o=_@Gk*LfB zx(55*??$o1;%BA9QV3bN;uqcbpd)V&?t$~ucXmE|bQ&)}pp$-5Y=VaXhdm7pHjWTmk=OoaryDg#3wyHNQFi&&9vrIKGM z|6TuBL4POsNIhokbU(Xo>QUtdQi zOqiE%Ys+r%n^Jkz%X_5&N7TNjFrEGjU_C9qcU0bDpoP6sQ4{D|MI5Ix_(;kTc~qc0 zXJz;cD$OvX;FR7jZ)0v8TaCSXBwo1FhC=>11b5y43#0Xn8j>PU9L4YH&Lq;dC}?&r z4lL)g8lrP%jFI>%Yes~~74E?o&!smGvAu!x>CK+p#k*_=Z_Nj*4^ka&qkP8ub+S2@ zovA}o&T%xyw_Jw&yCXh^WDCXrA`4cxt{H7#RkiWz1VA*_r6e*U&HX|7KAnf-T(~@| z-r}Kiv&;jrQcCf=VVv*LqTUMSZs_C3(Zw#enW6NZAx`)Zf8?yu=Sl4&3w!d*F~1*6 zL`XhVgce{5DfVvl6bBsb8wZbiA^i(4=Yk;m0QKcnp^~`I5K(q0dYHXK?O}|~1d6BS zkbc`jCHN*O)sV=94~N%q7{D|efJR7r?9bW1bnpBA`f8&6Pnjz!6GxG%0fx%Ju9(5y zo?R2JN_NNV(#y5nzwOJECi0l{=10Cmq>;VTR3BiruqKk^)VD)NxHOtD+OGB%M@yH? z(WA{R>qv)gBN0@1YFk_%y+_;hL-Tw-W}AM`s4fH)NFbbQjdw_RurU%# z>FB;1l4B|-#J3)u7**ny$hz0-;OWnY9CqK;-j}`W zz$NlbnB>?+aF61UlPC-OwK*45N;Z|bT%=yL^`1N?gU7wlSAVU$LRU^Lb>5Ic;^Zrv z*+_)PV!%Y_DotgXVwJPN*#4)Ezz_{{@;(V*s*zoX-d1u?tB=p5sx7A!X7 zctzGMHn}#v7s4LBrclNIN%{4&U9JYDZ%7`O<9ru%_LQe6Uu|y|bPn?p@Dj82=OjZ3 zvB!y6Q*ya^Ij6$DRR1wgXBexSpbv+syC!afTTu5d0b}={{vL*R;fX=~f#NzElTXqC z(b$=H%j9}Xv(?F08? zuu6NnBRdnT0TYBZA3^b$a6N6BI|XPNo#+F=5t|rDaPt%rNh9X;xaZi$4Z7T+Oc(aE z2*jyn*_KR!FM($LDb4mn)a%Q#LECu2#`+-eRqdhR5kQC;#xw8V+$Nh1 z&z@V|HPuXlsS?9CNp0u@6%i#bRW~HJJqM$dgE{X!9jb@+8a%}&Iu*zce^uQIPLXef zV5yBNT7v?qCw(1M0c`05=1n;>7|eAndwKK9OwcWpQ*QInLQ?F2Dah+lFa-G=3WI0# z^VH(=Q4Uf>S`}|m1gcEwVc~3raN#U;s=!$5!F_8Q6Rm1%vf0wlwo>5uX-%c@3CMQ= z+!cWr79R+_tHO(>yZTGxtcH#F= z{(UGm2QKk!!Lx8G@t9_Ds^4;HPQ583g&5$t`S^@;B8aKUq#pu?I4f5!Ky@oMzM>RR zPHNfRu@0Cph3np;279?Q9FFwE9#f)8LDQhxx&E&SdEENcI z6=9DV==Dk3h_JV=$06}=GNt=m3@HICYR;o+_C)z7lfo+L!cWvUb8#f&IbeN6qNs(+ zNH^*e5xY&1s(@F1gAClg^r=8l4=zxqK==eS3uwDg{4qQMP6#YG5%>cWU{gt_rEbf> z&@3GOqfR%L_{Tv}`QA}o>8zQ>=ljW{+hun4jGW$w(LO?c8*(}exSYo=?lm(eSe5GF z8I$fD%9b{=RT}E6&GbcsA6x8y7UB=d7|_C*L>RWV10)E|3TDmL!M*c_^|hzK$Qm(< zZmY(8{u@ZH?u~67jXV_IvA!B>7Ifhf_3M{TZCXJiDvzo_gMXUZiK{=v6%$^&y9C$z(z<7wz%&yIv4{ADP0Fjbmye zPEoxkzN!o7y2nb^i4ElKB(Vp3vh8u6TUf*jAsN}RFe8MM;&*bmh>iRXvKrnuW=zMa>T3|tjW$RH9HMJ*LwFaQF|sPmIJae?G)Wt?*?$v@Q81a1BZ)+p%UjA*4Br6bJ_U+8c|LPUk0{Z8)xs zb*uZ|i9z?EP0seej0Om8x&wlcK%=WhOc;vt`9_Rb8VeegFYfubf927R32?H5Try|O z2;`#p4Q8q?(=ZV$iH%; zvv>phNhxWNO6p$MhV%)$`5$EG;963YH2r%u&4Tvrj_P zenMzjpl;3M79&nO!w-Y^|2$ey(9)B?X*Z!{laOFO8C|@RQB~KKyDdp0X#10IuhDLJ z(zSKrLFJw+bKAuJo5KiG6#8aKDz8^hRw^S8R?nGo9@!jUtqI6jmQF(wigVV%R z!E6Odq*-ltJI|Vb5udKF=0QTaejgo~a+ZB~%H<>9p*sufIbUBCZm`=lUj>UE2Ki2? z$w2G7JpH+TEV_CaBHE@*C~NvYidh9#NVEQgKT~L(ZX8FZ$MVaR_fqS!)73t@P5x82 ze&Ome4724W(DZgb8UEUB#tctVyGmtiA+2ZsOM0X*i!vPV_mrwyK^(zjJXm9<-b`i& zJGp`u+7o5VmSOHXe?K|4UqgW9EY*s|0XO%qzaP3Vhl<{wPCkNKp)BP9qn`z|4GR$e zQ-Heu&v#PgQbGqw6Y@*j%8D(@qKY*uOY~@wiLJF!Md%-w)SMx}o#n#~5uE75i&zEQT3l)!`)UYm11sz6~@r{Q{g4U_QB+M7K^R!w)ICEhD8b#%c zka)oE?Vnb?vb+b+(7 zX5z1{%PihMP3u{*z>TwAdABoYen8n)v z%R5|}b9K35E>9|%;G1XS`^1Ehg5#?x!}#dc`EZSQ<7YD{9L=epVMSNj4TUnky}lch z;m1wsk1kAMzrN7e$wuX9DH+N<>E<94?+VD`PDn(Q}Q;dW_oCkFlM&x#Sb>?@6J|W6z)%c z)&<(QgnE5fL}KVDmj@e(7N+@*lePJ?50(SLV#62IQo1o}vEcaMNRo{ZM5<7SzhrI` z7?>8lvO$ja%3U>1Wk&mEmde$j_1W1(D5E@@bCFm8_d*p({D?%MMl0*&^G+X*D6&(k zJ7M9LkfD=F1Gon-ngb=P{n$HsV({2oprzHwURA#B2sSW|Ml$o#WFot5vbMpHCW1NL zH7DoihY>@&|K#kEtHGM3#i7{zU@(Lg6diTBD7iv4P)tUfC(re0>L@jZa%k8S%XUw= z6)(5hmtKj18Gsd`4T8s-ta!-ENV1{gM5PicxeTj+LHFz9JkhDfYT@|DGusRWr6}hZ zA~D~hokv}CpivcQwm?AA>HHu-Jxu4mD;+*obMeW4$*ivbooT>^NxGLRo(-}U)N~}T%To2KvXL}$<-U%IWh+uc}RuJA|i+1ps5D(L42ZDy?E0eRO`0=XbtJP!d67E1J=HmU8ZS>YC!IuxMLu3t&-GPJjX!zz%qVUkWq@W zuSf%BE-rjz{|eB%|5b8pdV z7c!*;|Bp#4hV{w*BCXr;V<#;(stC0Ww2{EBK3z06+s}~KWFyi9{u;Kc&uA}nASH+^ znMYSRprovG1mNX}LEE;>nVx}X$ibY&A$N zn`^2an)6aqc^%h8kL+nP=SjR2$~&n}06n(EDgrZ#BQd6wTHtQ)CxtDBd-oBN*(!Aj zp%GJz(Nd9*cd83z38OTm#YJkK)^EQJ>pwhM87$sC8B6u#%72{fKsz&2`~rL4zc=+2 z<1d}_m4##WDdzUkq50X5)0F3?Pu6g0VA&??fVfHx6+ah24A0X6rPlfHFg{~+-yNuF z#kzG{#%m4QPxi{EIVMY>$)R=jnR};)CG&rhj+2ol=RlGXpO0qhmwlhE9jL<=mgNLEk;t`4Ts;$3Ft?9>@-u*ob5t@zG!SzKM7 zy_iwdvnAraeTL^3Y2gVnOr(dqyE_Jt0vY;l$?a99a`kPx-1s&3&9?0NTv-(EUY!~l z=6Y#|Py>|y$noI4MI^cnqT}nll#UHn9jWmSZZKe#GNJ?krjf29M{K%<7uKb!FWr6|&!M8^f?{w6vH7pN?D zNnG7@*GgElp@x4^>v8~IzD05Wfl{vpUVJX&EfEX-i!0Mx#IdN7zr|oF{YxPgINE$N zY)zQ)V~DO~FWmGCSTb+DRgkX1E-95R*nopG_=JBz8bq9X7mX0)CwH*==9B ztX17nDIlDfV5KvWP&(;fY(@7toDAQ)RMs-+ytSaRa)q?jj-@yu{9VL*NHItSo}J=^ z7l2fd%t4A-;IlbIndeFw;xX-q`KtIx)VaAEH$S;i!{qSg*cww_y#eX)LL~)gCwH>B z6S5S^YBcZ15^xqsgt_U&WIJ6OcZiUOxzQPFr~9=C)C(g3f~dgFbdN6Q*2*MyIGA-= zrdy@gJzi2xgdEF?XlugQom#ODc}>UV*J1=;iqByutfS2IX>KE1x0nAqB8GP#7yBr# zyLCd-6qxkU`OJHgHI3p#d4nE54Xwg5lj1vFr@SJI?;M3v@oI*uve8JovaYGVne9;q zlW&N#A6lKznlZsJO51$#G-TUqZZxQ|7CW)vnc3jG=^H~q{F0#< zr2f!-qzgzHCx>nXXTt`wn&y^}3h%7K*U<_t9rjTn z)=#_S9e*_$x3dCRaEEFiec%o;?0UCCF~vXdu`rm^ zVe2{pDF=6pjTww6$%43`2fDHYxcdT`%T?gz-R2GgQ(@?3_AvqSs@I_`PGd4dWg`oQ zyo!*dKa>4+5Y|x9HMkpEuY)AJE%SBN;1=V1Mu|eI5S7M-KYtfrqRUeSoh(t`y@ex&_KMGH`Fdr*!{168AVzwcJ;}i?2HB9)#|!u z9mQQE*CMyNzk`uK`t4T?C=-SX0BD(pYGA!VVYoxOVBM*Hw%XIn^^Q5=C0<@CFg=5^ ziie_efd{e;d22rDqu88k)Lg*+eO9LXaLW(Y_HW*uuf>fvwK$le8BND+kDBL^7EG&2 zvuO!q<%d?tJrs!weCR{;^Cl+Cz9P&{6-zSQH$anUAk#nN*JUPa?uttl;fX#8?xr@K zc<-v``@Fv`<)txg$)#mk%0z`+NPrP%4yjXo>cGkTAjVgeef?8N;MIfU{CGprrxeYY z4QH2?kt;%$y`suSakdto;mrs<#^USQj3%5SKXfZC%w8T{4wSVDf|;od^opb(^}PwL z&4uQ9g0AF6n}`$g=))9ydaMq~T0l^UvGa zYncguAUHUys~*aAW=@))Uta?t+28k9C`Xv_1KRDjwb^tG*H4@*XinVg4sncu{o@4a zg()6ZJNK&wV)OY5kKA#d7^fO*AN2$9%mpJ1f){8>FC&t;Xghj(>HIB8;SqSP78NjaVH-` z^oAGVepyjUp^NcXTRgG!<#vR<(W8e<#_9f~e_Bm$W!D&G^}LT_Y?dI!7TYN?!V#qy zzH7U>3jvZToGnswZc6%!h95gPWEfQ`{9bYYITMeJIQw6o&NR2>2wTv`?7)b7h&+v; zOiy~@K5Qdl&qh*Uo6m@lM!T&xy{fc@&q!bW!T2D$&%&^KggZyDX}HmQ(Np~BPgywi zZE>7kK3o$hK73BlRa=;_5l_y%1w2pXh;jt@7k+EP~6zPzWF^oU#8rZsV> zgcwCzfJxU=xRxe8RpeV1-`ql$bL7=j9lsDi8}(JR9x_H1=gy}ab)?dP?@58WR8>jF zZD>b*{{Y%?IW?Ed5?78&1HqnoTmzg?rk zb65-GI@H&KKd^ISI!#& zx48UlBEgYBLS0J9bbp($9)#OIwvarwiRhG>cwI6k{Xyw(!#fU2OZya#1KD(+;Nq)( zj!rnK3gFrdaq~qIQ8mmGn{BUvd;c3c*U++L=d&p%s|>h;eLGgQ0#Lo4*fS|$ z8RQlB87Wt6#qdJgW)yuHakbF*QA(|(1EyEfqS8Gwf~Ychss7Z=`&j*0s%>+r!ILSb?ez|*B>68{Asn)UVkJn&E>ct zdgLvCd(!uH2;hdx!C^~I;rQF>#OF^pxySfHmT3)lQdw1QWXn(;a?`qOckZ767n+(% z`$=H(ub8K8Z&f0+4Viv@)9milEbG-}LU;@i-=;)?)&FduFeQcBINPb>K<6B$b10^; zEHhxogaqK7?u&FBs^e+lvx-5IR$&&1gDp-fROFh1z;nn^DUv8Nh5e>C?Sz`^|8H(L zLb~4-NiJ}{^o#$Y%YLY;`Xc0!+W3IRWH(NbXoT3jbL;%qS#w7#r2_*Pn`1HD0k7Bk zhds^VJsk+))|!Sam!zf42$pYYP{t*&~a~I4KDE7unk3nj>1#^oxtM zQY@7Qw@_J`_YAW&syOKiK7{iStPhQvZ>1y+`37T3S zb%5f3)WxhD>p1w1hw(pfXZs%rhK@fA0!(VSi=aaqK{8#=o0{ZAAvyD8zU#5B!}WC0 z3%~f6lgVwT95g+M=`zVb9cA3(JE{>Mf%Hh4>hn9}@^EcdnqV3$q!fyb=RlELN70kX zCU_KmTcW3w-L1tcC1G#d#vtu^ek$t<0`G7lRBUd_>Ylx>b|XN(=KPEXU>)yQ%y-WX zHo@YVW`aEboy%3FGw8xN{mLS2@`qu zd;i#;UDvMXJm;L9bD!`1y+4c9(@`TMW+Dav0Aw2KDj)y==NIPlYeIa?`)NIy5#~bV zscz;20FY4s_re0?|YAKPtn3>9MlejRQ>DBwk4Vj}pMdsc&< zk4C~4+cxKw;9y`jqiFaGitWp30H7#^7Bkw*`+!;U+Syr&q*ihpfulbB2M#;Coqv0< zZ=SCJfFHi0bN~2-nwY|5@x$EyedRjCeP>Nl2xKN?42OB_(|tbhec z5vZ^NlsJb6l_-^n--fYxzu~ElP~wiBsb}SV zBeeL6^+mt_yXY^T85nIbz55RLd7-K{2)7T%~Yzew7m z+)*LP6s7u=CB!TO%#Af?gQQcI_RA*Vef{lgq#iLas zNg|vm{lVuPUn(@4pLIUE9cHi-6^Sub=YI;P`b;fE3HhWvEXhd~t1SAwBN5T9rW~&zcTlQI@8lH6RU4s8VRJ+_}TczKknx54(*EVGViiqSPrbAq4iS>O zJo7R%Zj5qnFQs*KDG({JkE^uMVc_ej*9mgkrCyzVkXhm$Lg0iRnw zS9AP4inmFgy;6qSrrT!zh)U_0lPg(LO;n{w za2mDT;oNZ>bsH^thX0KHnWpxU_E`={yQ7S!Ojb))YiwqE=IabRTRc}@1R;vdMdl)M zx7yyA2blA>RAwcj$c4`BngT z9IF4_I?-C$##q0%jK5af>ed=!>u5*s*fvr-boQm^OGsx(;=McpSly<>+@xMhFAfF0>g;Gpv5cO?P|0!xh6Vu+e{lg4z3$UdpW5-!!hADkcnG_H-3^_!;V5`&8Eyck$=<+J%E2Fu-&(f9||RX{xRmGN%YGk&rhaIb0V4I z{&VZfK3ghxDj6!9xsD>b(scqrabATgL1(#D$<7y@FGmF(%%+!2^G!8eHCdzud21!y zU3<6wo?gcM%>PNU1EJ3n8n^NcES?>_`dCg^DM-aHlkrOHla5r{FGWh;3c3WY3u=F^ zB;vq9)sC#AE~X-XiXCVR@42SYG>(2 zIj_Jq;vHH%zG!3oYPt5fR$jLy-EXHRnYE!k&w{jF!mS4;BL-TqT#iYMi1$8*9Iqoz zt#nO=%(hx=@1paW6=-AQYH8N!Gig68bFT;NF~@jJ_GPc9HCKKc?syAxn0Gkb-xMgY zAkV1E+|ML;CtF!dEY0aV=b+0hdyJm!Cq`l;@WRKQBH=$nE##SBv$w0eV)#$i+ zosQwmwl27a)@$GfK=G{rS{WC2;o;MYM%_ zOeVAXJ^@nwgJ9vwdsatQA!ntWiyYNlgB-Mlokgeaw89+xXfx=q+S(I}yccq2fxt_{ z38&S=h=nhX7qEo<^!$)e!Q1sWYhPO-Nbu~IGlj=_C#CO?`PUEeNZD@LS<8!d-;2hz zJ!+G7lbkvk8@D6hBe{QH7IeqD^15{Qo^|MRn&ZryI1t5>IrE6N)&OD`?{tuLRie{k;iFS?vt zS3}`{jD-D5x&BO{jQ2VF^Helh^l^cdg0%F{m)`e>f6J9&Z(+|0=>L8FH&shdClvZ; z=@>CPmo-ShqGhIQqDEB0x;U`pOu6I^e(V&w5_6MWMSJ%=Ur% z;oWV+wZZpt^cTi2UmkFAvM&FE#RS$cdXo*T4$=kyg17*Hut)&l_5pJ}1OWVm0f3`7 z0Dw#u06_1NYBQn=0Ej-u(b*uo`qwtU=CobxCH8z4J!caA zwIn=ET|>vUNY4n#*(#p$S1S1A-~IWAzG&Mp#AHZrgv zv+z2kFW8~LQHq6JIB93i@v2AZ19(&I0aAe6vpU(j9c5yIAp8bUo*|MFnY~-bg$4+Y zy$x=kH?uf58&ZO3vpNI`rv2k<;<24am?mu*LQkKcu#}xVPTmTYreEkH_j@^HK9d!Q$u>S9M{SoG?;PVR@ zOz0u_<_5L}Lmc}Nggpny0p8$;-ChUHJV17j@c?(ao_Ti<4|j+@y)Sjvb@XzNKX1?2 zsU{!$*CD1loSNrX&rwBbK{%Xumv@f)`*8w!WW87Sc9SA6M)QV#8vJW`0JGw;_rJ#T ztwg1YN(6%?5x|E)xyPO|`56ygHzcY*R$;pgxjnOKUR?!sWHT&aaeFJP9nTv5qr7a# zj3d+J)yPUn{)NIaO6Zh(C~W(?sntcHU9tgLFb__o%VzKe>(eiwd_T*bi<%x77PZgx zpUo8SUT;>xnAsJ>a^B_j2dt(Gv^o4*EIL%8cA%(EylpL}iE zug5YBV~=jo@+a?Qn-kluL_6D}$gd{a;c#Y%wcUHB@*Os#zR@$~dj*6nXrJfmp2jSy z$8h@3Md0rSed!t&ZM=@P(>FQK&T-eyx5a)b7kFR#x9XK)e={t3PFD;Re3uHwqDe6698)TDjmyc^bg(=**g^`^@vU*I_TKTJWY82I{eg?FSDSZp?)!B zqS&Qg)$5(MaFW7(2WHcRYzfWY(d=xlpNDJ>h4#e^{iv5BxPs{CALPpIV^yV|e4_BQN586uLtwtH_-H$;L2Z+jL5JSct*tk2Z1bz3$e5hR zg?9>;PJh-L2k;U!r$Z*qV^~h+kLl-2SnMTxo1h3a*@&6x=S`eK5;m1i8%$9-km0}7 z7BJ)ay#|-bl=}+B?p~WMlunTwtdQ~T{8oM$(WqCH7mEftR;U>%7Nrl7)E$Pq5-TizPn)XU~3u zr-2w*aLN`_9Ov#QOmIm9d3IQC2le#wEGMh=;ccgztL3MfKP8F=p?uHGN;0m}dQXEzTvDx=(J<3na9lWrc`=VUTBZ6x>w(Xpbemd^|88%8i_Wf9+A)Ox_~t)` z?Isvb(^V++l+CYKn#RqU$tm{A8wYL3d1qGCQbhY^OoWTFaURQmC`g9EQ?MM7O0`Ym_H|SvXt>K4t0fx!^8r z;jecPDnfmGyu)qCsl*KWkKTJ(^7q&Jw@e(>gPj$_%2X!}NNe<}J|q~Hae6kBVY>-C z{c?xbe9U{%is~6v=x=3BkZv-^;x@F#s-81isJu#SiFRSWEN7;usa2bfJ#(33!uBup zbhpd~6<-KdwulT=<}*@aU**lR0VNYtgSl3Xg%vw`k?w7f`0nGa!;HyAiQX+X5()XM zp3By7)XivJeb^j5qxc60UaI>xx@2kmp1SDeo2m@MJgPwn$)htL%i;Z~LAk=JZE(!6 zah5~?0YEBW$FplA;{h$V$6&mfI!JlU+3=w2<~81-3*I$al;-353nIb+UxRs)YUn_0 z(&&D$G-3OEw2ytNis1{jzS1%_AIH?)N#T>8dR+TF(i<)d?dBs~4^`*t^VPqPMFGJ>ppdoZW3=5tPML&u|V54^M*l}{E}z~%nNQ4-1+|6psr9nRHiluTxs#@+Y z1&9aRbSg`&xJnkK(Tkb9PoCqJsDhz-6Y?;I4;@goSfx5 zD8|=1h3Kw_M1u`DLOK|qupED#@UY^!bitb_4DecZV381qvT&k$q&1#MBFB(t$82FJ z#&GoJ zF9n}n%>?+u!dGA$XU}yt&PiKp;_=Ka`fF5g4%#yebmT^IYTx>Oy7>87Nmm+id;s(qv zxs7DI!(peXa*~C54s3hVn}T`Mp4VUePX*{rbz>*TqzJD3v5K>cf!K|d-Nb`rT zb2L<7{e?Cr;&ulErFT}si2L%KiCoKii!Si~_qj&aDsv372JU zEB?Y(aqO9;n!KV&@S3*mcO(Gbo59U)OXZ!ACi>mAkzp-)j#JDEG4MMe3L`*=gp-LV z5WW@Kn}n{%5>B=V@73d+a6+}_2?P`G9;>%StbU@$ne{w0Oadiuz|x#2za%p2sC6$M zbK>Hc$a#}I^TW=;Qa@pZvVC;6hH<6M?YRlXl^#CVHNVgDlU}w_jCcm^`|Vn-(bjhG z60w>4;I9A2Qw-EI!LJGEIJ*Ls=7skw#hzySV3u+ppd1 zO*-9JpyjgHj?$`AOn~ZdRyopz7+taFef!#+p4o=Hg2!#V<7l(8^3o+fZco*;^~LoC z(x+>3CPw4N{3{>+>oE-mrLE=8IoyjoN6d|vw<;^ZMVUa0woc%j<(AKNHcFaUsnZJR z5xu#Q(5bs{r7HO66p~D=1wOt%d_VTSX3I8ZPzttms}WRd2qY`Gl@(YQ4}jJDn8C8` zunrLnW9_6!2luyCf;4_PU;DOwI1?oo59r%)$0#m3-Oj0BW|5S?rTbmWUjxm;c9~j@ zpB%V2nJA}x_#(1x@D|$S=Uk%;bQ#F=|2^Yz7;@~)*u}WyeKB3F;VCJ zsjra25L|Mxd_pmKeg#Vd32RfIpdibq?>)5sD%{#RuvfEh+#2*VIr6+cyYvoV?Zr~5 z^E%)6l^k~in^gII9RxViA1uycZy5OWZ7C!CJPO_x&QUwtC~2gVLsNVhs15D9O&|Q+ zBVpY_(Tine?6f(W_i8+NFeG)-*v_Do$7hZ5!P{{*^Vr9B78j*qDD!ie{`vAnkSqPC zg7TJXtQe5{Uf%A3GSO{w{*Z9kix2K9@P_RwNz&JBzBX;3L-e?9v0q&c40PqTcpK z%eiY~?U4U#zJEt^OyGH_OaPFCWJ|V_gTIB8zL%y*vJMGtxq8x%3eo0GHPb}x0V)}4_~8z@n*!K zU9$rLzywJ&3FGEcsBCoyGU`pT@bNF#)5e@#E09J?Ug#YDPRiCR>>qio8u#;S#9-Ef zA~4Iq

    &OT)p0JGFIM$LLAf1A}@bVNKWJ_Mfuk-W-NxlzozgT9W_|FVb8SG!OTbX z?pQ^l)m$2{7KEz7GuD!Y zb*`P}ZOe1je2^tM1&r!4SqQ?H;U8Gf3**EL1YaitUKYaey3gNt?T$mV^z|gf{LQ_N ze5|$`4K+(zN+XJpJ)y|4Bcdi0gk`p?SSzpIn=bAuMb{QCw7VR z9a5DVKxJ~&r;1Dsy>UeSZfdNQ_7+IYZF066&P!e*!8zrvmGM|1=#?9PEh_0QQa0R! z5T431>JM#e127mx!VbgCU%rqs=^M2f|8)@Zc3*%l(W+^vc&}%H7b1rYF?wgPLNQ-y zx$t5@DrqjqKY{W>1h1^L1Fb;MM^FS1K0>QAg`_njK+*3G@?9m?Y#H7ZIJR2~{tD`$ zqv`_TyJ;w|TYsiH{o39SblJ{tEO3$dX)aFcBD(NlFmEZRPH*+EG0Fm7RGQ(lBENPj z;bC5w6~tw1Bk1(0)A`bB#aBW2$(J=5d+SKl_e+GO``lnhnxOpd?&dE)>vvYqs-gFn zZBn7ayTz7$ux#0n@}}>1O#h(hD*04v2+TnKihOkPiBOMybXT9FlsWYnypk_wjo>vo%yH#Gc`_RwV zbujuCzHLu$d}Ozc2VT#42##HFfFD zF&U$(=^JH{vigJu=*oaW)__eNeICrQeZ!q30O@)-zY2Z&Oz>APK6`pjkVV8RRS;Hn zhc94)79G4Xs_xTc)2Aszm&&q zp<-M9#`SX3p{AR4qpU2=fVG`L_+9y3*G&c4&vK`T!onwdz~aW=AX%5vBY4dz6Re|h zui4YyRUNLF>6_E~GhjtMz22m?!%+{rF2x>`Z6Eg8`FE9`QFPRm*pN!W1IY?Agv^;fz!{yykx2)wX@J= z=@MKxv+{V<-tyykK|5(x25BP$$yFQo5}efDm82*~HDAD@QXjkaa$u>7e5%eMmvA~m zgUabtVdHIttpV&v(}&4xN>+=G9hwN*!Wc$(M!gz`joWei;HhPJJ%YQjkT{2H*G(gv zx{JW^D2T5ICaDIx@8D~|?>VPus`$J^7&C+g0Gy#9o;zrAC0=1ZJUQ>p3FEN&oq4tZ zvfQl}6ZbY|%!0{62F6mg=kd1O#4L&xz>uTSz4O|YA%o12@`>gxicy^lSs|g3e>&5)aCg@mgT5y(Um(Ifn>pZfjrN%} zx3uKGT)X10B$0JCDBT$B+;7 zB%MM%vd}YX>hSl_G8Ze?h_{8+6g@&8_Y~5LG~43V&QTZnR`+Mtc*<{VZA3^} zn&s0LeubuuHC5M!J3-8lE!O!Bd)ZDV+CyCEX55E25; z-Qe&2MyMc+)YBxk;o1KM!k!?I5ax6dxQZfA#B*UwKS1k*Jae3MBpKBr#>)PTE{XnI zB*kJSs>^FYa10=1Ok8&h^M0GGg35p=@}FI_=QSOJLy(-5(}}8GVZpNyeZtpZ$7#Gx z9xTd}0{@i5^mmnaMBBFpVb;8isPfs@Kvg~7Z=p5h1kf#Q=e)_#@&9|biaggO-RPqh zZhXLvk13rWDck-p_z{W-v#k;gcyah|6k0wulCT_f%$NEp{CXV!taaIC8S!;gEoY&V zDhax3mru#{6$1U*pGwY&$o7Cfzb|JB$kRWYx8&mi^UoC*mo_<)p?PT4GhWNvElWY?~$}N0p<}wRz)#rxj@cvZGCozdlTQM4SXJn}g zEXVh>tp3H+eU5@KjEOi2ly4O=#iRJi84-|_+lF}!d_6hKFy11 zM`4@)azM2@1T4yWu`eI;D6mj)_}}c`g#UaljMF$VTW%UJb%a9T=kzkVx~sSZ-x#R- zyP{1(ll$1WEKf8<{Jnx&}Ykc&)u^KUoy9{FFefI5eU46ulYqSIaD07N% z%AwQ!Mz#sdRYd|!$7n)Vn3t`CIWcXvmcieWl`pP->xRh8opQw;03AVEnVR<=Bf-{2& zkH~xPdTklDuY(5myu&dbU@}~zHU1k}(X_Pint=Dq_((2ETsm%K5w6sy*S~z$2wDv5 zx}Od8zc)^we$1PFs&{NHEfA)_+T8Xw;5JW`Avsfw-1+JWGcAR5%5+n0q-^I~b=@+Q&8( z4t?wTW}(;OnJoY7H`%;JKFHcEulT1Sh%j^BE+8lr9@)9bY97;)psW2F_ zd*G~O{-THWSK-cXl>j|Y`yn;(2(%kW7R+_6^-%+IkrL#|%3`50oaQ!*-!kx)yD<-2 z&cFbuoN@-*4zp9w-R?O@<8|Zo3wiuqO_=z;?lKm2>mdf=is`PU6LxiTJGpvYtAjhQ zH6%TpUhIE)ZI{77&?+0PGJ%cfsXn1L@hLK1k5smAaNFhPvBKn72m`9iGBD|DAQK1FLoRd9 zCjR?~{oA{QJ6i_2U$q85Ew8~K?9$SU#u9P`3F}yMzsewAB7B!wc*>$k+BD51qX%Eg zoj8g}2&>;hBuzwrOxJV@ln(%rjWaYbN{-)1pK~XiXCe2Fu$Z@9F3bS|PrDa%9=urS zXY;aVsD0jKETecBtt&6-oe_wy-2%5sTN$CO&Wak@xlD%_hG7;*J*ADi&X!faz<3zt z0Odzp`X>u@a%yH?YKnF*zZs!xX=692jbRV&ZINrI_~i>uht^>e``fL!H|e zDxHQiI!z95-NUJsItxRRN}{JKmwDsSZH(nCqMnI5^Xn+6%C7V(8Sr$)RO0P;7Sg?Z z|EV@q`1DvN(8}Q^SizPd8tSk){njTOu6L-ID8>Z7&G6*bZ+rx7Ttg%;)YMlX0?3~O zkW4N*Cbdj5y?9*_Xja3D*ZAd%%6MlAigcR4hwB&6{btVe>VS}0bI%EY2M3lR(W z0;@J_Gd}%G3x}?Gst=c_xe}vEZ3|Ffqyzv@*3zwvL>~C=aQL!DWBvPkiv#2dkbCR_ zcnsLY1_=IoOtRV@G^JVn(wLz1CSEr^y@e$S+W1E4BF&(@d2v*5f4dx4(FN;!i%PeZ zj7(cX?!|fN2l4s#{zi#SwR4r0kf;b0~{9XcRb3szccTA9vEgc_tY&mkOroLU;pA<7MmxX2X)n ziy~qS|FL8$c-n`g``+1+nikGVvylHn*nCh#_+dPs?cV|Y_n|fs*w5GnuTL^0u6VF` zs%CQ6E(G?4e>RGF1J%vtkpe4Jl|K3A`%PuHlLGXA(lpZhE(oU+Hd6udF(atN*&l>WFUR-Vs+>GB_1shjxWTOF^f^b-w1+u)Fk z7HRHZmjjQmt{KH@PIN0#$=yON1du9Qjo1rNKZhe-j8M(S5=Cf%Bc|w!nee7%k{ziC zkaO%P#)FZhgXB9r;UlXzxEE1LVR7W4Wl87Q)C|cq4hlsKKNf%~@>8$a$NQwC((+=& z8-E}U)=OPSb`1zsP>r={R=|LW$h}s6Hrx3#mY9I03up8i3-NJhJ-I^_xV8*z8suR& zrRSZ<=PE(iB9SJ0O>3db%|&ljWBhP;EcBn@*l7J_<mHo!rU2&Rd*IX`M;EH}D z;q_`~dIi~y{PT|nP+W?s^6RXOWG4mTICg2E8G*?yqu&Spn@Ync?@WF<_H7NpV4qDq zvh-E7qhynw$`$IiZ=HLDStBsO4}QaeA0L+-jdkX_@svQ4M;BZS+3{CQ5G^Jd-_=}O z9(J2|l5OZ%g6*lMt;rj*=HpJ{R8>s#jhzJgt=u)$FqNqgoBuU166+jLA22E&KymGS z9k_3CwBURuk~!bJhFqxx_HO>FVO*@C&MHktm(D^e-)Bqv=^2*ocyREcqnPgW_!dE> zmAN8(vh>m_20Y~2T8UB^Odw2G%*6xK_rjMSGBUgvER>J!#cD8pJ|>mwl1-XQN?1u; z40IO2W9~BXb~O;xTVg6fo4ayU-kW;=t(gvtW%|c-)7nU;KyMKsuoHoU+XvI&Wzp;I8S`>)dwQznE3N7 zao!b-tm3h zaD`uO(K+T?aYZ)~uuD=5?1KRp>ga?R>`F6Mkl_CH6UbKMT+X2BU$TC7uCFcot$g!7 z+)lfpz(fhIr=?35HB{$wpb7n?f%LVmHI$E*rZ!LO$#S-TP2mc0?Xk@N`6F=Z(=EK+ zbdVGNtJVNu!( z1m*T@O?WAsX>>j{_%fY%Uo%DScC>`{=kayK&TqoDwbN6_c{csd`)rTt{a&$b&xX>- zG!d_Sks~wi{3UiLxip36TYy^g&~o#rKps?VifcOdd5z4GLUFm+Qb3a5-Gs=Ev()3$ z-v=%^&oF&;jf!}-lK-zH&79-nQVvsyv3%8?uli)N{qoRO>kamC|Bq>h>)%|SHDLGb z1N_asUAx2TgVei5BS)MJRH-p6i0gFZ$BX3#=I3zWbKG5#7|!NTSyw0KbI-aQHdtcv zC0@eB@^s3fR(WSzM;u;0;p-V>UCYIb373L{c`RjMEi3Cux!d^$<>~&K7MYR$``R6-nd=mAH;aJJvKa6Sj$y|>5NGK*Yd^^m4! z9O?yqhyUBVu)4)S@@!X}K)3P(nZR6EiMI=0YYw&UR9xd%b~WS%fwa!l(?Ea(5TCSM zfqP|C*u*CN3{`N)N?iPo7t4x>Kks~aJPlIUtUOI z=6(Z77cF*!ud51s(Oi3zZl`t%Bwu*LW8<3H7)0hY$u=<+yoc$>AIM%CSJhRpGB!YD z_f<5dM}PRJ+uoT1Q6uS~H0V}~!v}kwUtB4`*++~I5+!qpbNS2)zphmqe}fOvuC$~B zIlgP9-)~X&+u94b3omFzEKkKs%#LTQFPO&BUw`+aZB0+4HE}reSs3)fC-%|CuX?a% z{-WRHt+q&URrn--;d+%V^dbx?F)r16er&;X#CO1f2XvxWtHByf?M_=xsPx+jI>P{U z{}+0PnZ<{3*zNNprI1YEbRiKOTrWr-8wurh_&RTB1oAlp)AUn9iXuxM%T3 z>xmyfPGGgQOzU@3tRr-Yd)ZrP-h`3W$ySg`~-Fy?8R5DlAbNDWw5G7)Dw^a3sXOS(bMvp9Dt5YQ z@XV|vie;aq2C!xW%;zQF$C<}?+dg>M*N>%BRGfE-Tuy+Ib0Bg`6XM+ab4=16+Bft& z;4j`P*KxBmQxT@(F-(}}oSasDnSNkkH8^1yWGNte?(ynGEFVXp#=|8gPF$L!oixxj z+bXf;tBim)Wt{<1v-gX~LsW0cZHRB;-_!T#k-#0F_9)lLj4K_|A|HaS3OOTj))sdZ$8tqxgq z4hg^jeHhvxv`;9?k7-;JP?H>PVLq4L;?)~i<@C;OR$C`cVu^jA10hoCS9!W#ff{g- z`7=vhKGt3Ow9MYVLv?8Cj6z%6CEb&10+^+1Rr z@a2cpynk2f9*JIF8Q^L!a_@XRo-Gq7L0n>j{z6Fo_Wc4{W6kyN4gQ>;4TjUzDW_g{ zZ)+<&z9c#@dryL9uUYotNXr(Q~y} z_dLho<561%6%bO>8iUThvPO*Ox*)yZ>*e#WNheMT^R7L-??7dKp7!)n3Eq^gN+TO| zN-Hm=(r8s0$Ey{8D%eUrw8x0(Lu2I3e?PR7J&m%Dn+|2yx!|Zq3NUokE6bqdprN@} zobaV!U7v~*{>NbQ>Sxs-EJsN7@vU+zH((-qA$j(|21<&M6`;CHa7evxZ4!|*Vp3nka3A3Y3vF_bSyRB58Q^p^M8X-lZMiF~gAT1@vD5Zy(QwRw>!kvTPJ#xYaCS zNMG;y4^OEu(Bz7)I9c$FxU~4$ z|5#$Af)E+FBb12PQL=B)%b6U+{N&rdQH9Q%F?A&?gTO>LTN^)f`qH3=F8$($(AS zL{ubH`SQB(K9r(sL$Kjb+VZ5O& zOF(38e!jvu*_G6d)x>Hx9RBH!kzT`aG6+8I{BA~SNJht{IhbF*O)xuLJ2pdoBJ9%~eoh)r2 zLem*2I>n0?9m`;HeUdEyrSX_N4nf%rumY!ZEDy`0d7WvGIg2e`NS_nGWgE<+ zopz39K%N>hB~?^S`7l!J6ej?Z(pa^EOiykdcC8?@$iN$_`bFUju7R#vgD<|n7VRE% zG}eYs^3As&fw|v|hk^FU5FJ)H2g9lFL$SZ>=vSw`Yg>t+K9+MCm_W@W zl>|g^d|>sjiz{@j#kl6cAPKD=-1^L{XlgF^PT}DtpnDEDQ^SOc!~DGjpz&HqrB>-p G#Qy-dy5|7^ diff --git a/web-app/images/buttons/button_default.png b/web-app/images/buttons/button_default.png deleted file mode 100644 index c5c1e7121be727a7e6daa57acc4b62102f283624..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2990 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 diff --git a/web-app/images/buttons/button_disabled.png b/web-app/images/buttons/button_disabled.png deleted file mode 100644 index 2bc74042d16c6cf3ab261f3f93dccde520beb929..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2924 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 O{kZ;9{Th7}^Zx^zn=WDi diff --git a/web-app/images/buttons/button_hover.png b/web-app/images/buttons/button_hover.png deleted file mode 100644 index 421510dcddff33188b6a091949091ac6522ed546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3238 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 diff --git a/web-app/images/buttons/button_pressed.png b/web-app/images/buttons/button_pressed.png deleted file mode 100644 index 7e7bc5fdc3d318c8f7a15f66869ad7da3a47b3f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3050 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 R(8&M*002ovPDHLkV1fc8zMudA diff --git a/web-app/images/buttons/dropdown_default_arrow.png b/web-app/images/buttons/dropdown_default_arrow.png deleted file mode 100644 index 686563a329cf30233a22eb2c8210007af50d3fa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2977 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 Z0|286R#26od`SQR002ovPDHLkV1m@}YD544 diff --git a/web-app/images/buttons/dropdown_hover.png b/web-app/images/buttons/dropdown_hover.png deleted file mode 100644 index 47d37e26c4527fedd7c3d3436ad0afd1bad139ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3457 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 diff --git a/web-app/images/buttons/dropdown_hover90px.png b/web-app/images/buttons/dropdown_hover90px.png deleted file mode 100644 index 9797717e84c401eb90561df14dc83f5c9b061008..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3321 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 M07*qoM6N<$g7HkpZ2$lO diff --git a/web-app/images/buttons/dropdown_pressed.png b/web-app/images/buttons/dropdown_pressed.png deleted file mode 100644 index fee98f73151eae1fcf519341d438028f9ea430b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3176 zcmV-u443nXP)X1^@s6)92Uk00009a7bBm000XU z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0004#NklD!J9LMqRk!BJU33d-K0b+I*3&~ypORDDZK(l1YL-BoO9d@b>*lUkEezSkK&$0eC!soCVN4PzFY}B>b%uTp&+;K%+%Q<5_)!%k( zw)b~17?gt`cyWM2sZ?S%n=zS8n9t{W<|MY&Y6WoXY<7&tV-|}=?59d(cQxAvYq?x1 zRFZtK6e>y5HdvWVMzbLo+vG?qmZ%iU9}JdCp(GwGo1biQ9bDI?-|ru7t5hm9n@#&* z8DkVI0l@ct8jS|MUhg1OtyW8=P~!7E4`U2L5CBlER%y4}`YM!U!Zn>v$!4>7o_BVC ztymJN)9IYuXK%&Q%e$oVRj8MDNhMe+g_2sZv|@>ZB`Sq-UGyJIQl(%?YNhaVI2_*P zayiY4Tx>KN0em>XW4GIV1@fAf12@3WKObWr_)hSAU%=BZ00030{{sM;w3?Kc0e|=a O0000>*B diff --git a/web-app/images/buttons/dropdown_pressed90px.png b/web-app/images/buttons/dropdown_pressed90px.png deleted file mode 100644 index 398ed66f921ac460131aa7796660a805daaf7056..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3124 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 XTHir&qj>gJ00000NkvXXu0mjfR(62~ diff --git a/web-app/images/buttons/dropmenu_default.png b/web-app/images/buttons/dropmenu_default.png deleted file mode 100644 index a2a3eaae25bbca1745682e09ccc46e4d7a8dff6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3134 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 Y0RBqnu{Tb22><{907*qoM6N<$f_hch4*&oF diff --git a/web-app/images/buttons/dropmenu_hover.png b/web-app/images/buttons/dropmenu_hover.png deleted file mode 100644 index 7415f651b8f486e621b08b937741f0db7e98aa55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3234 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 USjtZ2KL7v#07*qoM6N<$g5p3Bg#Z8m diff --git a/web-app/images/buttons/dropmenu_pressed.png b/web-app/images/buttons/dropmenu_pressed.png deleted file mode 100644 index 4f8f2e292ba6f9b2b804a56e96354aa09b680c5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3152 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 diff --git a/web-app/images/buttons/paginationleft_disabled.png b/web-app/images/buttons/paginationleft_disabled.png deleted file mode 100644 index 9ba3f68b985acbe0891ef71672c157640f060ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3006 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 AQvd(} diff --git a/web-app/images/buttons/paginationleft_hover.png b/web-app/images/buttons/paginationleft_hover.png deleted file mode 100644 index 14145c046312f63efd0396f2e74abd1256a4af0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3063 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 FV1nenu}}a2 diff --git a/web-app/images/buttons/paginationleft_pressed.png b/web-app/images/buttons/paginationleft_pressed.png deleted file mode 100644 index 6ad4cacbbff45c1a5ef989414dc48c2d02f56c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3005 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 diff --git a/web-app/images/buttons/paginationright_default.png b/web-app/images/buttons/paginationright_default.png deleted file mode 100644 index be1258d17f84999c19f457d2c39c0ba247ecd882..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2985 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 diff --git a/web-app/images/buttons/paginationright_disabled.png b/web-app/images/buttons/paginationright_disabled.png deleted file mode 100644 index 5e4aef6ef986d1621d9610d8e5d52fbd2ca3c999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2987 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 IM6N<$f@Q0^)&Kwi diff --git a/web-app/images/buttons/paginationright_pressed.png b/web-app/images/buttons/paginationright_pressed.png deleted file mode 100644 index bf39f88040726869d38d950e3391d8bbc665038e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3000 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 P00000NkvXXu0mjf_FL8u diff --git a/web-app/images/buttons/tab_active.png b/web-app/images/buttons/tab_active.png deleted file mode 100644 index 2bab32a232aea9b33f11c90090e4a966e8ac2155..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2954 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 diff --git a/web-app/images/buttons/tab_messageRADIO.png b/web-app/images/buttons/tab_messageRADIO.png deleted file mode 100644 index 514ed33a576028c97754c903ad51531d367ede80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3598 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 UCY%49(f|Me07*qoM6N<$f`ARw5&!@I diff --git a/web-app/images/buttons/tab_messageRADIO_active.png b/web-app/images/buttons/tab_messageRADIO_active.png deleted file mode 100644 index 45f0c6530a4b54b11bb1a80715e90cc64a278d8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3364 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 diff --git a/web-app/images/buttons/tab_message_active.png b/web-app/images/buttons/tab_message_active.png deleted file mode 100644 index 6e8592b609843e9eb95989b5863ff434f1845811..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3365 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 diff --git a/web-app/images/buttons/tab_message_hover.png b/web-app/images/buttons/tab_message_hover.png deleted file mode 100644 index e978f649b46cc9acf52ece4bf1bee8f31d972774..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3475 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 diff --git a/web-app/images/buttons/tab_pressed.png b/web-app/images/buttons/tab_pressed.png deleted file mode 100644 index 4d67a6e6d5d88bc315a11354b8b8342025045717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3191 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 diff --git a/web-app/images/buttons/tab_status.png b/web-app/images/buttons/tab_status.png deleted file mode 100644 index 04dedee82204798d430b5aa71e89c74039f561d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3582 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 diff --git a/web-app/images/buttons/tab_status_pressed.png b/web-app/images/buttons/tab_status_pressed.png deleted file mode 100644 index acec0403f1054d54bd50e86da162ec28e25716ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3658 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 diff --git a/web-app/images/icons/activities.png b/web-app/images/icons/activities.png deleted file mode 100644 index 9da4c9bed088933d86e77596eab7e046db491bd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3033 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 bKKL8}F4<)U*n>|Y00000NkvXXu0mjfpzNfT diff --git a/web-app/images/icons/activitiesarchive.png b/web-app/images/icons/activitiesarchive.png deleted file mode 100644 index c386e414ccb12fc32c293d62e2abcda334ff4b14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3704 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 diff --git a/web-app/images/icons/add.png b/web-app/images/icons/add.png deleted file mode 100644 index 196be5282faabd841d1cf76d659b3cbf96a4a021..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3650 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 diff --git a/web-app/images/icons/calendar.png b/web-app/images/icons/calendar.png deleted file mode 100644 index bdb81f9af77c6b51abe047a92e00faa03aa7e012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3693 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 diff --git a/web-app/images/icons/contacts.png b/web-app/images/icons/contacts.png deleted file mode 100644 index 22e2998132dd88095f71f5915078701c541662ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3695 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 diff --git a/web-app/images/icons/groups.png b/web-app/images/icons/groups.png deleted file mode 100644 index d1d999f7e8d34cf57ae0fe09926f967c51af9bb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3710 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 diff --git a/web-app/images/icons/help.png b/web-app/images/icons/help.png deleted file mode 100644 index f4a9e496e62422ceeb0a611c31dea8fc98eeba4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3919 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 G5&s2|CyzS- diff --git a/web-app/images/icons/inboxarchive.png b/web-app/images/icons/inboxarchive.png deleted file mode 100644 index f8ce2797fe62cc5576a1863091183f1e4229d5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3710 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 G(fN2bPDNB8 zb~7$DE;u(kfL#Cp0o+MMK~y+ToswT~(oh)2`w8|1y!WdKd<`#LVrxQ3psuux*p~2j z{R0NeZq*PoFJ=tZ3ufmAOv|6bCL6;%o^u!tZn!WnemTi`pXYh=p7(Is-Q7o`C>9I( zJc`BQW)uoYr_&!2iNs@$mj&abcWKiIYfE|<$;Hk;kc z>soDXy+-c2oUY^Y>S`^Tsv-!+Xf~UyUM`o>?e;=#wOR!o0n_Q_TH5V4&Mz)tnkMKY zyRM60(`l$(1ZX-F-Ntd=!1FxhiE)3w0kSQ$S}jy674!!KrnhZ-5ipsY-+^|^X0s4e zDSSLQfFwy6jRG7Veqv)$k7bbnP16vJCwC~7N{B?BAQp`vnM`6Z9HCyXqu(EdTFW9^ zpaH|tc!dCahQZ8~csvgMM)UUFdwf4R4Yj6815}NrQhb6z%u&*nnqLS4dS^e_7M7aT z(=g0MfbaJi^ih^(o_~%`ryJImn$?pw3j%6`FjF>z3nrYBq0rZ0i0uO=b zaYE)?*YWnz%RB#VNAI6*t!S^*tv?&E*{{5&<0t?C002ovPDHLkV1j~n2VVdH diff --git a/web-app/images/icons/messagehistory.png b/web-app/images/icons/messagehistory.png deleted file mode 100644 index 28fc6503d69da33cfd54370dff69a6abec06aecd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3685 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 diff --git a/web-app/images/icons/messages.png b/web-app/images/icons/messages.png deleted file mode 100644 index bdd0d91212f7a656ff6626378d4c8ed6062ac6be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3684 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 diff --git a/web-app/images/icons/mms.png b/web-app/images/icons/mms.png deleted file mode 100644 index 32600acfed9af03df6ace0961c4dfa888ae49f9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3700 zcmeH}XHygU62|`s(wkHfQF@6$=tzfz-b;`GDxIK+6wy!w>4b79BAp)W0w$DgF9 zKC5o*kzQxQ5Mb>1001V=KS>1&iY@}cXmtk;x3>225B7iH;~yYs0*4C*1o?a4xpy`Z zGJ~~4A?((9v<~L?U}l)8XJ-Dk-1LIBu#_mSOmT=11G_0ksC1g!ru~9}0S$j|35Gf? zEh?4UMw&U9af)t5=tWxWOH6YA(PH>Z--(uk??b2WCbidUcCn4abZzv^ImU`M%2CW! zuqzk7#rAY{FRsYyMl*^A0CxIDPoW1VB2?foQd9Gqa2wr6Kov5^L=W053ftr^CsNop zVEH$xqT;C9f-|q1(MNFs-LN!RInXtvio)iJ+kp}q;5y*pz6`8ofUCrl?_(eedzc?i z1)QG=aZ{CK0zpnMj6U$u05!umk_`Y-4sdy!b*X_V86aok;B5@*n?M_pov8uPGXpsr zOuQ7J2?wsdA|fFmE+23i?l@@vbFGej4RS^*zd@5As%8-FOfM5i=infFMUrU3dyPxQ z?VMYIu53qWKA%Fg65F@kK>$iJxzF70o`eut>xe{^G(4+|%*H2Lim zV}UW@E)#bG62i4?!x5OKUy!=1P$rxNdn)x=Y?R`;v><&%t-YWO>hEe(g=flC-twUS zX(qvr3~pOG0AQ!tzx}HuJ#~~%?BXz*vaNGsR3ZkVyiJ}40&rVjR2I?SsMA9afPP6d zq+XAIul=HQ8|~%x^Rw+t$F3@IFww3K7(0y7GwO1Xt5i)4Ofq4pUI5|>{i-XV)Mn$8 zkQKlx+hPBnRV#q)w;O$NyJSl=1C3rUJ*S({42H@*87Y!R&zm2ADAaCD!;vB?*oWb= z5jM+IHkP+dMhMy)3+!kGol{G^Y4{;iqZcT|94E9G$v=y3u+jR;{0>g2RJ{~u_=4$+ zXRv%hI!{UAm!P+ov{F?{*S=Kyu+5}v!+Ye~eq5we?7Al>+uaF!b6uJt%VXe;a1C>H z_oez9HPp>X`yRt@&@>#;25k%~G-#Nh+Z8=yq&d=Z%D7VSvZ&I983t7b>NuMY3E`|t zv$x_OF8u1c=&m52h%}ZKnczt0gtCWY;9aVs97%8m2|~s>lQ*vrqa34#qxWq^)}^Zo zm5eWmWcAH>`Zmz1J(Cu^)*HWqUFlp=T;X34+Hq#Yy6XnMI<#AowC%rZ%D2kCsjyRdi^y-F@b*L${n4cvuu{$*?9_k-Hn2JkPZ)wIsz~ zu4GP-_qyqe%gN0_RvTB_R2yx!s?=>&V9Q$#njMd#S@n8MC2mR>q0))xv1@kIc5@Ys z6+9MN>ic!FINvh<(q?`1r~4J;yyB0yql(S_E9OI6*M47)fSw>u{C-#L8!;nk8<|CE zNzBBHnxB;e{WS%kJ*0nZ;I}$;;bm^wZn=wbnS>F|m*a+i8M39`>Atxvy6o5O*ZoqQ zR$NHj%wofWTwrTKD3>bNFxN2e85$gVF*K2{T&N{KsjybKRybL>(B$eA;v|i)#J~44 zX;^V8cO>Im?#DZ+IhG;qoo+Q6)?#bLCYo!TD=t(JEVC@DiziT>_5a}e@KsHG^{Z2~ zq&mDGKEe&<&WmdLT-Qm?YR!uH5b@WE79C6CG;6hhlR)Hyw?SO$H`M0~h(%rfPOn0nfqQj*MK24r)!WefSc=XzULOoR6WZ!Lz6 z?qdrZ3p=(dNw3K&$i(TRu;7>#-o|G`k z2&jk>qe4+9Me9X7pF27Xdo1)RO-G&N^|N7mOE0yApvSG39#b2$+FmQ<)BATutqb67h-g4hcGG0T|?^5&2wY^vEpy!Giv8{T%)ILX^Cf z+G`n8Wr#LT_O9lP>IbC{I^D9~j)UV!EYjqj*=03ZNS(_4dmk5$w{{bkuuDwK;ks+TjgV)W@ZG!a6%SY zc+>{!yZ57k8n5_<)6e%)nxI#*>H2&dGiuH|$}r+#6y1I3pd_w z?f*0&L34*BNzJi%IN{|d&G#){6@A1Z4IRWQ#2(@|LWMj!_s(td@csyyKfL9q(%<7G z=az#L?Y@sBdn$X2aqn@jBa@@X1D(1g-1=e8k>9OaOTWOa9_mr*6FL!A{3PM)xWK3u z!Zv;4+NKd}&()8o*ln~7iwcYVUq#(ZA_4lLE9(ag3kO$N)Mp;0hSx08ja_{tfD(Y- zg%#`+7#7+U967r?f3OnOTn+%R=o8r((0Q5s|XL zW?e}y@ZoD7#D%+T{@WkegBM2)C@E_iEgHm|JMV*c8c3_04(}ZbUaPzKZ3J&@T;jNn^Xcr=_Ux0pZRnESky)by+W6Sv)6D&JHu(AU{PckY zmW0jX>)L8+OFBU(>&F%FVb5XlV&2mirvr7oJkZF)@y$u%NZv?k?oMvjC%?yKCmU^> ze6LB}9o<(x_Jt_Q-`=}%wAGHDMGI`dTwt?Wc`W!ulH&90&A#22ilZ#PtSkx*b>8l= zhoTJW?B5jhFt)V-AWRH^s8|4gQOjX}{IllS#((2q0{_PZa<4|%o!Mgywzaf7JNW+vXc&|p zKI=x9=<6XuW{NV}Sv%#JVJ?@AoGBFFri^;{OwCN7wh&E+HESgFFsq-*XBmhJbwt># z>Qcorat4UlFjrQ1(pO-$Lk8Vv*DR+fcKIzv-O1zmiKd?USh6 u9<<<1SxJhUaBR?*?eU|mxJS=RJ5ZpvKvCQvc*XM%eG>yq{W_Ry%zpt1jfC(3 diff --git a/web-app/images/icons/onair.png b/web-app/images/icons/onair.png deleted file mode 100644 index 3e26ee509930dc96206d8bde64e1337366cea9f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3683 zcmeHK=T{T>68#}aZz5I1rAZSA9qEwJt3WV86bLOKBA{p}(pwN0q&I`0(u)cjjDXUl z6Pnaeqzf!zmts =`WqytDV5JNMJfIrpCVFq3r6+Juey0y6-B&CJx$?o_#clacnc zqBtWwPlYMK)bTz5Ea!id2IN2E2Y}he2L`)#&D%f7|Gu|>fUp@1CLD0j-^=IDX-Duh z&K?c7U+2}K%5*Z6l}5a z(ts`uxOR()1%tRez-_#P(EjI2E$5odX;OK0+5~Y8qi82axj+U4LjIBz(Twj3w;JjU zDqml|EhJAsDO!c&+ipJqMQJ>zZg-D^iR`sRqFM@`-9>KWGd)$*&28yqWw0thAAp6R zh~X1iNd1K$3UeL2HptCxI(__3#qi&dM9KA zu*{R5}C%*xIIRSr7-g4#UF^Yn$mG4iwpN)xot%) z(o{_q?HMCsGG(~;y%nuyt?In+ z=6W@4W759+;9CqGSF}+JlNuccDvY{hV2ZRvT2Gpm3ttphIXBIu&O{q$+a@WRQEu^0 z;^VoW9sF)eiit>5S+Q}h)bkL|Ff6P?U7RZkrX)#tddBSSEBFZ4i1El>JF#`yiUJkW z3t|~P(;mKc3>ulT!dJTEmvPJO%gW1w%OX2Y%s4mwz*h(Mi&A#Ix6K7sI9F6w=sk0l z3>;qO+s&32!_TRv-hkE=s-rHfzf1vF1Uia;%4qz9!H+P z15ySr^N1&{mpRKkOCn291_H0BEUlcYWO3Ma=!2(LINOKU8apW4FI6yo&8~8 iC8 z7qmxLXq6{cqRai^daoiJkCW&f+b!E|V6SY8-nuL`bqce%3)Bb8iukfsB|L~$?T~mo zF!ku6Ok?h`P-C)AWks7~c8lpA>PEXbN^O{y$sH{$Ue_qOz+v|y=< zB|*{irf+3-PBya2w92;1WV2bVcB>3m+HBP5co@xY&}A-pQ_=*TN<52Ov!Ak`En_a@ zwbIetua&R#EfFkkG{k(qTSm?;{Nx-}Xz5=z7t*};>tZZ6{|mXM}$Y|MOUffh}>0y-MhYP{jRr_qa8$YtH2ppON*#zwBkN zL(s@U&cR9LCH(n5=?)*9eZi;+nh#C5AG?c9PO^yUlh4tWFA(gU?QUK+584mBwGcY8 zk1MDzXxl0$y(X)XeaMM3&-+!LOBXsS-ydr4hJCYL8P;QYo~7VBUmalsvx!E(UlW74 zL(&j66K@(yFqIV4HlOYf-FwfMbeFW%=al9gUHa8q8oC?$Y})+`UE=3qkz!O2YAAIW zlto>pLDMEh8$>&uIXnn`B=R{$Pm|>Nqi$-;;7Jj|fX5&;rY2^kwMN9d`>&@pB9ygU zVj9thJ^ot6_wgYH)G8{uJ%Uv-J~1AVpqCPWMP3+I%u&S*&%o}_8~!rPHk>O!E81wh zmNQqC(XEuftv#*&QRSmvr@WVA{}>X7G`nMQQA1v)R_*ScPxD7xyNQdqMV6&7zFbK6 zt$>hXV%uJP8E=I=m#k*Cz9rWBYUbYtoHFISPcHAA$6QWf4rvo=LyJO&)rPT?u$wZM ztanUhtU}ZON^4RL5&xoGBD+F}ldO2!WXWbZTcBCUoBvSQPf16!Sur*}?P(yiQp73) zkKRD9dOhr`_KdGP`Eob80dgsep~tuWY4ur0Ic7Yx^gH~9)PxK}9oiG&^?4wvS0lTs z@XEkee|<0Msrs|+=hQ8(Hm-$qd`W@@LQV*|+FX5GqfR?8gv7kWbM{KYb^2=U50CLO zeq%OOTZo+6h-QgUE8l46*4~)b_cXqnEDp>o@!^{@6I-`zkPyfD_o!b9I6+;Wq{p?~ zB)%M;$VsW0;1$6{|K87eGnwxysyYZBgI*(E>#K8eg--0*l{u?9?04Cwrr)v6Uw^l? z|HFs`$r+F$HOAs$gqNSSKQwuk^$-WN^x&`Hd+=XyHS);pd(_0i-C?p|Skn)czs5*T zO_XEZo=+qP8V9Q}uQAUn*Jzrd|7+7a4g1~GR01mWwL(1;G) zE_M9MrU`r3AD>Qe+ZZ`EH8zJopLH&Z1sH}buTz-jDVNwZryo8Et6pFj{o|n!S_pC* zn!l58TwtGn=;Y?~(WYN_czk0n^vHzt2gfrNZO0JvU3ibr^m@!_26|`k2`&p49wGm8 z#+CE}AGYRBoWITCzx|OjXko;Nn!Kjfq(!{B^C4)bj6^ zgw4XMx*8gbdiRdkkIGaN|4txtGgAN5Aybf@wf+Cro=OGwHo?C?IX^Q) z19il#yD%qgcpJq@p!&fqX3u5`_q?e7JA=VzsP(u5X8JwZgf`t-&eu*ukPcPs zhjm@qZ$c=gW|QS!XGexOGj>Y5d*q$an6Gm3P8KnL2mFxR1oFY0haE*CLmqnOT_km1 Z2t20|HM6JXJ^dB|Ff+0?tcAM9{0DzrdMf|` diff --git a/web-app/images/icons/onair_on.png b/web-app/images/icons/onair_on.png deleted file mode 100644 index 30ccfa3108455b4b53d2d6fa797866f82d2ecba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3041 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 diff --git a/web-app/images/icons/recievedmessages.png b/web-app/images/icons/recievedmessages.png deleted file mode 100644 index 997ecea6f6f84aad58b6591fbeeb219fdf8befaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3699 zcmeH}hffoH6UToDvX{sZ5CuWN%AT^JWly2S77?MWqKFL9G6dNa;bF?Q2r7FhAjLA2 z4Kj*=%rayPNPT5kl=b5K{ugiFOYXkOC3neva+h4(bxR{QW&vgZ0Go-izRihp{dGp# zlZfUFbvqFzA7i@*0I;0>>og$e`8fcXt?s~J*ROkc`+Gm|@b(clfx(1*{Jh=o+&ifV zn8L#`2>2SW7Ik(9YK9AYX69|f!zgS6jSu5a5r>E{ahl>p3MP51ThAC6&eeo00*oLS5Va5C1qiaa}DGyx+ljG)CLw?*!J>@mkW zH2W4!SQJf*f66s8#xQQ68 z!2X#C4^4gw5I*aM(+3_JpknaGQv-mK1KjRr9co}g8pxR--HpN9deB1RWT^p+tU%5h z7kvfL1p}uZQPBVpl?}KJw~(4YuU2ucLQY6!*Ju*O)C|Jy8Kr$0kVu&ek|YzptK2H+ zQ|KIBnYO@eeuZ!)j<4JO0OY6eoJ_lY7(imLB9T-Q3G9y2>mTWlFF89e9xV@+`{)8N z?;kpJBqdub5T-#N=5_S)GKJ3LHcS3PYP@?5hi)CnUz@WVoLpX7nlSBv z+M|1sAxD@t#}?$_z2Bjl2h`oK9~Q*I6&%8i==Q$0_3xM$o*ztQigKP_NisU9XE{C) z8oAVA;!H$AxEHOtd=vF^61EizFU3JquXJ7>K6YK0liH`%o>K;I?`qQor%0DLxX}JG zli)=8w=7Tr*lP4{{UXUo8|D!?KZrg4p>t@Ie;I_io22>za9dwY2GLuq)6EEgettOQ zt)Adc>p7_w`tz-)r(0PLoK&KqVjXQzPAIc$*m*yvD-{t?$(Vt+LJ%j}FSSZMN^(wR|}Kpc(U8C7Z&T==6FR&!R=9a5Tjpc2gB7|*?g|@W(PN~J-GHgiE=m8252Qf`X^3TF+thK(d*1?D+ssd4lFIhgj z`pf4e@#g1#_IoFwm7r3v`nlYLV=74-)-Bia?Hq$*$2~cju6AhkH7TYvm%i#t6|Ci5 z0&j0r&^E^Hx(rrh>A1oTT9{Pmuux(21wCVwIm&XvxJ3B8n9`XkCRHZdDC;(fOKBx$ z@5CF<{O&mCtRNqYGL{k@<4QU!%NdM=b*PGQ#laLLh{>l+s$V09xrPmg@7sv3NtNa* z84HM}eVTIhtYJ`lCMA5eCwd9L)V`#+B)BB9WzURv*7be82Vao1>Ah>pzs$L;v`p`o zrJ!f~D#vD~qyTY7Iq4>}vVdUo#yYm-tkT0AwSh=p6SKm~m+2z{9(*3uJ8!=EH=LPC zzhIg989CgyX7nxd8|@C3l`V!RvKxnyd+u+^v?^JgxgGj+mixz*g)4$Z zO6Ej)w_BcN8JQWVa^rIAa-)rAm8#8Rd{MJOquqWuyI!}c#4QOUOcLodeic3mpDAW8 z=C#mL->s4<^DGoBXw=7kykAVo%KLCTEYIA#cs8(k_0Rbb*+ayk*Pr5DBUTiBEvpzk znU!=-vs2mETT@83oBY!n=FqMSD@3QGGv}jHh(nsMMh*Wly{pg!&c7-V0n+~;xmH5ibV~v%K#b=6%mT8vdd1ILNw?7G=2&MJ>Z^)yZx$}+|*0RC+hL&B}G(5EVovQc=UWvt`woJ zW|2}zci5w^hkhIT%z$1&$G3;FN<_y-BV%+DeQ+p&A^A*Y?9epq!JPgd{S5utT#USx z+8b$8Wr%i}%w5eX)dr;ooh})7yZ%uW9%XXR?7W%`q)O%fy$^E-o7=Gq_yv~5V7@Hb z9tWSm0#e&fbTMzK440I8hORlz^4hb1>2X3zcoQyfoyA^GWDaZ-YQtQT9a0&>O~7tJ zE?90ELo9+)zo#@Q2a0tn7D_D>qa;d`o6OnFXL8l^cyk^JdnstCH_Jz+rX>49%S0^F z2$*%uiu-E6o*m)oL_-1If&bJg2Y5+@P<}eE*aH z@fx)%-$Z6sg*J-^S$KxuZtaa|t)ubWV6kOhjt<$F9^Z7ZLdn|A)uI2y;03jL;+|G< zlld}vo=iwi2P_N5diQ?Jo__YOw7i4pI_N&^zP2(eooCOUQI@%q$$p=0a_Sx1+>Lje zyT1&`vY7*tjQHxK=KChM;!mUj4IRX5#17&QLWMFsQ->bkyFWw`3~u_R^nH|U z-$Xss{`7%tOJi#>>OShWZ?a!Y)v1arTieUn_j0JT^zz;8rX8j|WDsR1j1#|%3Jq%^ zY?8*VZWyt5U;J={|ACceQ(?3H=XuwHsE>Z&(i)X%j(UMjed|;X_&3S1bjL^Bvj`2 zv=jLyA$Zk=Gcx*IJO>3rkJII^bN!^{}oeA}mI3)Eo zPGTh}l}%Pnjyt-WdXuo3*ijw(qv?qs(@*ZUVDqt24vJxeu7l!vd`B;j`l|SNWkdHyH^xarSwjVxTbXGey&e}HuD5LP zzae+EbzS)IDL_&F_Rfv{%~tF*R_Mp8IS#9($HGq}k3D`@@4`P9@2Bynr5)4JW^Et1 zC`yx0{!L*QV;c(qf-VCP774)b;}cy2;GrA<>rMcuX92+Ho$A|+ysJw(8ie{w53tq7z3MV#RNv5u!`yw*2EFZlf?R#*3>PU<%fz4wXDJm1x$W^{)p za0!m_4+CedRwA8%0NOHjrlZo*?{1WpZJ%%|xp3lo9V;ZcwHw{n7fthrvzY$c5pOk* sCBDktEglX>YUE1RPbpPTy!fC^3mALEEFIo+Q~ts?F|gFHf;vU~8vtR3vj6}9 diff --git a/web-app/images/icons/remove.png b/web-app/images/icons/remove.png deleted file mode 100644 index 57b1c7bf1231071c9ae3a8250b495dabca212892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3704 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 diff --git a/web-app/images/icons/sentarchive.png b/web-app/images/icons/sentarchive.png deleted file mode 100644 index 12458ce641ea9a22949a39b979ce66ae55db7e63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3695 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 qGA~T28cK0H4>U&=K^GpgL8aMm2D^nEwJOmw}rA diff --git a/web-app/images/icons/sentmessages.png b/web-app/images/icons/sentmessages.png deleted file mode 100644 index 4b2f77de0eeb5c59ca154d4cba6d0a3a5e42b3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3699 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 diff --git a/web-app/images/icons/shows.png b/web-app/images/icons/shows.png deleted file mode 100644 index 64000c8aa867b081b4e81fa6dab50d01fe097c9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3706 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 diff --git a/web-app/images/icons/signal_four.png b/web-app/images/icons/signal_four.png deleted file mode 100644 index f82dfc2316d0c7855428807cceeb49e0ab2e87d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3613 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 rn89@~le8BM2SfnTt6y-; diff --git a/web-app/images/icons/signal_two.png b/web-app/images/icons/signal_two.png deleted file mode 100644 index c733b83f77b60e0b53de7168b7a2d61a847b6bee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3647 zcmeH}*Ebyc7RP@=^cK-Yj!s7J(V5X}Fft=j^dTZ@qJ@lJ4-wIgAkj;NWMmjoqZ>ig z(Q6Rgql846D=+ttxa;h-_WnNXy&t}xwI6o;Epr0~T5ehZ0E3aCuGNLI{z+=`i`t0T z*18ZHZ$n!@0O+p%NivX=#|Z$fg*yy(>z13Bzn7nzmp7jg494f}>*ebH$OVAFX^b@r zZoR>-aWr=THHkyNGV!uvqvo@MCZbtWMIih%%*Jv2g;Q*nZCCX4D0q4b;>eSe(MfEU z67&hQlT<7GMahwG;u88!7DL{6jN^~i2G2iEXs%c7W9o;fTB+$X4CO5q(e&le>sJ;c zyF0rUSERJVX@$H2Gj+W)zu%c488{A8R~Hv(rTPrW0!QhnL91DAtIV}n64NF$`z{$e zimcT?^`;3mniXgVCqqkswmumelOG#1*z;hb)1ljUbr2#qz@GWA$47hV8kKLs^oCVAxB%P zJt&(?E?j|WVSfOCf>gE(xBF*-1jZTyK`9x__&{>Ag_0!T=(v2oI#lVc4Zxy**zmc8 zbUim(jS}s7UL?Fj;dY;{;K@;; zN3}m_MVvkQ6{dcAbhz+&NhnI|lD5y|pJCqqp>x{nUYk#9E0xA|WSj!8sm;R>BtI%rc7L(@9DAjKB ziBZFw>9+%Qew!FRoQ6WDhx)1m|8yLgV**kznVKUz`k24Xkb)&qh_5$})l$GDRnbt^ zDgn-CW5~Ow;d@CX_O5>g+F@lfqt* z`_=aYw?>ju;riD~H>T+nO<1=~>vv8n`OZf&Qe7R;_ctYI(wzF=3slipc5&CE-H{#X7WL#@yf4G zPDeS}SfrtZ;5bXlRcYpsI9R8$5KBBvP89dzlF|FO@DY{~{gKC3f*TU$xeA8df@!_e z&K`ACDz7B?#CxJwFe@D^@+&+m{Cjq^7)NcNx5w5?Vpe?*jk#8tR~1$%U9#kKY~JKp z&6X9yuPCP6fmRn{t=?J2mR(hNlA|&h$!=s)TwRnt%I(JCcI5ue*9B zQ`Q-8Q=&#id7%nS-dG+{Z?*r*Rf}pl%jY=H-<)P$tTb~!EMbmy_r}rDmxY!+yF9zzh){~~i

    g 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 F{{qixwIKii diff --git a/web-app/images/icons/star.png b/web-app/images/icons/star.png deleted file mode 100644 index 8ccee8b1085a5a7761e40c48861115c170546308..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3160 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 diff --git a/web-app/images/icons/star_on.png b/web-app/images/icons/star_on.png deleted file mode 100644 index 28859a6493ac12b67a8b443ac23e31b9da602ce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3276 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 diff --git a/web-app/images/icons/status_pink.png b/web-app/images/icons/status_pink.png deleted file mode 100644 index 26485c4a968aa26f9afed87ec21581d2d7c8e277..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3256 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 diff --git a/web-app/images/icons/trash.png b/web-app/images/icons/trash.png deleted file mode 100644 index a98a86c456550e6fd3665f0bd24b53ee500f67f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3682 zcmeH~Pgl@Anp19F5f%?2W~i7+SAYUX#&{r4|kXjFgQY0{6~@NWgKlrsg%lc8WGY5;j3Y3EC|R+U0nXhzwhhJSUQv zc#`(e^y_AnF)TngA{9~wbPY*j(7B?vpqLD}47$6mf*aDnMeNbH2@r!m&Wj`gj+p|i zB*p1~pV^BE?d=aN4jq#3K9zhcKbk2;5ML>*~$@5?UZtDxnzy=z1dMN?WFOHS0*W*6y z;E-x3=jpgS-$8Tgq7n}g?(T#zLa04rctTtxY92$x6Nl@0C0%5{=<+JHTYD#F1kuZM z+I^tc3S#)}N?Ft)-V#eirq@Tw>?$yaB5`{H7fPjM&r3KK=rAT@N)hJoN3mE7nx!in z%iBDG@!J{m?rViyQcH3&{FtuM2NWKkCbk&KXT~;IYki@855-ofa>X0Iq#5-HmCsLO zD=rufdB>&oRHbBNwA!0tE=?QSE7$&=gF>;}Pfn(%3-b256jg@%;9J2O+Ug#z`kOVR z&B;gZBX5ypOtA*-R4Qah2)`?zo-y1UZaHII!OtVCbY+f8m5Mapx>HOrqr&W+=*KI+ zx;fkwWktk@lsxVVBR6z{;?2^gb*RXM>al`Qd8=+09$^s>0E}@M6 zIS=0k3bjlr{%d^+Yv{GEHN`dVHGzFcYP6ef@atpS6>*z^yQZA$jO$A4OWzMMm z_~53|_nhyfhe%qwMAo=o6hfS{fP;bq!HMK}lWShaIg!HI3zJio-_G60W5^4%gG*v0 zAF`$oP-mHDiDq$2%EBtE%BmKtXzUK`24QKHw{4^94DA$cS1YN$WLMi&p>J&4a@!&* zH7b&-5EX$io!8M0XUXIaUFKa@(AU<*Z||(O^zhTTb2f%a3HZ`gC*F@$?iPJJJp1s0 zWOMErZ*z)PRb`19RMAw?zR~6&(@Te9H8=RUFw~N2L%claAo|H7%bvuF1b3N|Iac1& z$+s#yCmUXETy0%#wB4#ww^NQTYc*(gIEkg#>opZ~5;H=i;Vz>$Y-ep3%BjoQEVR^* z>SU^XOSwy$^^u&u-HEiy@^K5=9P*_eQ(=pkJ-m$8>03WXbt1)kIrCtzr@HH-u!}Wz+3z zr|X+akyQlOJ$CJ%+95AiwO2J&7ZnyA?hL86H}y3QT6F~$-AP!2J`y5&5F?0Vpgcx| z1VNe{s~78d>Et-#p}?n99d*3t&xY9@y{E-kJyyN6$F+~wJ8A{I`~H4bD?r%D#iiqX z=o4;4f1etqaQ)_*(iKfBmXMTSpQw`>go1O8$>%5|$L68;mh^w?XX`H(Ampvo-bkA& zOKMli+|`^@{iyU&r$@%iVQ3PLhMV}A@uh$4oP)wk zaGi$<zV)PF-lgjJr&t!MvA0Thj;RJA_Qf}RK`# zi-_lcr?)7F3x8HDm0HKfi&Z{rF{d+MC{QnA%YVS{ub`#gDj)Ye{aG-iO28rmgV;iR z^Lj8?^tn1__QQN1H#kZ>(g-ZfLeBS(Y4{7 zp~eCHGu6Vq7sMT=PNwDOn9@Wudud+yx7M1wY7Lsf;dts**2~utZ<5z&et3eB^q;h< z-m%ZAi*6N-u<(t&-7)aE<2{M*HjN$idP3Cp{Pd2q6AmakL^QWHYx0vi7Cd_n z>!TU*`LK2Fq`-ksdGnd?DyzG(9wT1kUYp+*rHdTtv#WBx<BHu*3f~yh8@Cw!&G+17v8&09|w%>a!0oORQh`o@7O{( z)9!D>+mYB=OnOavo|v385_Ia4t2U3bPyC&0E&YRcdP&Dg&nSfGG1J&Dlf2_vFq^cg zYuiTjy;s}L(R)Z~Iu$y*zY2R+go5LhAxjA5K}fZS~PG@`yWF08}RGQ_8;u?->Bd5-wNH*JkOZ0>TND; z&acBd`C@k?THi-{5jMGtRB;Q3t>Hh|h*OhAYFZ1e2N8jU&xE5TwuR^ru`}FY^DI(q zx3A09%g9WJCl;j6fpuP_5olM*sMo#WB$gGU8z+o}Nf Wg3qXMy8qoD+$IK=`gIVO$NvEja(dPP diff --git a/web-app/images/icons/zoom.png b/web-app/images/icons/zoom.png deleted file mode 100644 index 0a9619d9b86222123981d66364aec589fae0c994..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3699 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⪙Y!gfL{^nz|*a0Dq;c&0`jXWXSo;e!cg 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%0AouEEn@puA|$fI!!*SLLw8t2?*)+B;Xq% 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 diff --git a/web-app/images/menubar_2.png b/web-app/images/menubar_2.png deleted file mode 100644 index 15d0f4fa9610193965a8248bd885c41f6b0b9e64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3003 zcmV;s3qKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0002yNklVk3`IeM=)Z)eM`9!spt}mb1EiS}HhZ$I-PT%N0001CTX%~M z001EBzVAA!s;=wu8UO%5J~pbV3^)J)fTUe$0001K-Th8B#0CHWFcKSr0{{R>vql8~ z0K{3N0ssJJV?%HN003$K$%fbf002_D`@Pu!002nGhRFs103bF10D$ih8vp=6oSO{* z0AMUOOf~=j0I>l80DQ;(iwyt(fD}K70{{SHvEe`*000=_W&;2Kh;twg004}|hBYbx x0APg41^@sM*WGoT=jkN?0D!m$009600|01pk4J$< zN?sD2BV4j9Yl`*+fsWQD?H_4>L?~r48B=l;Spkuc)A?yA6iP)R5d;DO`2BwH_g=3D z!!XcjG|+Ch%jCP5&1Rc|$N`LEvA9yN*EyX%X^loByIQT_h>#+l_9wi@{(Z?D2RE zUDq)j4#hY2{Z&BrR!Yn$4g z^!3C0RHpz#W@n--_jThHPEAe2R834DnuV#1kUlxXv}=C^n7~&>f1RO6h@8fUuT`wRE91*{Z%LW-oO8KckjTdf s77ewwyuEar+*b)ffn+a07*qoM6N<$f>LlT?EnA( diff --git a/web-app/images/skin/database_delete.png b/web-app/images/skin/database_delete.png deleted file mode 100644 index cce652e845cde732ac3ce9a4132b597301ad660e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 659 zcmV;E0&M+>P)ps_J1 zHhTmGl@tMUh=_=a3Fb%)BqZVTW3s!xH?UsxE?7A5@n+t<@6Gq#%m~l(@IOPFT;%il z03|#}Sa4nU2-$-Kn!4}FekQv@$S0FY$L9!N0g;c={9!m8K4zLG48uSu6aw$J+ii5a zT~sO+G#ZW9!I0fqFSvY9*@h|sR=YqL#x%oU@(yD@pz0* zr-R{eDEHX6V*RaK<|4rWl@GKt@8COeKZT>%ICBq4+h_I-+?Y*V28oxmqBc+Oz5 zc>4@kzJgDe<1lkKXYEtktsNC`FoTI)4qLaF!_1E&4qv>EKx`iUcee83)!MzalltZ# z3K)~8`*H_w9^uf5^9X)<39-6>(AOuJvu0IKc#FRkFoCa%ULtC>8v6bIR-H|{S~CWm zy|LB2yL+L!Vs5g8ONBz=aUzj0EX$JbfSV}a#vT*B_2)32Uc<0oLyzLS9V$=7hM4?~ znM@`|iEa~8)bZW?7q}d~l*7K(I`+@}grT|_=WaH**u tj~DMRZZpzVy^OjT85Vq(G=8XD@S91FH}kp`d7hyPh1 z5CCa%X>*RH50W(1GMNlqE*ChCgTvu4bCM)M5Co)BDTG2HvvyYjmSvI4<)A2v`CcxU zQ79BpEEdf*P56K_c;lUWy=bic9s#4IZm`yWps?HR<^;5uf_%3rLf1Uy7}ym7{u3SG zgQxL#;V@<+y-&7GK#MIB!!Xb^&5SuEhPoOV9{wDJpWonQN~qlHho`!h-y&cUDCjiw zot3{JSR;b3Z$U9V2&bDtVsaL$Qu?FFtIb;kXm<)qqyl<=9Kq@&_)r^^)N|OJWjH)_ za7i;6X_aj`duRB^h5&`toyKA^3V-E1_yb`=eg>PPj8Y+p^vFkpk)_tg?(s>=HO~R< zNVkfdL~{$}rBQI|9QHR{MrpYhcBg@2p$?h%pAnUsbBDUeKUv#oTc6-&EEZdf$Kwze zM&QwZLDd6D&pd?=1#1F{N2f6?Hf8gwvt`>|pf)ft5F|nm_AI~XywcT&?}K--v^WN? z_7vo-s3)9F{TXfF{hpqll^q2vdwBb}datvKg-yfc+gC^|#8-K5)%lB$rlxi}-rEGO xUZ|2A>wRp~(I5;*aZFyx-fDe3J-^%i_y?+(!m^mX(n$aS002ovPDHLkV1gwlT*CkW diff --git a/web-app/images/skin/database_save.png b/web-app/images/skin/database_save.png deleted file mode 100644 index 44c06dddf19fbda14efe428b9b1793c13f46b2cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 755 zcmV3^_07cLZBR}_>&jXObH zw2it@svr%qE?kJ(Xuudu+DSW|WWK!jNvbU^UO02#+Tt zYOko4%Vx8c4Gh!M(=Qem7g;XcE?n0Qi^XD?&*vX7@xPFCIh;%;@xMr?(;$(vo9j9i z6;riZMJyIWG#Z6r7^-I5HtO{{DwPWQ`}>&y+Y;!yjz*&a$8prX=XtO!3$0d5J>%Mz z1f8>Jnx-7^X2#7Yb#zC2VYfZ>c17@L{s)8{OuWBa3WHFfVXfhLv2t?V0V~q5R2D*D z&315l_#iF}b>Zoo?-;+7*`WOJWsMw(x3WXv`@U*s@Y-&edFEYpz0skP)dFfu zZ4wIp&Vbb!+|0+3Qa}p<*AH-eY>3q8s6?RA)zqP8W39IT5HLFG9m1F);gE|P`L7@@ zctjKsn1rA6!ZZR%R^(SjU!r=2o$yGp<$KViK~{B;AIcgvN+J+&Nvur+W(Sw&=H?z} zGMRW^U!Nl3AvWzQ3~C%Z*G*(?qLfNCq;tpg2yRW4@yl9;p3CK)O-@c8Sy))OUMiKc zQp#QYFZe-*@LZDInR^#F=Bm=!vA2i6tkEJ#i0aggzp2D%3!>h~r~3uLt(-IMoyFAT&uF!>{(iS?1OX-eX zKw9bunxR5FrF6QaYs~9>A4#zW^dwIvCpq(+cfR?U`T6-{9LHUqo16RKcDwUVr?cX4 zIN~hJDs48~aRAJ}U_2g=KAB9SP$;0;Y@*$6Ly{z<(`i^NmbL#1W@l#$wOS3;YPBOE zJ;7`?L*?Ga6XzC292wl75}>gDz`(>h?is$JPxm#0jGnotoK|nAVM5$DQ z!C*kO-aeF@+Ejy?nVHEp8V&F~k7BWicsx!aH9kHLRpcQ?L&JFBAB4i&kAaVUxVvzh z3a-EY0%m%8nhI7|SE(QpiBL#sG#VUMM9}*(0mg2(Q$Zq;z|PJNd_Euiem@;jtJN@i za|c2MmsL?PR;yKNwOUA}QuO=7;V@#c7!{~gs?J7hAlsE7U#g?$aRkhSTqLq6iuCu9 z10_j_=;?Dc?4cZ386qH0HkgHTDT|HmGR`W4V2noNQJqfLJEot)q{V_UtsW+m31cP~ zDwWEi3HYBSoF4M;T?VaIdqinn1HZ9}32qs-PdwPbCf+WI6n9jl0-8cjV3%1FB%B&r z+`mzSliyLSH0dxYE}rk&=!uCa*V>()2znj`_XYjtbt>@4FLHnJE|G`xv)Ba@oLBny z1%3K7c4fiB^4{k6E8Pif0kNy62}b@9+N#0$9Ug7g~-`rQ^qx~m@y2OU8A z#zh~=7n#Z$Z*fx-GOtDf07cgx0suCz_W(2~Y(0tf@FX@P6EPuM_dgn$vj9LucO)%W zw%HgMW>=#oL>nZ>M&NEf08>)#)k<{$fCT_r>rPi=BV=hFh6WS^qqze>C6Ek}o{M5% za|@JGowu0t{&hgNzySHZxy@LTNh);YzZ2zSp_ zl$^T&Dnc|NLb&RD_!4>pt@VHdP)ZGER%5ZmWEe$lryR&y;2u^3cOkO4#6c%-(EY6a{600000NkvXXu0mjfxS2AI diff --git a/web-app/images/skin/house.png b/web-app/images/skin/house.png deleted file mode 100644 index fed62219f57cdfb854782dbadf5123c44d056bd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 806 zcmV+>1KIqEP)v;U&v3%|^C`Ga3?LtY&4dQB4Oz;1v;J%z!D&%WRH@BZ?x; z3)8@IUIv@hG|@IwyHLC`l{1<4BK>wam95g|i|?Cfzt876&-Zx_0f5*l-9`IJI&mHu zE6$@xB)6N}7VeR;!X8D!TAw;;&0Bsj?A071cO>X3K0wl7WZ1;Tg!4LHyNcnzoeQ7t zNW`aSlm8WXYkek&ir$13=ngczvf zV0vnjNpCF&K8px}dunv+`LIb-sOC$_jD(;IBI$xC|7`(+9cA>Vir_V#z{?k7SX^Ah z^71m~W@q439Ycqfhi7+gp#A14n1n1!e>$EdeATG|f798Y=ggzwEKH2Q!qU2QA(Se?dwqG69%>n$6rtE z%F(845Az8c{w(XgimJg96!jLMz?zS6I1HUm2baqQx7&@nx;lhHA!r6vs2|fqJETOu zLxeu2OQ(3(au%dg>AcZsWI(zXn9XJg1cLe8k~0h0wOL=&HK}7X k{AKr*U4z7Szv)i%9gTgghwgU$Q~&?~07*qoM6N<$g31kYk^lez diff --git a/web-app/images/skin/information.png b/web-app/images/skin/information.png deleted file mode 100644 index 12cd1aef900803abba99b26920337ec01ad5c267..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 778 zcmV+l1NHogP)BVme|mWaqy4$_pJm?y9KM{-*hp?1+Ey3e-CEDooTa!B;e(Q>TSF?bj>5At13y1p zriN3w3x~5SfZj{@J4M{kp{?=M_Lh2bV+5LH)Q)5W!-ePA$RgE1@5f1cyHki0Y}JyVEYZF(LD$xXlt$7A5CgE@ zpV-&l%vf;=5kZ2-2gi@Y6J&=cuwt>!vJ^#(&n|LcZyUzi6Duj$$hJ1s*HD-#;k-w@ zpdrwAuoDG_N2bvb07G$Zk*?Hc)JLtW4yqOnic_$zO7NZ#l>Fm){;fE?b$IbOaX2fe z0la4g0Dfw2xk7Wi7NapVD8YMPCZu?A1QCK*67dgsvRKBLFtrM>?$%&_lD1882mzdO zWPdw5KWw6IT`m1b_8=lS5jt8D3=RDa=&jWzR-)S@56WMslZ~mKu1)-wpXB>rNBQ>N zU#K`#1B&v|_AQK;7I~B}OdGiUT9LX>f0xm6<;LeP!=vFjPsUQF*wCJ*dO)4YBypgdiuF!=i@6Zyi7F|q#K zz?tlSZULa@t1D?$e;f@b36&N!V2mjOHw|*FMR=dr@6o0ZXGBB_+=zx3%$`cG63Jm-*84Da1I50Ew7%?y?G#+5$ UVU>wEFhP-tNtBU=gM+~u00(^_>i_@% diff --git a/web-app/images/skin/sorted_desc.gif b/web-app/images/skin/sorted_desc.gif deleted file mode 100644 index 38b3a01d078418d3afcdb2765251a9f21b7995be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 834 zcmZ?wbhEHbWMg1s_|Cu}C@83_tE;D{=jG+)?d|RKCt}{bc?%XSShQ%-?%lih?%lh8 z|9*y1Fd72GGz1iXvM@3*urla?{0GVt3>@+doD32i4hNW;7z9Kl3=A9^nYh^GDt25@ NJj%i*$Hu~74FL5|8=3$B diff --git a/web-app/images/tabbar.png b/web-app/images/tabbar.png deleted file mode 100644 index c737db8f8b682ece6d9e688a1bdd115ee25dd0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3760 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 V<#(1|^5|c`k)D}u4cO)J{{WE|B69!$ diff --git a/web-app/images/tabbar_2.png b/web-app/images/tabbar_2.png deleted file mode 100644 index c737db8f8b682ece6d9e688a1bdd115ee25dd0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3760 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 V<#(1|^5|c`k)D}u4cO)J{{WE|B69!$ diff --git a/web-app/jni/linux/amd64/librxtxSerial.so b/web-app/jni/linux/amd64/librxtxSerial.so deleted file mode 100644 index 06f62463a6b1b111c4943d6e1eacfc922a27b98d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55672 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 P>)vyBSIe2WuB_|dg!Hyf diff --git a/web-app/jni/linux/i686/librxtxSerial.so b/web-app/jni/linux/i686/librxtxSerial.so deleted file mode 100644 index e60c5e674cd579c79fb4654f280c80d528a3cda4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154682 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 diff --git a/web-app/jni/linux/x86_64/librxtxSerial.so b/web-app/jni/linux/x86_64/librxtxSerial.so deleted file mode 100644 index eba4e0e977b84f73a219fdbaab148f10370f89f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138573 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 RI9%o=49Mp}ihghJe*r<=P|^SZ diff --git a/web-app/jni/mac/x86_64/librxtxSerial.jnilib b/web-app/jni/mac/x86_64/librxtxSerial.jnilib deleted file mode 100644 index 3ca1e3b3f6f1843f6627fb1cdba64cc718c29725..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234008 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

    Fa(^x25yw&25otGlUf>A) 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 diff --git a/web-app/jni/windows/i686/win32com.dll b/web-app/jni/windows/i686/win32com.dll deleted file mode 100644 index 75acf09edb678bd157911e7ae67016770c55f986..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27648 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 diff --git a/web-app/jni/windows/javax.comm.properties b/web-app/jni/windows/javax.comm.properties deleted file mode 100644 index 8ea5c8f3c..000000000 --- a/web-app/jni/windows/javax.comm.properties +++ /dev/null @@ -1 +0,0 @@ -Driver=com.sun.comm.Win32Driver From fb9c03f6f2a0d673e6aff034d0226327e850e19d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 15 Jan 2013 14:09:11 +0300 Subject: [PATCH 0308/2668] Dropped mandatory config field contraint; added helper method for retrieving lists of domains --- plugins/frontlinesms-core/application.properties | 2 +- .../grails-app/domain/frontlinesms2/Step.groovy | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index ec0d49169..fdfb5d91d 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Thu Nov 15 15:41:15 EAT 2012 +#Tue Jan 15 12:59:24 EAT 2013 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index 1591b2310..1b46f1abe 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -6,11 +6,7 @@ abstract class Step { static configFields = [:] static constraints = { - // the following assumes all configFields are mandatory - stepProperties(nullable: true, validator: { val, obj -> - if (!val) return false - val*.key?.containsAll(obj.configFields?.collect { name, type -> name }) - }) + } def process(Fmessage message) { @@ -20,4 +16,11 @@ abstract class Step { String getPropertyValue(key) { stepProperties?.find { it.key == key }?.value } + + // helper method to retrieve list of entities saved as StepProperties + def getEntityList(entityType, propertyName) { + println "ALL STEP PROPERTIES::: ${stepProperties.findAll { true }.collect { it.key + ' ' + it.value }}" + println "entityType getall: ${entityType.getAll([1,2])}" + entityType.getAll(stepProperties.findAll { it.key == propertyName }*.value) - null + } } From c1163a4d72218d4018c507b199fd8acc95a21d6f Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Tue, 15 Jan 2013 14:11:55 +0300 Subject: [PATCH 0309/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt --- .../web-app/help/core/activities/3.creating_a_poll.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index f30ae4c46..54a47143c 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -38,7 +38,9 @@ You will be able to specify a keyword, that when included in an incoming message ![Automatic Sorting][17] -_**Note:** Top Level Keywords are **unique.** Once a top level keyword has been used in an activity it cannot be used in another activity, unless that activity is archived or deleted. For a poll, if the top level keyword is not provided the keywords for the responses become top level keywords, and hence forth they have to be unique across all the activity top level keywords. +_**Note:** Top Level Keywords are **unique.** Once a top level keyword has been used in an activity it cannot be used in another activity, unless that activity is archived or deleted. + +In polls, top-level responses are optional. If you decide to allow respondents to text in only one word to vote, i.e. not to provide a top-level keyword, then the response keywords are treated as top-level and must be unique across all the activity top level keywords. To set the keywords, select "Sort responses automatically. Sort messages with the keyword (optional):" and then enter your top level keywords. The top level keywords are optional. From 36906deceecddab94a8a80614abe6fb7d144f58f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 15 Jan 2013 14:15:17 +0300 Subject: [PATCH 0310/2668] added custom activity popup files --- .../CustomActivityController.groovy | 13 ++++++++++ .../frontlinesms2/CustomActivity.groovy | 5 ++++ .../CustomActivityService.groovy | 9 +++++++ .../views/customactivity/_confirm.gsp | 26 +++++++++++++++++++ .../grails-app/views/customactivity/_save.gsp | 6 +++++ .../views/customactivity/_validate.gsp | 3 +++ .../views/customactivity/create.gsp | 10 +++++++ 7 files changed, 72 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomActivityController.groovy create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/_confirm.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/_save.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomActivityController.groovy new file mode 100644 index 000000000..057e2f724 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomActivityController.groovy @@ -0,0 +1,13 @@ +package frontlinesms2 + +class CustomActivityController { + def customActivityService + + def save() { + withCustomActivity { customActivity -> + //TODO implement create and edit of CustomActivity + } + } + + private def withCustomActivity = withDomainObject CustomActivity, { params.ownerId } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy new file mode 100644 index 000000000..4775b56b0 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy @@ -0,0 +1,5 @@ +package frontlinesms" + +class CustomActivity extends Activity { + +} diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy new file mode 100644 index 000000000..c18a6226c --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -0,0 +1,9 @@ +package frontlinesms2 + +class CustomActivityService { + static transactional = true + + def saveInstance(customActivity, params) { + //TODO implement saving of different steps of the customActivity + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_confirm.gsp new file mode 100644 index 000000000..364311abf --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_confirm.gsp @@ -0,0 +1,26 @@ +

    + + +
    +
    +

    + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_save.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_save.gsp new file mode 100644 index 000000000..13be3f1d8 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_save.gsp @@ -0,0 +1,6 @@ +
    + +

    +

    +

    +
    diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp new file mode 100644 index 000000000..865863e41 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -0,0 +1,3 @@ + + + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp new file mode 100644 index 000000000..bbad22568 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp @@ -0,0 +1,10 @@ + + From 8e3345aff7c892385b0faa2c8561810f0d2c8ee2 Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Tue, 15 Jan 2013 14:15:33 +0300 Subject: [PATCH 0311/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt --- .../web-app/help/core/activities/3.creating_a_poll.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index 54a47143c..42dfc71f9 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -34,17 +34,13 @@ Boxes A-C will be immediately available to you to edit. If you need more than 3 Once you have entered all your choices, click next to set up Automatic Sorting. ### Automatic Sorting -You will be able to specify a keyword, that when included in an incoming message, will allow the system to automatically sort it into the relevant Poll. +First, you can choose whether or not FrontlineSMS will process incoming SMS automatically using a keyword for this activity. If you choose not to, then only messages you manually move into this activity will be processed. To sort using a keyword, select 'sort responses automatically'. ![Automatic Sorting][17] -_**Note:** Top Level Keywords are **unique.** Once a top level keyword has been used in an activity it cannot be used in another activity, unless that activity is archived or deleted. +_**Note:** Top Level Keywords are **unique.** Once a top level keyword has been used in an activity it cannot be used in another activity, unless that activity is archived or deleted. In polls, top-level responses are optional. If you decide to allow respondents to text in only one word to vote, i.e. not to provide a top-level keyword, then the response keywords are treated as top-level and must be unique across all the activity top level keywords. -In polls, top-level responses are optional. If you decide to allow respondents to text in only one word to vote, i.e. not to provide a top-level keyword, then the response keywords are treated as top-level and must be unique across all the activity top level keywords. - -To set the keywords, select "Sort responses automatically. Sort messages with the keyword (optional):" and then enter your top level keywords. The top level keywords are optional. - -When you set a keyword, and have selected a Multiple Choice Poll type, it will be possible for you to set "Response Keywords" in the lower section of the same tab. These "Response keywords are the keywords that matched to the responses entered in the previous tab." +To set the keywords, select "Sort responses automatically.' and then set the keywords in the text boxes below. #### Note From 26d1b4edbc3a2228dd9dbc8e72e2c928ac14452c Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 15 Jan 2013 14:41:06 +0300 Subject: [PATCH 0312/2668] Added test for getEntityList helper method in Step --- .../domain/frontlinesms2/Step.groovy | 10 ++++---- .../domain/JoinActionStepISpec.groovy | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index 1b46f1abe..504671c68 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -6,7 +6,11 @@ abstract class Step { static configFields = [:] static constraints = { - + // the following assumes all configFields are mandatory + stepProperties(nullable: true, validator: { val, obj -> + if (!val) return false + val*.key?.containsAll(obj.configFields?.collect { name, type -> name }) + }) } def process(Fmessage message) { @@ -19,8 +23,6 @@ abstract class Step { // helper method to retrieve list of entities saved as StepProperties def getEntityList(entityType, propertyName) { - println "ALL STEP PROPERTIES::: ${stepProperties.findAll { true }.collect { it.key + ' ' + it.value }}" - println "entityType getall: ${entityType.getAll([1,2])}" - entityType.getAll(stepProperties.findAll { it.key == propertyName }*.value) - null + entityType.getAll(StepProperty.findAllByStepAndKey(this, propertyName)*.value) - null } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy index 761fec90b..6c2055253 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy @@ -18,4 +18,28 @@ class JoinActionStepISpec extends grails.plugin.spock.IntegrationSpec { true | 'woteva' | false true | 'group' | true } + + def "Can retrieve Contacts stored as StepProperties"() { + given: + def contactList = [] + (1..20).each { + contactList << new Contact(name:"test-${it}", mobile:"number-${it}").save(failOnError:true) + } + def step = new JoinActionStep(type: 'joinAction') + // to make it pass validation + step.addToStepProperties(new StepProperty(key:"group", value:"invaluable")).save(failOnError:true) + contactList.each { + step.addToStepProperties(new StepProperty(key:'contactId', value:it.id)) + } + (11121..11130).each { + // add ids for non-existant contactIds to simulate deleted contacts + step.addToStepProperties(new StepProperty(key:'contactId', value:it)) + } + step.save(flush:true, failOnError:true) + when: + println "STEP PROPERTIES :::: ${step.stepProperties}" + def retrievedContacts = step.getEntityList(Contact, "contactId") + then: + retrievedContacts.sort { it.id } == contactList + } } From 478a085708a1673ae24f3e791852388fd18f4437 Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Tue, 15 Jan 2013 14:47:32 +0300 Subject: [PATCH 0313/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt --- .../core/activities/3.creating_a_poll.txt | 49 +------------------ 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index 42dfc71f9..80ddabe7b 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -42,54 +42,7 @@ _**Note:** Top Level Keywords are **unique.** Once a top level keyword has been To set the keywords, select "Sort responses automatically.' and then set the keywords in the text boxes below. -#### Note - -Poll initially supported use of "Aliases". A user would setup a poll with with one keyword and the responses would be mapped to aliases. A response could have one or more aliases seperated with commas. - -For example, in version 2.1.3, a poll would look like this - - Poll Name : Football Poll - Keyword : Football - - Responses | Aliases - Manchester United | Manu, Manchster - Arsenal | Arsenal, Ars - -With version 2.2 as a user you can create a poll with a top level keyword and the aliases are now converted to second level keywords. - -In version 2.2.0 Polls would look like this - - Poll Name: Footbal Poll - TopLevel Keyword : Football, Foot, Footy - - Responses | Second Level Keywords - Manchester United | Manu, Manchster - Arsenal | Arsenal, Ars, Arnl - -As you can see from above the aliases have been replaced with second level keywords. The top level keyword is optional. -If a top level keyword is provided messages will be mapped to resposes as follows - - Incoming Message | Response Mapped To - football manu | Mancheter United - foot manu | Mancheter United - footy manu | Mancheter United - football arsenal | Arsenal - football ars | Arsenal - footy arsenal | Arsenal - foot arsl | Arsenal - -If the top level keyword is not provided, then the incoming messages will be mapped to responses as follows - -Incoming Message | Response Mapped To -manu | Mancheter United -manchester | Mancheter United -arsenal | Arsenal -ars | Arsenal - -The person texting in only needs to test in at least one of the second level keywords. - -This feature is quite usefull if you want frontlinesms to handle spelling mistakes in the incoming sms. For example, for the top level keyword one can have the keywords "football, footbal, fotball". This spelling handling also applies to second level keywords - +For any keyword, including each response, you can enter any number of keywords separated by commas. With this setting, any incoming message that starts with one of those keywords will trigger the activity. This means that you can cater for spelling errors, different languages, and other reasons for differing keywords. The Sorting tab looks as follows From cd886dfdeb3e8342c19568da5656acff0e3f042d Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 15 Jan 2013 14:52:11 +0300 Subject: [PATCH 0314/2668] [CORE-1827] Added test for checking single contacts --- .../frontlinesms2/contact/ContactListSpec.groovy | 14 ++++++++++++++ .../frontlinesms2/page/PageContact.groovy | 1 + 2 files changed, 15 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy index 92bb6f773..07fc92cc4 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy @@ -173,4 +173,18 @@ class ContactListSpec extends ContactBaseSpec { waitFor { at PageSearchResult } messageList.messages.size() == 21 } + + def "unchecking a contact should not result in a checking of any contact check boxs"() { + given: + createManyContacts() + when: + to PageContactShow + contactList.selectContact 0 + then: + waitFor { contactList.selectedContact.size() == 1} + when: + contactList.selectContact 0 + then: + !contactList.selectAll.checked + } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy index 988819d75..a2e3208c9 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/page/PageContact.groovy @@ -75,6 +75,7 @@ class ContactList extends geb.Module { } selectAll(required:false) { $('.contact-select', 0)} + selectedContact(required:false) { $('li.contact-preview.selected')} selectedContacts { $(".selected li a")*.text() } noContent { $('p.no-content').text() } } From 757c26c4c6bd80b51085a67adbca8ba36d3cb2ef Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Tue, 15 Jan 2013 14:59:13 +0300 Subject: [PATCH 0315/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt --- .../help/core/activities/3.creating_a_poll.txt | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index 80ddabe7b..4d02f4722 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -44,18 +44,15 @@ To set the keywords, select "Sort responses automatically.' and then set the key For any keyword, including each response, you can enter any number of keywords separated by commas. With this setting, any incoming message that starts with one of those keywords will trigger the activity. This means that you can cater for spelling errors, different languages, and other reasons for differing keywords. -The Sorting tab looks as follows +Default keywords will be pre-entered, but can be edited here. ![Keywords][17] -Each choice is followed by an area where you can enter text. You will see two aliases already entered into the text area. These are the default settings. - -You can add more aliases simple by adding to the string of text already in the text area. Separate each response keyword with a comma. An example would be: +An example would be: "Yes, A, yeah, yeh" - -Furthermore, the first entry in the text area corresponds to the text that will be used when generating a message in the "Edit Message" step. To change how each choice appears in the message that will be send out, change the first entry in the text area. +The first response keyword will be the one used in generating a sample message in the "Edit Message" step. To change how each choice appears in the message that will be sent out, change the first entry in the text area. If the text area looks like this for example: @@ -65,15 +62,6 @@ Then "Yeah" will be used as part of the outgoing message text for the Poll. Once you have completed this section click "Next" to set up an "Automatic Reply". -### Validation of Keywords (Important) - -All keywords, toplevel or second level keywords need to be unique within that poll. For example ,a Football poll could have "football" as a top level keyword but not as a second level keyword. Likewise keywords among the second level keywords need to be unique among themselves. -In any poll if the top level keyword is not provided, then the second level keywords will be treated as top level. - -### Important: - -Top level keywords need to be unique across all activities. A poll and an autoreply cannot share a top level keywords. For more information regarding keywords in autoreplies see the autoreply section. - **_Automatic Reply_** At this screen you can choose to enter a message that will be automatically sent to the senders of messages identified as poll responses. This can only be selected if you have chosen to use a keyword with your poll. Without a keyword the system cannot recognise which messages to automatically reply to. The automatic reply option will be unavailable until you create a keyword for your poll. From 9b0d7a42de56530af3a3a2f04f53e53c5646c38d Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Tue, 15 Jan 2013 15:01:45 +0300 Subject: [PATCH 0316/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt --- .../core/activities/3.creating_a_poll.txt | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt index 4d02f4722..b565231f5 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt @@ -64,11 +64,13 @@ Once you have completed this section click "Next" to set up an "Automatic Reply" **_Automatic Reply_** At this screen you can choose to enter a message that will be automatically sent to the senders of messages identified as poll responses. This can only be selected if you have chosen to use a keyword with your poll. Without a keyword the system cannot recognise which messages to automatically reply to. + The automatic reply option will be unavailable until you create a keyword for your poll. ![Automatic Reply][12] -To enable an automatic reply, check the "Send an automatic reply to poll responses" box and enter your message in the message. +To enable an automatic reply, check the "Send an automatic reply to poll responses" box and enter your message in the text box. + This message will be sent out to everyone who sends a message with the keyword you set up in the previous step. **_Note:** This is different from the [auto-reply activity][3]._ @@ -78,21 +80,7 @@ This screen will provide you with an opportunity to view the message that will b ![Edit Message][13] -The message will be compiled from the options you have selected in previous steps. - -If you selected "yes or no" as the question type and created a keyword the default message will look like this: ->"[Your Question]? Reply "[Keyword] A" for yes, "[Keyword] B" for no." - -If you did not create a keyword then the message will look like this: ->"[Your Question]? Please reply 'Yes' or 'No'" - -If you selected "Multiple Choice Question" as question type and created a keyword, the default message will look like this: ->"[Your Question]? Reply "[Keyword] A" for [Multiple Choice A], "[Keyword] B" for [Multiple Choice B], "[Keyword] C" for [Multiple >Choice C], "[Keyword] D" for [Multiple Choice D], "[Keyword] E" for [Multiple Choice E]." - -If you did not create a keyword then the message will look like this: ->"[Your Question]? Please reply '[Multiple Choice A]' or '[Multiple Choice B]' or '[Multiple Choice C]' or '[Multiple Choice D]' or >'[Multiple Choice E]' - -Once you are happy with the message, please click 'Next'. +The message will be compiled from the options you have selected in previous steps. Once you are happy with the message, please click 'Next'. **_Select Recipients_** On this screen you will be able to either add the numbers of the people you want to send the poll to, or select them from your contacts list. @@ -100,10 +88,9 @@ On this screen you will be able to either add the numbers of the people you want ![Select Recipients][14] If you add a number manually it will be added to the list and automatically selected. This number will only remain in the system for as long as it needs to send the message and will not be added to your contacts. -Selecting groups and contacts is easy, simply select the contacts or groups you want to send the poll. **_Summary Screen_** -On this screen you will find a summary of all the options you have selected, so you can confirm that what you have created is what you would like to send. +On this screen you will find a summary of all the options you have selected, the message you've created (if applicable) and the recipients you've chosen. ![Summary][15] From 7c97c81ea2071cff88ca38b9a77aa482aaec2a18 Mon Sep 17 00:00:00 2001 From: laurawhudson Date: Tue, 15 Jan 2013 15:02:47 +0300 Subject: [PATCH 0317/2668] Update plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt --- .../web-app/help/core/activities/3a.manually_categorising.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt b/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt index abc46d38c..832c5d693 100644 --- a/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt +++ b/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt @@ -11,9 +11,9 @@ A Poll will attempt to automatically categorize incoming responses according to 3. From the message details, open the drop down box called "Categorize Response". 4. From this list choose the appropriate response for the message or messages. -_**Note:** For [Yes/No Polls][2], the only categories available will be Yes or No. For [Multiple Choice Polls][2] the available categories will be the same in number and >name as the multiple choice options you entered when creating the Poll._ +_**Note:** For [Yes/No Polls][2], the only categories available will be Yes or No. For [Multiple Choice Polls][2] the available categories will be the same in number and name as the multiple choice options you entered when creating the Poll._ -Your message/s will be updated with new categories and the poll statistics will be updated accordingly. +Your message(s) will be updated with new categories and the poll statistics will be updated accordingly. ### Related Actions [Renaming an Activity][3] From 9f4a7a4717d0e08abf91f83ac01d9ea125320b35 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 15 Jan 2013 15:33:48 +0300 Subject: [PATCH 0318/2668] Tests for CORE-1728 and CORE-1729 --- .../frontlinesms2/SubscriptionService.groovy | 9 +- .../frontlinesms2/SubscriptionSpec.groovy | 54 ++------- .../services/SubscriptionServiceSpec.groovy | 109 ++++++++++++++++++ 3 files changed, 126 insertions(+), 46 deletions(-) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy index 6ff737483..c2af0aafd 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy @@ -36,8 +36,13 @@ class SubscriptionService { return subscriptionInstance } - def doJoin() { - + def doJoin(subscriptionOrJoinActionStep, message) { + } + + def doLeave(subscriptionOrLeaveActionStep, message) { + } + + def doToggle(subscription, message) { } } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy index b7e22bd73..74419d810 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy @@ -21,65 +21,31 @@ class SubscriptionSpec extends Specification { Subscription.metaClass.addToMessages = { m -> m } } - def 'join autoreply message should be sent when join action is triggered'() { + def 'subscriptionService.doJoin is called when processJoin is called'() { given: - def sendService = Mock(MessageSendService) - s.messageSendService = sendService - - def replyMessage = mockFmessage("woteva") - sendService.createOutgoingMessage({ params -> - params.addresses==TEST_CONTACT && params.messageText=='you have joined' - }) >> replyMessage + def subscriptionService = Mock(SubscriptionService) when: processKeyword("KEY JOIN", TEST_CONTACT, "JOIN") then: - 1 * sendService.send(replyMessage) + 1 * subscriptionService.doJoin(_) } - def 'leave autoreply message should be sent when leave action is triggered'() { + def 'subscriptionService.doLeave is called when processLeave is called'() { given: - def sendService = Mock(MessageSendService) - s.messageSendService = sendService - - def replyMessage = mockFmessage("woteva") - sendService.createOutgoingMessage({ params -> - params.addresses==TEST_CONTACT && params.messageText=='you have left' - }) >> replyMessage + def subscriptionService = Mock(SubscriptionService) when: processKeyword("KEY LEAVE", TEST_CONTACT, "LEAVE") then: - 1 * sendService.send(replyMessage) + 1 * subscriptionService.doLeave(_) } - def 'correct autoreply message for join should be sent when toggle action is triggered'() { + def 'subscriptionService.doToggle is called when processToggle is called'() { given: - def sendService = Mock(MessageSendService) - s.messageSendService = sendService - - def replyMessage = mockFmessage("woteva") - sendService.createOutgoingMessage({ params -> - params.addresses==TEST_CONTACT && params.messageText=='you have joined' - }) >> replyMessage - when: - processKeyword("KEY", TEST_CONTACT, null) - then: - 1 * sendService.send(replyMessage) - } - - def 'correct autoreply message for leave should be sent when toggle action is triggered'() { - given: - def sendService = Mock(MessageSendService) - s.messageSendService = sendService - c.addToGroups(g) - - def replyMessage = mockFmessage("woteva") - sendService.createOutgoingMessage({ params -> - params.addresses==TEST_CONTACT && params.messageText=='you have left' - }) >> replyMessage + def subscriptionService = Mock(SubscriptionService) when: - processKeyword("KEY", TEST_CONTACT, null) + processKeyword("KEY TOGGLE", TEST_CONTACT, "TOGGLE") then: - 1 * sendService.send(replyMessage) + 1 * subscriptionService.doToggle(_) } private def createTestSubscriptionAndGroup() { diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy new file mode 100644 index 000000000..986aad30e --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy @@ -0,0 +1,109 @@ +package frontlinesms2.services + +import frontlinesms2.* +import spock.lang.* +import grails.buildtestdata.mixin.Build + +@TestFor(SubscriptionService) +@Build([Group, SmartGroup, Contact, Fmessage, Subscription, GroupMembership]) +class SubscriptionServiceSpec extends Specification { + def s, c, g, service + + private static final String TEST_CONTACT = '+1111111111' + private static final String TEST_NON_CONTACT = '+2222222222' + + def setup() { + service = new SubscriptionService() + createTestSubscriptionAndGroup() + createTestContact() + Subscription.metaClass.addToMessages = { m -> m } + } + + def 'join autoreply message should be sent when doJoin is triggered'() { + given: + def sendService = Mock(MessageSendService) + s.messageSendService = sendService + + def replyMessage = mockFmessage("woteva") + sendService.createOutgoingMessage({ params -> + params.addresses==TEST_CONTACT && params.messageText=='you have joined' + }) >> replyMessage + when: + service.doJoin(s, mockFmessage("doesntmatter")) + then: + 1 * sendService.send(replyMessage) + } + + def 'leave autoreply message should be sent when doLeave is triggered'() { + given: + def sendService = Mock(MessageSendService) + s.messageSendService = sendService + + def replyMessage = mockFmessage("woteva") + sendService.createOutgoingMessage({ params -> + params.addresses==TEST_CONTACT && params.messageText=='you have left' + }) >> replyMessage + when: + service.doLeave(s, mockFmessage("doesntmatter")) + then: + 1 * sendService.send(replyMessage) + } + + def 'correct autoreply message for join should be sent when toggle action is triggered'() { + given: + def sendService = Mock(MessageSendService) + s.messageSendService = sendService + + def replyMessage = mockFmessage("woteva") + sendService.createOutgoingMessage({ params -> + params.addresses==TEST_CONTACT && params.messageText=='you have joined' + }) >> replyMessage + when: + service.doToggle(s, mockFmessage("doesntmatter")) + then: + 1 * sendService.send(replyMessage) + } + + def 'correct autoreply message for leave should be sent when toggle action is triggered'() { + given: + def sendService = Mock(MessageSendService) + s.messageSendService = sendService + c.addToGroups(g) + + def replyMessage = mockFmessage("woteva") + sendService.createOutgoingMessage({ params -> + params.addresses==TEST_CONTACT && params.messageText=='you have left' + }) >> replyMessage + when: + service.doToggle(s, mockFmessage("doesntmatter")) + then: + 1 * sendService.send(replyMessage) + } + + private def createTestSubscriptionAndGroup() { + g = new Group(name:"Subscription Group").save() + s = new Subscription(name:"test subscription", group:g, joinAliases:"join", joinAutoreplyText:"you have joined", leaveAutoreplyText:"you have left", leaveAliases:"leave").save() + } + + //> HELPERS + private def processKeyword(String messageText, String sourcePhoneNumber, String ownerDetail) { + def k = Mock(Keyword) + k.ownerDetail >> ownerDetail + s.processKeyword(mockMessage(messageText, sourcePhoneNumber), k) + } + + private def createTestContact() { + c = Contact.build(mobile:TEST_CONTACT) + } + + private def mockMessage(String messageText, String sourcePhoneNumber) { + return Fmessage.build(text:messageText, src:sourcePhoneNumber) + } + + private def mockFmessage(String messageText, String src=null) { + Fmessage m = Mock() + m.text >> messageText + m.src >> src + return m + } +} From dcc14c33242e6fb951745cfe972b4222a5136f3a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 15 Jan 2013 15:38:41 +0300 Subject: [PATCH 0319/2668] fix --- .../frontlinesms-core/application.properties | 2 +- .../grails-app/conf/CoreBootStrap.groovy | 7 ++++ .../frontlinesms2/CustomActivity.groovy | 4 +- .../activity/customactivity/_list_head.gsp | 9 +++++ .../customactivity/_message_actions.gsp | 0 .../views/activity/customactivity/show.gsp | 1 + .../views/customactivity/_config.gsp | 28 +++++++++++++ .../views/customactivity/_validate.gsp | 40 +++++++++++++++++++ .../views/customactivity/create.gsp | 4 +- 9 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/activity/customactivity/_message_actions.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/activity/customactivity/show.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index fdfb5d91d..786ebb70f 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Tue Jan 15 12:59:24 EAT 2013 +#Tue Jan 15 14:24:04 EAT 2013 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 61b81347e..52df2b866 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -74,6 +74,7 @@ class CoreBootStrap { dev_initAnnouncements() dev_initSubscriptions() dev_initWebconnections() + dev_initCustomActivities() dev_initLogEntries() } @@ -433,6 +434,12 @@ class CoreBootStrap { footballGroup.save(failOnError:true) } + + private def dev_initCustomActivities() { + new CustomActivity(name:'Do it all') + .addToKeywords(value:"CUSTOM") + .save(failOnError:true) + } private def dev_initLogEntries() { if(!bootstrapData) return diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy index 4775b56b0..b9cd9182e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy @@ -1,5 +1,5 @@ -package frontlinesms" +package frontlinesms2 class CustomActivity extends Activity { - + def shortName = "customactivity" } diff --git a/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp new file mode 100644 index 000000000..614df7ebc --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp @@ -0,0 +1,9 @@ +
      +

      + +

      +
    • + +
      • +
    + diff --git a/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_message_actions.gsp b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_message_actions.gsp new file mode 100644 index 000000000..e69de29bb diff --git a/plugins/frontlinesms-core/grails-app/views/activity/customactivity/show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/show.gsp new file mode 100644 index 000000000..f03946781 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/show.gsp @@ -0,0 +1 @@ + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp new file mode 100644 index 000000000..b7046e5f7 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp @@ -0,0 +1,28 @@ +
    + +
    +
    +
    Join
    +
    Leave
    +
    Reply
    +
    + + \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 865863e41..d95662ac8 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -1,3 +1,43 @@ +<%@ page import="frontlinesms2.Group" %> + function initializePopup() { + $("#add-join-action-step").click(function() { addJoinActionStep(); }); + $("#add-leave-action-step").click(function() { addLeaveActionStep(); }); + $("#add-reply-action-step").click(function() { addReplyActionStep(); }); + } + + function addJoinActionStep(){ + var container = $("#custom-activity-config-container"); + container.append(joinActionStepHtml); + } + + function addLeaveActionStep(){ + var container = $("#custom-activity-config-container"); + container.append("
    Leaving Group
    "); + } + + function addReplyActionStep(){ + var container = $("#custom-activity-config-container"); + container.append("
    Replying to Humans
    "); + } + + function updateConfirmationMessage() { + + } + + var joinActionStepHtml = function(){ + var divElement = $("
    "); + divElement.append("

    Join Group

    "); + <% + def groupSelect = g.select(name:"joinGroup", class:"dropdown not-empty" ,from:Group.getAll() , noSelection:"Select a group.." ,optionKey:"id",optionValue:"name") + %> + divElement.append("${groupSelect}"); + return divElement; + }; + + var leaveActionStepHtml = ""; + + var replyActionStepHTml = ""; + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp index bbad22568..234f538d4 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/create.gsp @@ -6,5 +6,5 @@ templates="/activity/generic/sorting, /customactivity/config, /customactivity/confirm, - /customactivty/save, - /customactivty/validate"/> + /customactivity/save, + /customactivity/validate"/> From d4cc76e1de22c94af5ffa98ec52dd3338e94fdc4 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 15 Jan 2013 15:43:31 +0300 Subject: [PATCH 0320/2668] Fixed CORE-1386 CSS for webconnection and fconnection type radio lists. --- .../views/activity/create_new_activity.gsp | 2 +- .../grails-app/views/connection/_type.gsp | 2 +- .../grails-app/views/webconnection/_type.gsp | 2 +- .../frontlinesms-core/web-app/css/activity.css | 6 +----- .../web-app/css/activity/webconnection.css | 2 -- .../frontlinesms-core/web-app/css/wizard.css | 18 ++++++++++-------- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp index fe2822bc2..24369686f 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp @@ -19,7 +19,7 @@ -
    +
  • diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 5b9e5d821..f427fda40 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -27,7 +27,7 @@ var messageTextValidation = function() { updateConfirmationMessage(); - return validator.element('#messageText'); + return validator.element('#autoreplyText'); }; var confirmTabValidation = function() { @@ -142,19 +142,19 @@ var output = ""; var stepType = $(element).find('input#stepType').val(); if(stepType == 'join') { - var groupValue = $(element).find('#joinGroup').val(); - var groupName = $(element).find('#joinGroup').find("option[value="+groupValue+"]").text() + var groupValue = $(element).find('#group').val(); + var groupName = $(element).find('#group').find("option[value="+groupValue+"]").text() output = i18n("customactivity.group.join", groupName); output = "

    "+output+"

    "; } if(stepType == "leave") { - var groupValue = $(element).find('#leaveGroup').val(); - var groupName = $(element).find('#leaveGroup').find("option[value="+groupValue+"]").text() + var groupValue = $(element).find('#group').val(); + var groupName = $(element).find('#group').find("option[value="+groupValue+"]").text() output = i18n("customactivity.group.leave", groupName); output = "

    "+output+"

    "; } if(stepType == "reply") { - var messageText = $(element).find('#messageText').val(); + var messageText = $(element).find('#autoreplyText').val(); output = i18n("customactivity.reply.messagetext", messageText); output = "

    "+output+"

    "; } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy index 87f089fca..c6364e39b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy @@ -120,7 +120,6 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { def activity = CustomActivity.findByName("This is it") activity.name == "This is it" activity.steps.size() == 4 - } } \ No newline at end of file From 36e634098cab776d04c109fa5ca71f0913d8002e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 17 Jan 2013 21:40:24 +0300 Subject: [PATCH 0394/2668] refractored edit and create tests for CustomactivityCedSpec --- .../CustomActivityBaseSpec.groovy | 4 +-- .../CustomActivityCedSpec.groovy | 32 +++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityBaseSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityBaseSpec.groovy index 98ac7a56b..0160e05c5 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityBaseSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityBaseSpec.groovy @@ -4,8 +4,8 @@ import frontlinesms2.* class CustomActivityBaseSpec extends grails.plugin.geb.GebSpec { def createTestCustomActivities() { - def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")).save(failOnError:true,flush:true) - def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")).save(failOnError:true,flush:true) + def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:Group.list()[0].id)).save(failOnError:true,flush:true) + def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:Group.list()[1].id)).save(failOnError:true,flush:true) new CustomActivity(name:'Do it all') .addToSteps(joinStep) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy index c6364e39b..25b2b6a43 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy @@ -77,16 +77,22 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { next.click() configure.stepButton("reply").click() configure.stepButton("join").click() - configure.steps[0].jquery.find("#messageText").value("Sample Text") - configure.steps[1].jquery.find("#joinGroup").value(Group.list()[0].id) + configure.steps[0].jquery.find("#autoreplyText").value("Sample Text") + configure.steps[1].jquery.find("#group").value(Group.findByName("Camping").id) next.click() - confirm.name.value("This is it") + confirm.name.value("Wewe wacha hakuna haja") then: confirm.stepActionsConfirm.contains("Camping") confirm.stepActionsConfirm.contains("Sample Text") submit.click() - def activity = CustomActivity.findByName("This is it") - activity.name == "This is it" + waitFor("very slow") { summary.displayed } + cancel.click() + when: + to PageMessageCustomActivity, CustomActivity.findByName("Wewe wacha hakuna haja") + then: + waitFor { title?.toLowerCase().contains("custom activity") } + def activity = CustomActivity.findByName("Wewe wacha hakuna haja") + activity.name == "Wewe wacha hakuna haja" activity.steps.size() == 2 } @@ -109,16 +115,22 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { when: configure.stepButton("reply").click() configure.stepButton("join").click() - configure.steps[2].jquery.find("#messageText").value("Sample Text") - configure.steps[3].jquery.find("#joinGroup").value(Group.list()[0].id) + configure.steps[2].jquery.find("#autoreplyText").value("Sample Text") + configure.steps[3].jquery.find("#group").value(Group.findByName("Camping").id) next.click() - confirm.name.value("This is it") + confirm.name.value("ni hivyo hivyo tu") then: confirm.stepActionsConfirm.contains("Camping") confirm.stepActionsConfirm.contains("Sample Text") submit.click() - def activity = CustomActivity.findByName("This is it") - activity.name == "This is it" + waitFor("very slow") { summary.displayed } + cancel.click() + when: + to PageMessageCustomActivity, CustomActivity.findByName("ni hivyo hivyo tu") + then: + waitFor { title?.toLowerCase().contains("custom activity") } + def activity = CustomActivity.findByName("ni hivyo hivyo tu") + activity.name == "ni hivyo hivyo tu" activity.steps.size() == 4 } From ac825fb7caf9b64f86a4d7567da0850000dad77a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 17 Jan 2013 22:03:48 +0300 Subject: [PATCH 0395/2668] attempted bug fix in chrome --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 8 ++++---- .../grails-app/views/customactivity/_validate.gsp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 652f01065..88322eb80 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -349,7 +349,7 @@ class FsmsTagLib { out << "
    " out << "
    " out << "Join Group" - out << g.hiddenField(name:'stepId', value:"${att.step?.id?:''}") + out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'join') out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name") out << "
    " @@ -359,7 +359,7 @@ class FsmsTagLib { out << "
    " out << "
    " out << "Leave Group" - out << g.hiddenField(name:'stepId', value:"${att.step?.id?:''}") + out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'leave') out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name") out << "
    " @@ -369,9 +369,9 @@ class FsmsTagLib { out << "
    " out << "
    " out << "Reply" - out << g.hiddenField(name:'stepId', value:"${att.step?.id?:''}") + out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'reply') - out << g.textArea(name:'autoreplyText', value:"${att.step?.autoreplyText?:''}") + out << g.textArea(name:'autoreplyText', value:(att.step?.autoreplyText?:'')) out << "
    " } diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index f427fda40..222c6fa11 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -53,7 +53,7 @@ function addReplyActionStep() { var container = $("#custom-activity-config-container"); - container.append(replyActionStepHTml); + container.append(replyActionStepHtml); } function addRemoveListener(element) { @@ -112,7 +112,7 @@ <% def divElement = fsms.joinActionStep() %> - var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); + var divElement = $(${divElement}).attr("index", (parseInt(indexOfLastStep()) + 1)); addRemoveListener(divElement.find('.remove-step')); return divElement; }; @@ -121,16 +121,16 @@ <% divElement = fsms.leaveActionStep() %> - var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); + var divElement = $(${divElement}).attr("index", (parseInt(indexOfLastStep()) + 1)); addRemoveListener(divElement.find('.remove-step')); return divElement; }; - var replyActionStepHTml = function() { + var replyActionStepHtml = function() { <% divElement = fsms.replyActionStep() %> - var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); + var divElement = $(${divElement}).attr("index", (parseInt(indexOfLastStep()) + 1)); addRemoveListener(divElement.find('.remove-step')); return divElement; }; From 79712536fbc75966d646319ffe85917f09b32894 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 18 Jan 2013 10:00:27 +0300 Subject: [PATCH 0396/2668] Removed unnecessary test case in the JoinActionStepISpec --- .../integration/frontlinesms2/domain/JoinActionStepISpec.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy index 6c2055253..c6b207bd1 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/JoinActionStepISpec.groovy @@ -14,8 +14,6 @@ class JoinActionStepISpec extends grails.plugin.spock.IntegrationSpec { step.validate() == expectedOutcome where: addStepProperty | stepPropertyKey | expectedOutcome - false | null | false - true | 'woteva' | false true | 'group' | true } From d854358eba67850a9876cdae8bc275359515c834 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 18 Jan 2013 10:43:05 +0300 Subject: [PATCH 0397/2668] CustomActivityServiceSpec reverted to old mock invocation tests --- .../services/CustomActivityServiceSpec.groovy | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy index 6b201cd50..82ab42ddb 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy @@ -18,9 +18,9 @@ class CustomActivityServiceSpec extends Specification { when: service.triggerSteps(c, m) then: - 1 * joinStep.doAction(_) >> { m -> assert true; return true } - 1 * leaveStep.doAction(_) >> { m -> assert true; return true } - 1 * replyStep.doAction(_) >> { m -> assert true; return true } + 1 * joinStep.doAction(_) + 1 * leaveStep.doAction(_) + 1 * replyStep.doAction(_) } private def createTestCustomActivity() { @@ -28,9 +28,6 @@ class CustomActivityServiceSpec extends Specification { joinStep = Mock(JoinActionStep) leaveStep = Mock(LeaveActionStep) replyStep = Mock(ReplyActionStep) - joinStep.doAction >> { m -> println "I was called with $m"} - leaveStep.doAction >> { m -> println "I was called with $m"} - replyStep.doAction >> { m -> println "I was called with $m"} c = CustomActivity.build() [joinStep, leaveStep, replyStep].each { c.addToSteps(it) } println "c is $c and its steps are ${c.steps}" From 1aee3fa657222445428e15dfc1dcb913fc6d0119 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 18 Jan 2013 10:59:02 +0300 Subject: [PATCH 0398/2668] fixed test in CustomActivityServicSpec --- .../frontlinesms2/services/CustomActivityServiceSpec.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy index 82ab42ddb..4a8e3a8db 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy @@ -18,9 +18,9 @@ class CustomActivityServiceSpec extends Specification { when: service.triggerSteps(c, m) then: - 1 * joinStep.doAction(_) - 1 * leaveStep.doAction(_) - 1 * replyStep.doAction(_) + 1 * joinStep.process(_) + 1 * leaveStep.process(_) + 1 * replyStep.process(_) } private def createTestCustomActivity() { From a5ae60c123f6b975fbe1d0919bf40daa95921327 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 18 Jan 2013 11:48:01 +0300 Subject: [PATCH 0399/2668] CustomActivityServiceISpec added --- .../service/CustomActivityServiceISpec.groovy | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy new file mode 100644 index 000000000..4bf23b593 --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy @@ -0,0 +1,76 @@ +package frontlinesms2.service + +import frontlinesms2.* +import spock.lang.* + +class CustomActivityServiceISpec extends grails.plugin.spock.IntegrationSpec{ + def customActivityService, customActivity, join, leave, reply, group, contact, message + + def setup() { + customActivityService = new CustomActivityService() + contact = new Contact(name:"Wamaitha", mobile:"+23888") + contact.save(failOnError:true) + message = new Fmessage(src:contact.mobile, text:"CUSTOM TEST", inbound:true).save(failOnError:true) + createCustomActivity() + } + + def 'customActivityService.triggerSteps() should perform relevant action for join and reply'(){ + given: + createTestGroup() + addJoinActionStep() + addReplyActionStep() + when: + customActivityService.triggerSteps(customActivity, message) + then: + contact.groups == [group] + Fmessage.findAllByText("autoreply seems to work").size() == 1 + } + + def 'customActivityService.triggerSteps() should perform relevant action for leave and reply'(){ + given: + createTestGroup(contact) + addLeaveActionStep() + addReplyActionStep() + when: + customActivityService.triggerSteps(customActivity, message) + then: + contact.groups == [] + Fmessage.findAllByText("autoreply seems to work").size() == 1 + } + + private def createCustomActivity() { + customActivity = new CustomActivity(name:"Custom") + customActivity.addToKeywords(new Keyword(isTopLevel: true, value: "CUSTOM")) + customActivity.save(failOnError:true) + } + + private def createTestGroup(contact) { + group = new Group(name:"testGroup") + group.save(failOnError:true) + if (contact) { + contact.addToGroups(group) + contact.save(failOnError:true) + } + } + + private def addJoinActionStep() { + join = new JoinActionStep() + join.addToStepProperties(new StepProperty(key:"group", value:group.id)) + customActivity.addToSteps(join) + customActivity.save(failOnError:true) + } + + private def addLeaveActionStep() { + leave = new LeaveActionStep() + leave.addToStepProperties(new StepProperty(key:"group", value:group.id)) + customActivity.addToSteps(leave) + customActivity.save(failOnError:true) + } + + private def addReplyActionStep() { + reply = new ReplyActionStep() + reply.addToStepProperties(new StepProperty(key:"autoreplyText", value:"autoreply seems to work")) + customActivity.addToSteps(reply) + customActivity.save(failOnError:true) + } +} \ No newline at end of file From ea4529ac6cddfc90d34d2d07150f61469232dc76 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 18 Jan 2013 12:13:58 +0300 Subject: [PATCH 0400/2668] enabled drag and drop on step list --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 12 ++++++------ .../grails-app/views/customactivity/_config.gsp | 7 ++++--- .../grails-app/views/customactivity/_validate.gsp | 9 ++++++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 88322eb80..0b1ef4540 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -346,33 +346,33 @@ class FsmsTagLib { } def joinActionStep = { att, body -> - out << "
    " + out << "
  • " out << "
    " out << "Join Group" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'join') out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name") - out << "
    • " + out << "" } def leaveActionStep = { att, body -> - out << "
    " + out << "
  • " out << "
    " out << "Leave Group" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'leave') out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name") - out << "
    • " + out << "" } def replyActionStep = { att, body -> - out << "
    " + out << "
  • " out << "
    " out << "Reply" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'reply') out << g.textArea(name:'autoreplyText', value:(att.step?.autoreplyText?:'')) - out << "
    • " + out << "" } def savedActionSteps = {att, body -> diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp index 444b99154..b33e4b5dc 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp @@ -6,10 +6,10 @@
    Leave
    Reply
    -
    - + +
      -
    + \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 222c6fa11..4af9a0157 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -5,6 +5,9 @@ $("#add-leave-action-step").click(function() { addLeaveActionStep(); }); $("#add-reply-action-step").click(function() { addReplyActionStep(); }); + $('#custom-activity-config-container').sortable(); + $( "#custom-activity-config-container" ).disableSelection(); + $.each($('.remove-step'), function(index, element){ addRemoveListener(element); }); @@ -112,7 +115,7 @@ <% def divElement = fsms.joinActionStep() %> - var divElement = $(${divElement}).attr("index", (parseInt(indexOfLastStep()) + 1)); + var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); addRemoveListener(divElement.find('.remove-step')); return divElement; }; @@ -121,7 +124,7 @@ <% divElement = fsms.leaveActionStep() %> - var divElement = $(${divElement}).attr("index", (parseInt(indexOfLastStep()) + 1)); + var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); addRemoveListener(divElement.find('.remove-step')); return divElement; }; @@ -130,7 +133,7 @@ <% divElement = fsms.replyActionStep() %> - var divElement = $(${divElement}).attr("index", (parseInt(indexOfLastStep()) + 1)); + var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); addRemoveListener(divElement.find('.remove-step')); return divElement; }; From f98f4e163da7889fb7819af41e4b9d45d9778c34 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 18 Jan 2013 12:21:18 +0300 Subject: [PATCH 0401/2668] time stamp change in appilcation.properties --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index ec0d49169..3961ddd81 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Thu Nov 15 15:41:15 EAT 2012 +#Fri Jan 18 10:43:42 EAT 2013 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 From ca9b4adef20894dc0a5d4f4f33db38c1111d37af Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 18 Jan 2013 14:06:00 +0300 Subject: [PATCH 0402/2668] Join and Leave now work in context of CustomActivity --- .../domain/frontlinesms2/JoinActionStep.groovy | 4 ++-- .../domain/frontlinesms2/LeaveActionStep.groovy | 4 ++-- .../services/frontlinesms2/SubscriptionService.groovy | 10 +++++----- .../service/CustomActivityServiceISpec.groovy | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy index 7ef966755..8c28b8d92 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy @@ -1,7 +1,7 @@ package frontlinesms2 class JoinActionStep extends Step { - + def subscriptionService static service = 'subscription' static action = 'doJoin' static String getShortName() { 'join' } @@ -20,6 +20,6 @@ class JoinActionStep extends Step { } def process(Fmessage message) { - + subscriptionService.doJoin(this, message) } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy index 1fa0fd78f..b2346486e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy @@ -1,7 +1,7 @@ package frontlinesms2 class LeaveActionStep extends Step { - + def subscriptionService static service = 'subscription' static action = 'doLeave' static String getShortName() { 'leave' } @@ -21,6 +21,6 @@ class LeaveActionStep extends Step { } def process(Fmessage message) { - + subscriptionService.doLeave(this, message) } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy index d8355ac50..c5c516b3a 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy @@ -52,7 +52,7 @@ class SubscriptionService { group.addToMembers(foundContact); } } - if(subscriptionOrActionStep.joinAutoreplyText) { + if(subscriptionOrActionStep instanceof Activity && subscriptionOrActionStep.joinAutoreplyText) { sendAutoreplyMessage(foundContact, subscriptionOrActionStep.joinAutoreplyText) } }) @@ -69,7 +69,7 @@ class SubscriptionService { if((foundContact.isMemberOf(group))){ foundContact?.removeFromGroup(group) } - if(subscriptionOrActionStep.leaveAutoreplyText) { + if(subscriptionOrActionStep instanceof Activity && subscriptionOrActionStep.leaveAutoreplyText) { sendAutoreplyMessage(foundContact, subscriptionOrActionStep.leaveAutoreplyText) } } @@ -86,17 +86,17 @@ class SubscriptionService { if(foundContact){ if(foundContact.isMemberOf(group)) { foundContact.removeFromGroup(group) - if(subscriptionOrActionStep.leaveAutoreplyText) + if(subscriptionOrActionStep instanceof Activity && subscriptionOrActionStep.leaveAutoreplyText) sendAutoreplyMessage(foundContact, subscriptionOrActionStep.leaveAutoreplyText) } else { group.addToMembers(foundContact); - if(subscriptionOrActionStep.joinAutoreplyText) + if(subscriptionOrActionStep instanceof Activity && subscriptionOrActionStep.joinAutoreplyText) sendAutoreplyMessage(foundContact, subscriptionOrActionStep.joinAutoreplyText) } } else { foundContact = new Contact(name:"", mobile:phoneNumber).save(failOnError:true) group.addToMembers(foundContact); - if(subscriptionOrActionStep.joinAutoreplyText) + if(subscriptionOrActionStep instanceof Activity && subscriptionOrActionStep.joinAutoreplyText) sendAutoreplyMessage(foundContact, subscriptionOrActionStep.joinAutoreplyText) } }) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy index 4bf23b593..f429c43b0 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/CustomActivityServiceISpec.groovy @@ -56,6 +56,7 @@ class CustomActivityServiceISpec extends grails.plugin.spock.IntegrationSpec{ private def addJoinActionStep() { join = new JoinActionStep() join.addToStepProperties(new StepProperty(key:"group", value:group.id)) + join.save(failOnError:true) customActivity.addToSteps(join) customActivity.save(failOnError:true) } @@ -63,6 +64,7 @@ class CustomActivityServiceISpec extends grails.plugin.spock.IntegrationSpec{ private def addLeaveActionStep() { leave = new LeaveActionStep() leave.addToStepProperties(new StepProperty(key:"group", value:group.id)) + leave.save(failOnError:true) customActivity.addToSteps(leave) customActivity.save(failOnError:true) } @@ -70,6 +72,7 @@ class CustomActivityServiceISpec extends grails.plugin.spock.IntegrationSpec{ private def addReplyActionStep() { reply = new ReplyActionStep() reply.addToStepProperties(new StepProperty(key:"autoreplyText", value:"autoreply seems to work")) + reply.save(failOnError:true) customActivity.addToSteps(reply) customActivity.save(failOnError:true) } From 4ba8b6b8f20ca745913822111d905ad8f39c8e5e Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 18 Jan 2013 14:49:42 +0300 Subject: [PATCH 0403/2668] CustomActivitySpec fixes --- .../domain/frontlinesms2/CustomActivity.groovy | 8 +++++++- .../frontlinesms2/ReplyActionStep.groovy | 4 ++-- .../frontlinesms2/CustomActivitySpec.groovy | 18 +++++++++++++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy index a1119cf4c..799e9bc9b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy @@ -2,7 +2,13 @@ package frontlinesms2 class CustomActivity extends Activity { List steps - + def customActivityService static String getShortName() { 'customactivity' } static hasMany = [steps: Step] + + def processKeyword(Fmessage message, Keyword matchedKeyword) { + addToMessages(message) + customActivityService.triggerSteps(this, message) + save() + } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy index e667d1fd5..81b0c1d0b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy @@ -1,7 +1,7 @@ package frontlinesms2 class ReplyActionStep extends Step { - + def autoreplyService static service = 'autoreply' static action = 'doReply' static String getShortName() { 'reply' } @@ -16,6 +16,6 @@ class ReplyActionStep extends Step { } def process(Fmessage message) { - + autoreplyService.doReply(this, message) } } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/CustomActivitySpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/CustomActivitySpec.groovy index 6a93f65bd..f149ac691 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/CustomActivitySpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/CustomActivitySpec.groovy @@ -5,7 +5,7 @@ import grails.plugin.spock.* import frontlinesms2.* @TestFor(CustomActivity) -@Mock([JoinActionStep, StepProperty, ReplyActionStep, LeaveActionStep]) +@Mock([JoinActionStep, StepProperty, ReplyActionStep, LeaveActionStep, Keyword, Fmessage]) class CustomActivitySpec extends Specification { def "a custom activity can have one step"() { given: @@ -45,4 +45,20 @@ class CustomActivitySpec extends Specification { expect: CustomActivity.list()[0].steps == [joinStep, replyStep, leaveStep] } + + def "processKeyword should add the message to the CustomActivity and invoke CustomActivityService.triggerSteps"() { + given: + def joinStep = new JoinActionStep(stepProperties:[new StepProperty(key:"group", value:"football")]) + joinStep.save(failOnError:true) + def customActivity = new CustomActivity(name:"Custom Activity") + customActivity.addToSteps(joinStep) + customActivity.save(flush:true, failOnError:true) + def customActivityService = Mock(CustomActivityService) + customActivity.customActivityService = customActivityService + def m = new Fmessage(src:"123", text:"this is a message", inbound:true).save(failOnError:true) + when: + customActivity.processKeyword(m, Mock(Keyword)) + then: + 1 * customActivityService.triggerSteps(_, _) + } } \ No newline at end of file From 759094c651eb8fc3a4d7167d60728de549aab3ae Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 18 Jan 2013 15:33:45 +0300 Subject: [PATCH 0404/2668] added validation --- .../views/customactivity/_validate.gsp | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 4af9a0157..406011c80 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -4,9 +4,8 @@ $("#add-join-action-step").click(function() { addJoinActionStep(); }); $("#add-leave-action-step").click(function() { addLeaveActionStep(); }); $("#add-reply-action-step").click(function() { addReplyActionStep(); }); - + $('#custom-activity-config-container').sortable(); - $( "#custom-activity-config-container" ).disableSelection(); $.each($('.remove-step'), function(index, element){ addRemoveListener(element); @@ -16,7 +15,7 @@ var validator = $("#create_customactivity").validate({ errorContainer: ".error-panel", rules: { - messageText: { required:true }, + autoreplyText: { required:true }, name: { required:true } } }); @@ -28,9 +27,13 @@ else return true; }; - var messageTextValidation = function() { + var stepActionsValidation = function() { updateConfirmationMessage(); - return validator.element('#autoreplyText'); + if( $("textarea[name='autoreplyText']").size() > 1 ) { + return $.makeArray($("textarea[name='autoreplyText']")).reduce(function(a,b){ return (validator.element(a) && validator.element(b)) }); + } else { + return validator.element("#autoreplyText"); + } }; var confirmTabValidation = function() { @@ -39,7 +42,7 @@ }; mediumPopup.addValidation('activity-generic-sorting', keyWordTabValidation); - mediumPopup.addValidation('customactivity-config', messageTextValidation); + mediumPopup.addValidation('customactivity-config', stepActionsValidation); mediumPopup.addValidation('customactivity-confirm', confirmTabValidation); } @@ -61,10 +64,15 @@ function addRemoveListener(element) { $(element).click(function(){ - $(this).parent().parent().fadeOut(300, function(){ $(this).remove(); }); + var p = $(this).parent().parent(); + p.fadeOut(300, function(){ $(this).remove(); }); }); } + function delete(element) { + + } + function setJsonToSend() { var jsonToSend = ""; var data = new Array(); From cc8a6860d36a3df2d1414b555eb11a26fbd24599 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 18 Jan 2013 16:23:20 +0300 Subject: [PATCH 0405/2668] added validation for steps tab --- .../grails-app/i18n/messages.properties | 3 ++- .../taglib/frontlinesms2/FsmsTagLib.groovy | 4 ++-- .../views/customactivity/_validate.gsp | 20 +++++++++++++++++-- .../js/activity/popupCustomValidation.js | 5 +++++ 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 26f524e6c..e45e2a585 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -1004,4 +1004,5 @@ customactivity.config.description=Custom Activities allow you to create a set of customactivity.group.join=Joining "{0}" group customactivity.group.leave= Leaving "{0}" group customactivity.reply.messagetext=Reply with "{0}" to recipient -customactivity.action.steps.label=Action Steps \ No newline at end of file +customactivity.action.steps.label=Action Steps +validation.group.notnull=Please select a group \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 0b1ef4540..7039b54cf 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -351,7 +351,7 @@ class FsmsTagLib { out << "Join Group" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'join') - out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name") + out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") out << "" } @@ -361,7 +361,7 @@ class FsmsTagLib { out << "Leave Group" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'leave') - out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name") + out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") out << "" } diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 406011c80..5d80fa93d 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -20,6 +20,8 @@ } }); + customValidationForGroups(); + var keyWordTabValidation = function() { if(!isGroupChecked("blankKeyword")){ return validator.element('#keywords'); @@ -29,11 +31,25 @@ var stepActionsValidation = function() { updateConfirmationMessage(); + var t = true; + var s = true; if( $("textarea[name='autoreplyText']").size() > 1 ) { - return $.makeArray($("textarea[name='autoreplyText']")).reduce(function(a,b){ return (validator.element(a) && validator.element(b)) }); + t = $.makeArray($("textarea[name='autoreplyText']")).reduce(function(a,b){ return (validator.element(a) && validator.element(b)) }); + } else if($("textarea[name='autoreplyText']").size() == 1 ){ + t = validator.element("#autoreplyText"); } else { - return validator.element("#autoreplyText"); + t = true; } + + if( $("select[name='group']").size() > 1 ) { + s = $.makeArray($("select[name='group']")).reduce(function(a,b){ return (validator.element(a) && validator.element(b)) }); + } else if($("select[name='group']").size() == 1 ){ + s = validator.element("#group"); + } else { + s = true; + } + + return t && s; }; var confirmTabValidation = function() { diff --git a/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js b/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js index cae9c6ed2..0e95c4bf7 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js +++ b/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js @@ -80,3 +80,8 @@ function genericSortingValidation() { }, i18n("validation.nospaces.error")); } +function customValidationForGroups(){ + jQuery.validator.addMethod("notnull", function(value, element) { + if($(element).val() == "null") { return false; } else { return true; } + }, i18n("validation.group.notnull")); +} \ No newline at end of file From d8262a2e675780c8cf66c881869adb0f63bc6bb9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 18 Jan 2013 17:29:09 +0300 Subject: [PATCH 0406/2668] added timeout as a config field in SMSSync --- .../grails-app/domain/frontlinesms2/SmssyncFconnection.groovy | 3 ++- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy index aaac80717..f1f90f80c 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy @@ -8,7 +8,7 @@ import frontlinesms2.api.* @FrontlineApiAnnotations(apiUrl="smssync") class SmssyncFconnection extends Fconnection implements FrontlineApi { static String getShortName() { 'smssync' } - static final configFields = ['name', 'receiveEnabled', 'sendEnabled', 'secret'] + static final configFields = ['name', 'receiveEnabled', 'sendEnabled', 'secret', 'timeout'] static final passwords = ['secret'] static final defaultValues = [sendEnabled:true, receiveEnabled:true] @@ -18,6 +18,7 @@ class SmssyncFconnection extends Fconnection implements FrontlineApi { boolean sendEnabled = true boolean receiveEnabled = true String secret + int timeout = 360 // 3 hour default static constraints = { secret nullable:true diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index c1d578598..6f892213d 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -219,6 +219,7 @@ smssync.type.label=Type smssync.receiveEnabled.label=Receive enabled smssync.sendEnabled.label=Send enabled smssync.secret.label=Secret +smssync.timeout.label=Time (in minutes) to wait before warning about SMSSync not connecting smssync.description=Use an Android phone with the Smssync app installed to send and receive SMS with FrontlineSMS smssync.field.secret.info=On your app, set the secret to match this field smssync.global.info=Download the SMSSync app from smssync.ushahidi.com From 56ea43b90a0fe0b92664051cd411935e15a720ca Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 18 Jan 2013 17:49:51 +0300 Subject: [PATCH 0407/2668] reviewed validation --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 4 +-- .../views/customactivity/_validate.gsp | 30 +++++++------------ .../js/activity/popupCustomValidation.js | 2 +- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 7039b54cf..57c819bac 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -351,7 +351,7 @@ class FsmsTagLib { out << "Join Group" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'join') - out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") + out << g.select(name:'group', id:"", noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") out << "" } @@ -361,7 +361,7 @@ class FsmsTagLib { out << "Leave Group" out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) out << g.hiddenField(name:'stepType', value:'leave') - out << g.select(name:'group', noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") + out << g.select(name:'group', id:"", noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") out << "" } diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 5d80fa93d..bc2eb8605 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -33,21 +33,13 @@ updateConfirmationMessage(); var t = true; var s = true; - if( $("textarea[name='autoreplyText']").size() > 1 ) { - t = $.makeArray($("textarea[name='autoreplyText']")).reduce(function(a,b){ return (validator.element(a) && validator.element(b)) }); - } else if($("textarea[name='autoreplyText']").size() == 1 ){ - t = validator.element("#autoreplyText"); - } else { - t = true; - } - if( $("select[name='group']").size() > 1 ) { - s = $.makeArray($("select[name='group']")).reduce(function(a,b){ return (validator.element(a) && validator.element(b)) }); - } else if($("select[name='group']").size() == 1 ){ - s = validator.element("#group"); - } else { - s = true; - } + $.each($("textarea[name='autoreplyText']"), function(index, element){ + t = (validator.element($(element)) && t); + }); + $.each($("select[name='group']"), function(index, element){ + s = (validator.element($(element)) && s); + }); return t && s; }; @@ -169,19 +161,19 @@ var output = ""; var stepType = $(element).find('input#stepType').val(); if(stepType == 'join') { - var groupValue = $(element).find('#group').val(); - var groupName = $(element).find('#group').find("option[value="+groupValue+"]").text() + var groupValue = $(element).find('select[name=group]').val(); + var groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text() output = i18n("customactivity.group.join", groupName); output = "

    "+output+"

    "; } if(stepType == "leave") { - var groupValue = $(element).find('#group').val(); - var groupName = $(element).find('#group').find("option[value="+groupValue+"]").text() + var groupValue = $(element).find('select[name=group]').val(); + var groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text() output = i18n("customactivity.group.leave", groupName); output = "

    "+output+"

    "; } if(stepType == "reply") { - var messageText = $(element).find('#autoreplyText').val(); + var messageText = $(element).find('textarea[name=autoreplyText]').val(); output = i18n("customactivity.reply.messagetext", messageText); output = "

    "+output+"

    "; } diff --git a/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js b/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js index 0e95c4bf7..2fcf1ff6c 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js +++ b/plugins/frontlinesms-core/web-app/js/activity/popupCustomValidation.js @@ -82,6 +82,6 @@ function genericSortingValidation() { function customValidationForGroups(){ jQuery.validator.addMethod("notnull", function(value, element) { - if($(element).val() == "null") { return false; } else { return true; } + return ($(element).val() != "null") }, i18n("validation.group.notnull")); } \ No newline at end of file From 7a51bc46d6796e2b93ccdd84c69af9234ff7c13a Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 18 Jan 2013 17:58:07 +0300 Subject: [PATCH 0408/2668] modified grails-app/views/contact/_single_contact_view.gsp --- .../views/contact/_single_contact_view.gsp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp index e40b56aca..ffd9fde00 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp @@ -137,7 +137,7 @@ function refreshMessageStats(data) { $(function() { setInterval(refreshMessageStats, 15000); var clear; - /*$( "td > input[type=text]" ).each(function( index) { + $( "td > input[type=text]" ).each(function( index) { if( $(this).val() == ''){ clear = $(this).next(); clear.attr("style","display:none"); @@ -146,7 +146,15 @@ $(function() { clear = $(this).next(); clear.removeAttr("style"); } - });*/ + }); + + $( "td > input[type=text]" ).keypress(function() { + if( $(this).val() == ''){ + clear = $(this).next(); + clear.removeAttr("style"); + $(".send-message").removeAttr("style"); + } + }); });     From 2024b80d424c743f63583e09555677ddb07991eb Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 18 Jan 2013 18:32:21 +0300 Subject: [PATCH 0409/2668] Cleaned up connection UI and ConnectionFSpec. --- .../grails-app/conf/CoreResources.groovy | 1 + .../DeviceDetectionService.groovy | 1 + .../frontlinesms2/FconnectionService.groovy | 21 ++++++++--- .../views/connection/_connection.gsp | 14 ++++++++ .../views/connection/_connection_list.gsp | 36 ++----------------- .../views/connection/_selected_connection.gsp | 32 +++++++++++++++++ .../grails-app/views/connection/show.gsp | 12 +++---- .../archive/PageArchiveSent.groovy | 4 +-- .../connection/ConnectionFSpec.groovy | 26 ++++++-------- .../connection/PageConnection.groovy | 6 +++- .../web-app/js/fconnection.js | 11 ++++++ .../web-app/js/sanchez.min.js | 1 + 12 files changed, 101 insertions(+), 64 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp create mode 100644 plugins/frontlinesms-core/web-app/js/sanchez.min.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 89475f689..942f59c95 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -38,6 +38,7 @@ modules = { resource url:[dir:'js', file:"new_features.js"], disposition:'head' resource url:[dir:'js', file:"pagination.js"], disposition:'head' resource url:[dir:'js', file:"recipient_selecter.js"], disposition:'head' + resource url:[dir:'js', file:"sanchez.min.js"], disposition:'head' resource url:[dir:'js', file:"smallPopup.js"], disposition:'head' resource url:[dir:'js', file:"status_indicator.js"], disposition:'head' resource url:[dir:'js', file:"system_notification.js"], disposition:'head' diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy index dbb9e9682..fb7ea4cfc 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy @@ -67,3 +67,4 @@ class DeviceDetectionService { return (detectorThread != null && threadState != Thread.State.TERMINATED) } } + diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index a7c6bc0ce..3695f3629 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -9,6 +9,7 @@ class FconnectionService { def camelContext def deviceDetectionService def i18nUtilService + def connectingIds = [].asSynchronized() def createRoutes(Fconnection c) { println "FconnectionService.createRoutes() :: ENTRY :: $c" @@ -23,6 +24,7 @@ class FconnectionService { } println "creating route for fconnection $c" try { + connectingIds << c.id def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) @@ -32,6 +34,8 @@ class FconnectionService { } catch(Exception ex) { logFail(c, ex) destroyRoutes(c.id as long) + } finally { + connectingIds -= c.id } println "FconnectionService.createRoutes() :: EXIT :: $c" } @@ -61,10 +65,19 @@ class FconnectionService { } def getConnectionStatus(Fconnection c) { - if (c instanceof SmslibFconnection) - return camelContext.routes.any { it.id ==~ /.*-$c.id$/ } ? ConnectionStatus.CONNECTED : deviceDetectionService.isConnecting((c as SmslibFconnection).port) ? ConnectionStatus.CONNECTING : ConnectionStatus.NOT_CONNECTED - else - return camelContext.routes.any { it.id ==~ /.*-$c.id$/ } ? ConnectionStatus.CONNECTED : ConnectionStatus.NOT_CONNECTED + if(c.id in connectingIds) { + return ConnectionStatus.CONNECTING + } + if (c instanceof SmslibFconnection) { + return camelContext.routes.any { it.id ==~ /.*-$c.id$/ }? + ConnectionStatus.CONNECTED: + deviceDetectionService.isConnecting((c as SmslibFconnection).port)? + ConnectionStatus.CONNECTING: + ConnectionStatus.NOT_CONNECTED + } + return camelContext.routes.any { it.id ==~ /.*-$c.id$/ }? + ConnectionStatus.CONNECTED: + ConnectionStatus.NOT_CONNECTED } // TODO rename 'handleNotConnectedException' diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp new file mode 100644 index 000000000..4775f550d --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -0,0 +1,14 @@ + +
    +

    '${c.name}'

    +

    ()

    + + +

    ${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

    +     +

    +
    +     + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index 674aa87b1..53dde8880 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -1,4 +1,3 @@ -<%@ page import="frontlinesms2.ConnectionStatus" %>

    @@ -19,40 +18,9 @@
    • - -
      -

      '${c.name}'

      -

      ()

      - - -

      ${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

      -       -

      -
      -       - + -
      - - - - - - - - - - - - - - - - - -
      +
      • diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp new file mode 100644 index 000000000..34084119d --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp @@ -0,0 +1,32 @@ +
      + + + + + + + + +$(function() { + fconnection_show.update("${c.status}", ${c.id}); +}); + + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp index 301ac3a63..3691ceffc 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp @@ -6,18 +6,16 @@ $(function() { - var count = 0; var connectionTimer = setInterval(refreshConnectionStatus, 2000); function refreshConnectionStatus() { $.get("${createLink(controller:'connection', action:'list', id:params?.id, params:[format:'json'])}", function(connection) { - if (count < 2 && connection.status == i18n("connectionstatus.connecting")) { - count++; - } else { + var status; + status = connection.status.substring(17).toUpperCase(); + if(status !== "CONNECTING") { clearInterval(connectionTimer); $("div.flash").hide(); - $("#connection-" + connection.id).find(".connection-status").text(i18n(connection.status)); - if(!$(".controls").find("a").is(":visible")) window.location = window.location; - } + fconnection_show.update(status, connection.id); + } }); } }); diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy index 3c0a8ee30..da1100e8b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy @@ -12,7 +12,7 @@ class PageArchiveSent extends PageArchive { def restOfPath = "" if (args[0] instanceof Fmessage) restOfPath += "/inbox/show/"+(args[0] as Fmessage).id - else if (args[0] instanceof Number) + else if (args[0] instanceof Number) restOfPath += "/inbox/show/"+args[0] else restOfPath += "/activity/"+Activity.findByName(args[0])?.id+"?messageSection=activity&viewingMessages=true" @@ -22,4 +22,4 @@ class PageArchiveSent extends PageArchive { static at = { title.endsWith('sent') } -} \ No newline at end of file +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy index fab20011d..356dbc240 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy @@ -20,32 +20,28 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'There is a Not Connected label shown for inactive connection'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.status == "Not connected" } def 'there is a DELETE button shown for inactive connection'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.btnDelete.displayed } def 'should show "create route" button for inactive connection'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.btnCreateRoute.displayed } def 'DELETE button should remove selected fconnection from the list'() { given: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() when: connectionList.btnDelete.click() then: @@ -58,8 +54,8 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def testConnection = createTestSmsConnection() SmslibFconnection.build(name:"test modem", port:"COM2", baud:11200) when: - to PageConnection - waitFor{ connectionList.btnCreateRoute.displayed } + to PageConnection, testConnection + waitFor { connectionList.btnCreateRoute.displayed } then: !connectionList.btnTestRoute.displayed when: @@ -71,9 +67,9 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'delete button is not displayed for a connected Fconnection'() { given: - createTestEmailConnection() + def c = createTestEmailConnection() when: - to PageConnection + to PageConnection, c connectionList.btnCreateRoute.click() then: waitFor('very slow') { connectionList.status == "Connected" } @@ -82,8 +78,7 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'The first connection in the connection list page is selected'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.selectedConnection.size() == 1 } @@ -195,8 +190,7 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'clicking Send test message displays a popup with a default message and empty address field'() { given: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() when: connectionList.btnCreateRoute.click() then: diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index db63258d0..c8c5cfbb3 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -6,7 +6,11 @@ import frontlinesms2.popup.MediumPopup import geb.Module class PageConnection extends PageBase { - static url = 'connection/list' + String convertToPath(Object[] args) { + if(!args) 'connection/list' + else if(args[0] instanceof Number) 'connection/show/' + args[0] + else 'connection/show/' + args[0].id + } static content = { connectionList { module ConnectionList } diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index 6e444fbe9..a7386dfa8 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -1,3 +1,14 @@ +fconnection_show = (function() { + var showControls; + update = function(status, id) { + $("#body-content.connections .selected .connection-status").text(i18n("connectionstatus." + status.toLowerCase())); + sanchez.replaceContent("#body-content.connections .selected .controls", "fconnection-controls-" + status, {connectionId:id}); + }; + return { + update:update + }; +}()); + fconnection = (function() { var attachCheckBoxListener, handleSaveResponse, init, isValid, show, validator; diff --git a/plugins/frontlinesms-core/web-app/js/sanchez.min.js b/plugins/frontlinesms-core/web-app/js/sanchez.min.js new file mode 100644 index 000000000..7faab5338 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/sanchez.min.js @@ -0,0 +1 @@ +sanchez=function(){var e=function(e,t,r,i){$(t)[e](n(r,i))},t=function(e){return new RegExp("((%7B%7B)|(\\{\\{))"+e+"((%7D%7D)|(\\}\\}))","g")},n=function(e,n){var r,i;i=$("#"+e).html();for(r in n)i=i.replace(t(r),n[r]);return i};return{template:n,append:function(t,n,r){e("append",t,n,r)},prepend:function(t,n,r){e("prepend",t,n,r)},replace:function(t,n,r){e("replaceWith",t,n,r)},replaceContent:function(t,n,r){e("html",t,n,r)}}}(); \ No newline at end of file From dc3221590b577511892c92a20840a89ba38f5a6d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 21 Jan 2013 09:18:10 +0300 Subject: [PATCH 0410/2668] Removed Ignore from FmessageISpec --- .../test/integration/frontlinesms2/domain/FmessageISpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index f24511a5b..5c67a836a 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -390,7 +390,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { then: message.receivedOn == null } -@spock.lang.IgnoreRest + def 'doing a Fmessage.findBySrc should give me youngest message'() { when: Fmessage.build(src:'111', text:'oldest') From 056bf590064960c574c3f909d699642bc279ff28 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 21 Jan 2013 10:39:41 +0300 Subject: [PATCH 0411/2668] Fixed mistaken merge of ActivityController when merging Webconnection testing. --- .../controllers/frontlinesms2/ActivityController.groovy | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 35f9d9e62..e3e6f932b 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -109,7 +109,7 @@ class ActivityController extends ControllerUtils { def create_new_activity() {} - def getCollidingKeywords(topLevelKeywords, instance) { + private def getCollidingKeywords(topLevelKeywords, instance) { if (topLevelKeywords == null) return [:] def collidingKeywords = [:] @@ -140,7 +140,7 @@ class ActivityController extends ControllerUtils { } private def generateErrorMessages(instance) { - def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords) + def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords, instance) def errors if (collidingKeywords) { errors = collidingKeywords.collect { @@ -151,9 +151,7 @@ class ActivityController extends ControllerUtils { } }.join('\n') } else { - errors = instance.errors.allErrors.collect { - message(code:it.codes[0], args:it.arguments.flatten(), defaultMessage:it.defaultMessage) - }.join('\n') + errors = instance.errors.allErrors.collect { message(error:it) }.join('\n') } withFormat { json { render([ok:false, text:errors] as JSON) } From 88c29dfcfe368a4f569c68b1fb23f94c39c9eebc Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 21 Jan 2013 11:04:45 +0300 Subject: [PATCH 0412/2668] Fixed org.hibernate.NonUniqueObjectException --- .../grails-app/domain/frontlinesms2/Subscription.groovy | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy index 8ca7a04d2..8858d4229 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy @@ -29,20 +29,14 @@ class Subscription extends Activity{ } def processJoin(Fmessage message){ - this.addToMessages(message) - this.save(failOnError:true) subscriptionService.doJoin(this, message) } def processLeave(Fmessage message){ - this.addToMessages(message) - this.save(failOnError:true) subscriptionService.doLeave(this, message) } def processToggle(Fmessage message){ - this.addToMessages(message) - this.save(failOnError:true) subscriptionService.doToggle(this, message) } @@ -58,7 +52,7 @@ class Subscription extends Activity{ def processKeyword(Fmessage message, Keyword k) { this.addToMessages(message) - this.save(failOnError:true) + this.save(failOnError:true, flush:true) def action = getAction(k) if(action == Action.JOIN){ processJoin(message) From e1960c937a8cc925c4d6214961331f19950faae4 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 21 Jan 2013 11:21:06 +0300 Subject: [PATCH 0413/2668] added flush:true to Autoreply.processKeyword and CustomActivity.processKeyword --- .../grails-app/domain/frontlinesms2/Autoreply.groovy | 2 +- .../grails-app/domain/frontlinesms2/CustomActivity.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy index e2992eba5..ca7e7451e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy @@ -24,7 +24,7 @@ class Autoreply extends Activity { def processKeyword(Fmessage message, Keyword matchedKeyword) { addToMessages(message) autoreplyService.doReply(this, message) - save() + save(flush:true) } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy index 799e9bc9b..f811da9e2 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy @@ -8,7 +8,7 @@ class CustomActivity extends Activity { def processKeyword(Fmessage message, Keyword matchedKeyword) { addToMessages(message) + save(flush:true) customActivityService.triggerSteps(this, message) - save() } } From 8373c5101b93854914acdc27977ac513a5bb3862 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 21 Jan 2013 11:35:01 +0300 Subject: [PATCH 0414/2668] Fix IE magic wand bug Disable magicwand init for IE users. --- plugins/frontlinesms-core/web-app/js/magicwand.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/magicwand.js b/plugins/frontlinesms-core/web-app/js/magicwand.js index 1f78636e0..79347bf02 100644 --- a/plugins/frontlinesms-core/web-app/js/magicwand.js +++ b/plugins/frontlinesms-core/web-app/js/magicwand.js @@ -14,16 +14,22 @@ var magicwand = { * @arg list jquery selecter for the
    From d87525a785a323de8e1d0cc1d16950209f97d56d Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 21 Jan 2013 17:04:53 +0300 Subject: [PATCH 0432/2668] modified save & test button layout on webconnection wizard --- .../grails-app/views/webconnection/_validate.gsp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index a721e842d..5ec97af35 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -121,9 +121,15 @@ testRouteBtn = $('', { id: "testRoute", type:"submit", + style:"margin:.5em .6em .5em 0; height:26px;", value: i18n('webconnection.testroute.label'), click: testRouteStatus }); + /*testRouteBtn.button({ + id: "testRoute", + value: i18n('webconnection.testroute.label'), + click: testRouteStatus + });*/ } else { testRouteBtn.show(); } From 3d56816b9e0ee9c9b26f348e262364dbb180e3f1 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 21 Jan 2013 17:05:20 +0300 Subject: [PATCH 0433/2668] remove unecessary println --- .../grails-app/domain/frontlinesms2/Keyword.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Keyword.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Keyword.groovy index 538f7f0d6..348c729ba 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Keyword.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Keyword.groovy @@ -12,7 +12,6 @@ class Keyword { static constraints = { value(blank:true, maxSize:255, validator: { val, me -> - println "## Checking the Keywords for ${me.activity} ##" if(val.find(/\s/)) return false if(val != val.toUpperCase()) return false if(me.activity?.deleted || me.activity?.archived) return true From 8bb9681f2e1c038b8218343ff94a5ee47bb9996d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 21 Jan 2013 17:13:25 +0300 Subject: [PATCH 0434/2668] added job to create systemNotification when SMSSync times out. Currently not cancellable, and may require migration to original quartz plugin --- .../frontlinesms2/ConnectionController.groovy | 9 +++++++++ .../grails-app/i18n/messages.properties | 1 + .../jobs/frontlinesms2/ReportSmssyncTimeoutJob.groovy | 10 ++++++++++ .../services/frontlinesms2/SmssyncService.groovy | 5 +++++ 4 files changed, 25 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/ReportSmssyncTimeoutJob.groovy diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 4bcb45153..ef4b8b8e5 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -118,6 +118,15 @@ class ConnectionController extends ControllerUtils { CreateRouteJob.triggerNow([connectionId:params.id]) params.createRoute = true flash.message = message(code: 'connection.route.connecting') + def connectionInstance = Fconnection.get(params.id) + if (connectionInstance instanceof SmssyncFconnection && connectionInstance?.timeout > 0) { + def sendTime = new Date() + use(groovy.time.TimeCategory) { + sendTime = sendTime + (connectionInstance.timeout).minutes + println "I will send the job at $sendTime" + } + ReportSmssyncTimeoutJob.schedule(sendTime, [connectionId:params.id]) + } redirect(action:'list', params:params) } diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 6f892213d..ab8f9ac8f 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -223,6 +223,7 @@ smssync.timeout.label=Time (in minutes) to wait before warning about SMSSync not smssync.description=Use an Android phone with the Smssync app installed to send and receive SMS with FrontlineSMS smssync.field.secret.info=On your app, set the secret to match this field smssync.global.info=Download the SMSSync app from smssync.ushahidi.com +smssync.timeout=The Android phone associated with "{0}" has not contacted FrontlineSMS for {1} minutes # Messages Tab message.create.prompt=Enter message diff --git a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/ReportSmssyncTimeoutJob.groovy b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/ReportSmssyncTimeoutJob.groovy new file mode 100644 index 000000000..2ed8e7476 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/ReportSmssyncTimeoutJob.groovy @@ -0,0 +1,10 @@ +package frontlinesms2 + +class ReportSmssyncTimeoutJob { + def grailsApplication + + def execute(context) { + def connection = Fconnection.get(context.mergedJobDataMap.get('connectionId').toLong()) + grailsApplication.mainContext.smssyncService.reportTimeout(connection) + } +} diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 51c0843f9..184d9148d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -7,6 +7,7 @@ import org.apache.camel.Exchange import frontlinesms2.api.* class SmssyncService { + def i18nUtilService def processSend(Exchange x) { println "SmssyncService.processSend() :: ENTRY" println "SmssyncService.processSend() :: x=$x" @@ -18,6 +19,10 @@ class SmssyncService { println "SmssyncService.processSend() :: EXIT" } + def reportTimeout(connection) { + new SystemNotification(text:i18nUtilService.getMessage(code:'smssync.timeout', args:[connection.name, connection.timeout])).save(failOnError:true) + } + def apiProcess(connection, controller) { controller.render(generateApiResponse(connection, controller) as JSON) } From b9a11bbd00dcc50a410f62dec2570fefd22c1dc5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 22 Jan 2013 08:58:15 +0300 Subject: [PATCH 0435/2668] Corrected name of frontlinesms-core project in radio references. --- plugins/radio/grails-app/conf/BuildConfig.groovy | 2 +- plugins/radio/grails-app/conf/Config.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/radio/grails-app/conf/BuildConfig.groovy b/plugins/radio/grails-app/conf/BuildConfig.groovy index bafa5e750..0d2a3c6a3 100644 --- a/plugins/radio/grails-app/conf/BuildConfig.groovy +++ b/plugins/radio/grails-app/conf/BuildConfig.groovy @@ -4,7 +4,7 @@ grails.project.test.reports.dir = "target/test-reports" grails.project.target.level = 1.6 //grails.project.war.file = "target/${appName}-${appVersion}.war" -grails.plugin.location.core = "../frontlinesms-core" +grails.plugin.location.'frontlinesms-core' = "../frontlinesms-core" grails.project.dependency.resolution = { // inherit Grails' default dependencies diff --git a/plugins/radio/grails-app/conf/Config.groovy b/plugins/radio/grails-app/conf/Config.groovy index c822b02f0..375ca668c 100644 --- a/plugins/radio/grails-app/conf/Config.groovy +++ b/plugins/radio/grails-app/conf/Config.groovy @@ -89,5 +89,5 @@ jqueryValidation.packed = true jqueryValidation.cdn = false // false or "microsoft" jqueryValidation.additionalMethods = false -frontlinesms.plugins=['core', 'radio'] +frontlinesms.plugins=['frontlinesms-core', 'radio'] From c5a0e52474698f24f2cbae106bc1579e93759ca6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 22 Jan 2013 10:52:46 +0300 Subject: [PATCH 0436/2668] Cleaned up javascript for step generation. --- plugins/frontlinesms-core/.gitignore | 3 + .../grails-app/conf/CoreResources.groovy | 2 + .../taglib/frontlinesms2/FsmsTagLib.groovy | 12 +-- .../views/customactivity/_validate.gsp | 83 ++++++++----------- .../web-app/js/activity/custom_activity.js | 28 +++++++ .../web-app/js/sanchez.min.js | 1 + 6 files changed, 72 insertions(+), 57 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/js/activity/custom_activity.js create mode 100644 plugins/frontlinesms-core/web-app/js/sanchez.min.js diff --git a/plugins/frontlinesms-core/.gitignore b/plugins/frontlinesms-core/.gitignore index 7d340ac0b..bb05c4892 100644 --- a/plugins/frontlinesms-core/.gitignore +++ b/plugins/frontlinesms-core/.gitignore @@ -3,3 +3,6 @@ web-app/WEB-INF/grails-app/ # Auto-generated JS i18n bundles. web-app/i18n/ + +# NodeJS local modules +node_modules/ diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 0ffe09eb7..10a2b50ad 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -23,6 +23,7 @@ modules = { resource url:[dir:'css', file:'help.css'] resource url:[dir:'js', file:"frontlinesms_core.js"], disposition:'head' + resource url:[dir:'js', file:"activity/custom_activity.js"], disposition:'head' resource url:[dir:'js', file:"activity/popups.js"], disposition:'head' resource url:[dir:'js', file:"activity/poll/poll_graph.js"], disposition:'head' resource url:[dir:'js', file:'button.js'], disposition:'head' @@ -33,6 +34,7 @@ modules = { resource url:[dir:'js', file:"mediumPopup.js"], disposition:'head' resource url:[dir:'js', file:"new_features.js"], disposition:'head' resource url:[dir:'js', file:"pagination.js"], disposition:'head' + resource url:[dir:'js', file:"sanchez.min.js"], disposition:'head' resource url:[dir:'js', file:"smallPopup.js"], disposition:'head' resource url:[dir:'js', file:"status_indicator.js"], disposition:'head' resource url:[dir:'js', file:"system_notification.js"], disposition:'head' diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 57c819bac..3ba1de1e0 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -345,17 +345,8 @@ class FsmsTagLib { out << '' } - def joinActionStep = { att, body -> - out << "
  • " - out << "
    " - out << "Join Group" - out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) - out << g.hiddenField(name:'stepType', value:'join') - out << g.select(name:'group', id:"", noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") - out << "
    • " - } - def leaveActionStep = { att, body -> + return out << "
  • " out << "
    " out << "Leave Group" @@ -366,6 +357,7 @@ class FsmsTagLib { } def replyActionStep = { att, body -> + return out << "
  • " out << "
    " out << "Reply" diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index bc2eb8605..c90c7f4fc 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -1,15 +1,23 @@ <%@ page import="frontlinesms2.Group" %> + + + function initializePopup() { - $("#add-join-action-step").click(function() { addJoinActionStep(); }); + custom_activity.steps = ["join"]; + custom_activity.init(); $("#add-leave-action-step").click(function() { addLeaveActionStep(); }); $("#add-reply-action-step").click(function() { addReplyActionStep(); }); $('#custom-activity-config-container').sortable(); - - $.each($('.remove-step'), function(index, element){ - addRemoveListener(element); - }); //> Validation var validator = $("#create_customactivity").validate({ @@ -26,22 +34,22 @@ if(!isGroupChecked("blankKeyword")){ return validator.element('#keywords'); } - else return true; + return true; }; var stepActionsValidation = function() { + var valid = true; updateConfirmationMessage(); - var t = true; - var s = true; - $.each($("textarea[name='autoreplyText']"), function(index, element){ - t = (validator.element($(element)) && t); + $.each($("textarea[name='autoreplyText']"), function(index, element) { + valid = valid && validator.element($(element)); }); - $.each($("select[name='group']"), function(index, element){ - s = (validator.element($(element)) && s); + + $.each($("select[name='group']"), function(index, element) { + valid = valid && validator.element($(element)); }); - return t && s; + return valid; }; var confirmTabValidation = function() { @@ -55,11 +63,6 @@ } //>Adding steps - function addJoinActionStep() { - var container = $("#custom-activity-config-container"); - container.append(joinActionStepHtml); - } - function addLeaveActionStep() { var container = $("#custom-activity-config-container"); container.append(leaveActionStepHtml); @@ -70,20 +73,13 @@ container.append(replyActionStepHtml); } - function addRemoveListener(element) { - $(element).click(function(){ - var p = $(this).parent().parent(); - p.fadeOut(300, function(){ $(this).remove(); }); - }); - } - function delete(element) { } function setJsonToSend() { var jsonToSend = ""; - var data = new Array(); + var data = []; $.each($(".step"), function(index, element){ var dataToSend = new Object(); @@ -108,7 +104,7 @@ } function getStepProperties(inputType, container) { - var stepProperties = new Array(); + var stepProperties = []; $.each(container.find(inputType), function(index, element) { var inputField = $(element); @@ -127,15 +123,6 @@ return $(".step:last").attr("index") || 0; } - var joinActionStepHtml = function() { - <% - def divElement = fsms.joinActionStep() - %> - var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); - addRemoveListener(divElement.find('.remove-step')); - return divElement; - }; - var leaveActionStepHtml = function() { <% divElement = fsms.leaveActionStep() @@ -155,25 +142,27 @@ }; function updateConfirmationMessage() { - var container = $('#customactivity-confirm-action-steps'); + var container, keywords; + container = $('#customactivity-confirm-action-steps'); container.html(""); - $.each($(".step"), function(index, element){ - var output = ""; - var stepType = $(element).find('input#stepType').val(); + $.each($(".step"), function(index, element) { + var groupName, groupValue, messageText, output, stepType; + output = ""; + stepType = $(element).find('input#stepType').val(); if(stepType == 'join') { - var groupValue = $(element).find('select[name=group]').val(); - var groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text() + groupValue = $(element).find('select[name=group]').val(); + groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text() output = i18n("customactivity.group.join", groupName); output = "

    "+output+"

    "; } if(stepType == "leave") { - var groupValue = $(element).find('select[name=group]').val(); - var groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text() + groupValue = $(element).find('select[name=group]').val(); + groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text() output = i18n("customactivity.group.leave", groupName); output = "

    "+output+"

    "; } if(stepType == "reply") { - var messageText = $(element).find('textarea[name=autoreplyText]').val(); + messageText = $(element).find('textarea[name=autoreplyText]').val(); output = i18n("customactivity.reply.messagetext", messageText); output = "

    "+output+"

    "; } @@ -181,11 +170,11 @@ }); if(!(isGroupChecked("blankKeyword"))){ - var keywords = $('#keywords').val().toUpperCase(); + keywords = $('#keywords').val().toUpperCase(); $("#keyword-confirm").html('

    ' + keywords + '

    '); } else { $("#keyword-confirm").html('

    ' + i18n("autoreply.blank.keyword") + '

    '); } } -     + diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js new file mode 100644 index 000000000..35ba55ea7 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -0,0 +1,28 @@ +var custom_activity = (function() { + var + addStep = function(stepName) { + sanchez.append("#custom-activity-config-container", "step-" + stepName, { stepId:'', groupId:'' }); + }, + removeStep = function() { + var p = $(this).parent().parent(); + p.fadeOut(300, function() { $(this).remove(); }); + }, + initAddStepButton = function(stepName) { + $("#add-" + stepName + "-action-step").click( + function() { + addStep(stepName); + }); + }, + init = function() { + var i, steps = custom_activity.steps, + for(i=steps.length-1; i>=0; --i) { + initAddStepButton(steps[i]); + } + $('.remove-step').live("click", removeStep); + }; + return { + init:init + }; +}()); + + diff --git a/plugins/frontlinesms-core/web-app/js/sanchez.min.js b/plugins/frontlinesms-core/web-app/js/sanchez.min.js new file mode 100644 index 000000000..7faab5338 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/sanchez.min.js @@ -0,0 +1 @@ +sanchez=function(){var e=function(e,t,r,i){$(t)[e](n(r,i))},t=function(e){return new RegExp("((%7B%7B)|(\\{\\{))"+e+"((%7D%7D)|(\\}\\}))","g")},n=function(e,n){var r,i;i=$("#"+e).html();for(r in n)i=i.replace(t(r),n[r]);return i};return{template:n,append:function(t,n,r){e("append",t,n,r)},prepend:function(t,n,r){e("prepend",t,n,r)},replace:function(t,n,r){e("replaceWith",t,n,r)},replaceContent:function(t,n,r){e("html",t,n,r)}}}(); \ No newline at end of file From b9e0895c0497f416d6c3aa370bcdd04f72d2072e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 22 Jan 2013 10:54:27 +0300 Subject: [PATCH 0437/2668] Fixed bad line ending in custom_activity.js --- .../frontlinesms-core/web-app/js/activity/custom_activity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index 35ba55ea7..f3652bcd2 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -14,7 +14,7 @@ var custom_activity = (function() { }); }, init = function() { - var i, steps = custom_activity.steps, + var i, steps = custom_activity.steps; for(i=steps.length-1; i>=0; --i) { initAddStepButton(steps[i]); } From 1881dce9145d8667b86334c0a1453a9ecdce774b Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Jan 2013 11:34:14 +0300 Subject: [PATCH 0438/2668] added create supprt for leave and reply actions --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 22 -------- .../views/customactivity/_validate.gsp | 51 ++----------------- .../views/customactivity/steps/_joinstep.gsp | 10 ++++ .../views/customactivity/steps/_leavestep.gsp | 10 ++++ .../views/customactivity/steps/_replystep.gsp | 9 ++++ .../web-app/js/activity/custom_activity.js | 2 +- 6 files changed, 34 insertions(+), 70 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 3ba1de1e0..dd2712056 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -345,28 +345,6 @@ class FsmsTagLib { out << '
    • ' } - def leaveActionStep = { att, body -> - return - out << "
  • " - out << "
    " - out << "Leave Group" - out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) - out << g.hiddenField(name:'stepType', value:'leave') - out << g.select(name:'group', id:"", noSelection:['null':'Select One...'], from:Group.getAll(), value:(att?.step?.group?.id?:''), optionKey:"id",optionValue:"name", class:"notnull") - out << "
    • " - } - - def replyActionStep = { att, body -> - return - out << "
  • " - out << "
    " - out << "Reply" - out << g.hiddenField(name:'stepId', value:(att.step?.id?:'')) - out << g.hiddenField(name:'stepType', value:'reply') - out << g.textArea(name:'autoreplyText', value:(att.step?.autoreplyText?:'')) - out << "
    • " - } - def savedActionSteps = {att, body -> def activity = CustomActivity.get(att.activityId) if(activity) { diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index c90c7f4fc..f473161d5 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -1,21 +1,11 @@ -<%@ page import="frontlinesms2.Group" %> - - + + + function initializePopup() { - custom_activity.steps = ["join"]; + custom_activity.steps = ["join", "leave", "reply"]; custom_activity.init(); - $("#add-leave-action-step").click(function() { addLeaveActionStep(); }); - $("#add-reply-action-step").click(function() { addReplyActionStep(); }); $('#custom-activity-config-container').sortable(); @@ -62,21 +52,6 @@ mediumPopup.addValidation('customactivity-confirm', confirmTabValidation); } - //>Adding steps - function addLeaveActionStep() { - var container = $("#custom-activity-config-container"); - container.append(leaveActionStepHtml); - } - - function addReplyActionStep() { - var container = $("#custom-activity-config-container"); - container.append(replyActionStepHtml); - } - - function delete(element) { - - } - function setJsonToSend() { var jsonToSend = ""; var data = []; @@ -123,24 +98,6 @@ return $(".step:last").attr("index") || 0; } - var leaveActionStepHtml = function() { - <% - divElement = fsms.leaveActionStep() - %> - var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); - addRemoveListener(divElement.find('.remove-step')); - return divElement; - }; - - var replyActionStepHtml = function() { - <% - divElement = fsms.replyActionStep() - %> - var divElement = $(${divElement} + "").attr("index", (parseInt(indexOfLastStep()) + 1)); - addRemoveListener(divElement.find('.remove-step')); - return divElement; - }; - function updateConfirmationMessage() { var container, keywords; container = $('#customactivity-confirm-action-steps'); diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp new file mode 100644 index 000000000..3b556c6a0 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp @@ -0,0 +1,10 @@ +<%@ page import="frontlinesms2.Group" %> + \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp new file mode 100644 index 000000000..b6219a635 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp @@ -0,0 +1,10 @@ +<%@ page import="frontlinesms2.Group" %> + \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp new file mode 100644 index 000000000..3e2f58405 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index f3652bcd2..3e5380c85 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -1,7 +1,7 @@ var custom_activity = (function() { var addStep = function(stepName) { - sanchez.append("#custom-activity-config-container", "step-" + stepName, { stepId:'', groupId:'' }); + sanchez.append("#custom-activity-config-container", "step-" + stepName, { stepId:'', groupId:'', autoreplyText:'' }); }, removeStep = function() { var p = $(this).parent().parent(); From 72f6ec080895ed3234df77eecaadc08ef39069c3 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Jan 2013 11:36:29 +0300 Subject: [PATCH 0439/2668] remove prior code for adding edited steps into the config template --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 17 ----------------- .../grails-app/views/customactivity/_config.gsp | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index dd2712056..7a7df3b01 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -344,23 +344,6 @@ class FsmsTagLib { } out << '' } - - def savedActionSteps = {att, body -> - def activity = CustomActivity.get(att.activityId) - if(activity) { - activity.steps?.each { step-> - if(step.action == "doJoin"){ - out << fsms.joinActionStep(step:step) - } - if(step.action == "doLeave"){ - out << fsms.leaveActionStep(step:step) - } - if(step.action == "doReply"){ - out << fsms.replyActionStep(step:step) - } - } - } - } private def getFields(att) { def fields = att.remove('fields') diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp index b33e4b5dc..683b73aae 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp @@ -8,7 +8,7 @@
      - +
    \ No newline at end of file + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index f473161d5..9d5aef81f 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -1,7 +1,3 @@ - - - - function initializePopup() { custom_activity.steps = ["join", "leave", "reply"]; @@ -100,7 +96,7 @@ function updateConfirmationMessage() { var container, keywords; - container = $('#customactivity-confirm-action-steps'); + container = $('#customactivity-confirm-steps'); container.html(""); $.each($(".step"), function(index, element) { var groupName, groupValue, messageText, output, stepType; diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp new file mode 100644 index 000000000..f03c25e85 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp @@ -0,0 +1,9 @@ +<%@ page import="frontlinesms2.Group" %> +
  • +
    + Join Group + + + +
    • + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp deleted file mode 100644 index 3b556c6a0..000000000 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_joinstep.gsp +++ /dev/null @@ -1,10 +0,0 @@ -<%@ page import="frontlinesms2.Group" %> - \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp new file mode 100644 index 000000000..9afac84c5 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp @@ -0,0 +1,8 @@ +<%@ page import="frontlinesms2.Group" %> +
  • +
    + Leave Group + + + +
    • diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp deleted file mode 100644 index 4eb180d59..000000000 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leavestep.gsp +++ /dev/null @@ -1,10 +0,0 @@ -<%@ page import="frontlinesms2.Group" %> - \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp new file mode 100644 index 000000000..b22ffa71c --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp @@ -0,0 +1,8 @@ +
  • +
    + Reply + + + +
    • + diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp deleted file mode 100644 index 3e2f58405..000000000 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_replystep.gsp +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/message/_activity_more_actions.gsp b/plugins/frontlinesms-core/grails-app/views/message/_activity_more_actions.gsp deleted file mode 100644 index e69de29bb..000000000 diff --git a/plugins/frontlinesms-core/web-app/js/message/moreActions.js b/plugins/frontlinesms-core/web-app/js/message/moreActions.js index 6fba97172..396ca7f43 100644 --- a/plugins/frontlinesms-core/web-app/js/message/moreActions.js +++ b/plugins/frontlinesms-core/web-app/js/message/moreActions.js @@ -1,79 +1,99 @@ -$(document).ready(function() { - $('.more-actions').bind('change', function() { - if ($(this).find('option:selected').val() === 'delete') { - deleteAction(); - } else if($(this).find('option:selected').val() === 'rename') { - renameAction(); - } else if($(this).find('option:selected').val() === 'edit') { - editAction(); - } else if($(this).find('option:selected').val() === 'export') { - exportAction(); - } - selectmenuTools.snapback($('#more-actions')); - }); - - $("#export").click(exportAction); -}); - -function renameAction() { - var messageSection = $("#messageSection").val(); - $.ajax({ - type:'GET', - url: url_root + messageSection + '/rename', - data: {ownerId: $("#ownerId").val()}, - beforeSend: function(){ showThinking(); }, - success: function(data) { - hideThinking(); launchSmallPopup(i18n("smallpopup.fmessage.rename.title", messageSection), data, i18n("action.rename"), 'validate'); } - }); -} +var more_actions = (function() { + var + getOwnerId = function() { + return $("#ownerId").val(); + }, + getController = function() { + // This is a legacy feature - getController is only + // used to determine the controller to use, so we should + // use a specific one when it is available, but otherwise + // use standard activity. + return $("#activityType").val() || $("#messageSection").val(); + }, + buildUrl = function(action) { + return url_root + getController() + "/" + action; + }, + deleteAction = function() { + $.ajax({ + type:'GET', + url: buildUrl("confirmDelete"), + data: { id:getOwnerId() }, + success: function(data) { + launchSmallPopup(i18n("smallpopup.fmessage.delete.title", getController()), data, i18n("action.delete")); } + }); + }, + exportAction = function() { + var viewingArchive, params; + viewingArchive = url.indexOf("/archive/") !== -1; + params = { + messageSection: $("#messageSection").val(), + ownerId: getOwnerId(), + starred: $('input:hidden[name=starred]').val(), + inbound: $('input:hidden[name=inbound]').val(), + failed: $('input:hidden[name=failed]').val(), + viewingArchive: viewingArchive, + searchString: $("#searchString").val(), + messageTotal: $("#messageTotal").val(), + groupId: $("#groupId").val() }; -function editAction() { - var title, messageSection; - messageSection = $("#messageSection").val(); - title = i18n("wizard.fmessage.edit.title", messageSection); - $.ajax({ - type:'GET', - url: url_root + messageSection + '/edit', - data: {id: $("#ownerId").val()}, - beforeSend: function(){ showThinking(); }, - success: function(data) { - hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.ok'), 675, 500, false); } - }); -} + $.ajax({ + type:'GET', + url: url_root + 'export/messageWizard', + data: params, + beforeSend: function() { showThinking(); }, + success: function(data) { + hideThinking(); + launchSmallPopup(i18n("smallpopup.fmessage.export.title"), data, i18n("action.export")); + updateExportInfo(); + } + }); + }, + editAction = function() { + var title; + title = i18n("wizard.fmessage.edit.title", getController()); + $.ajax({ + type:'GET', + url: buildUrl("edit"), + data: { id:getOwnerId() }, + beforeSend: function() { showThinking(); }, + success: function(data) { + hideThinking(); + mediumPopup.launchMediumWizard(title, data, i18n('wizard.ok'), 675, 500, false); + } + }); + }, + renameAction = function() { + $.ajax({ + type:'GET', + url: buildUrl("rename"), + data: { ownerId:getOwnerId() }, + beforeSend: function() { showThinking(); }, + success: function(data) { + hideThinking(); + launchSmallPopup(i18n("smallpopup.fmessage.rename.title", getController()), data, i18n("action.rename"), 'validate'); + } + }); + }, + init = function() { + $('.more-actions').bind('change', function() { + if ($(this).find('option:selected').val() === 'delete') { + deleteAction(); + } else if($(this).find('option:selected').val() === 'rename') { + renameAction(); + } else if($(this).find('option:selected').val() === 'edit') { + editAction(); + } else if($(this).find('option:selected').val() === 'export') { + exportAction(); + } + selectmenuTools.snapback($('#more-actions')); + }); -function deleteAction() { - var messageSection = $("#messageSection").val(); - $.ajax({ - type:'GET', - url: url_root + messageSection + '/confirmDelete', - data: {id: $("#ownerId").val()}, - success: function(data) { - launchSmallPopup(i18n("smallpopup.fmessage.delete.title", messageSection), data, i18n("action.delete")); } - }); -} + $("#export").click(exportAction); + }; + return { init:init }; +}()); -function exportAction() { - var viewingArchive, params; - viewingArchive = url.indexOf("/archive/") !== -1; - params = { - messageSection: $("#messageSection").val(), - ownerId: $('input:hidden[name=ownerId]').val(), - starred: $('input:hidden[name=starred]').val(), - inbound: $('input:hidden[name=inbound]').val(), - failed: $('input:hidden[name=failed]').val(), - viewingArchive: viewingArchive, - searchString: $("#searchString").val(), - messageTotal: $("#messageTotal").val(), - groupId: $("#groupId").val() }; - - $.ajax({ - type:'GET', - url: url_root + 'export/messageWizard', - data: params, - beforeSend: function(){ showThinking(); }, - success: function(data) { - hideThinking(); launchSmallPopup(i18n("smallpopup.fmessage.export.title"), data, i18n("action.export")); - updateExportInfo(); } - }); -} +$(document).ready(function() { + more_actions.init(); +}); From 59f8b504b18058551371bfc0e6d4813691ba7093 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Jan 2013 16:43:05 +0300 Subject: [PATCH 0447/2668] ready for rc5-snapshot --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index bd08182fd..79d559c88 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0-RC4 +app.version=2.0-rc5-SNAPSHOT From 905f22c53d932237d383cb03ee8dddd3400e0eb5 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 23 Jan 2013 12:34:31 +0300 Subject: [PATCH 0448/2668] refractored steps in custom activity --- .../domain/frontlinesms2/LeaveActionStep.groovy | 13 +++++++++++++ .../domain/frontlinesms2/ReplyActionStep.groovy | 9 +++++++++ .../grails-app/domain/frontlinesms2/Step.groovy | 11 ----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy index b2346486e..c358ea111 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy @@ -12,10 +12,18 @@ class LeaveActionStep extends Step { stepProperties nullable: true } + Map getConfig() { + [stepId:id, groupId:getGroupId()] + } + def getGroup() { Group.get(getPropertyValue("group")) } + def getGroupId() { + getPropertyValue("group") + } + def setGroup(Group group) { setPropertyValue("group", group.id) } @@ -23,4 +31,9 @@ class LeaveActionStep extends Step { def process(Fmessage message) { subscriptionService.doLeave(this, message) } + + def niceFormat() { + return "Leaving '${this.group?.name}' group" + } + } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy index 81b0c1d0b..ba0616e0e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy @@ -11,6 +11,10 @@ class ReplyActionStep extends Step { static constraints = { } + Map getConfig() { + [stepId:id, autoreplyText:autoreplyText] + } + def getAutoreplyText() { getPropertyValue("autoreplyText") } @@ -18,4 +22,9 @@ class ReplyActionStep extends Step { def process(Fmessage message) { autoreplyService.doReply(this, message) } + + def niceFormat() { + return "Replying with '${this.autoreplyText}'" + } + } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index b861a850b..cc29393cb 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -31,15 +31,4 @@ abstract class Step { String getJsonConfig() { return getConfig() as JSON } - - def niceFormat() { -// TODO move this into steps themselves - if(this instanceof LeaveActionStep) { - return "Leaving '${this.group?.name}' group" - } - if(this instanceof ReplyActionStep) { - return "Replying with '${this.autoreplyText}'" - } - } - } From d9b9349df03f45ead8e937ac983ccf55b48f237d Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 23 Jan 2013 12:45:04 +0300 Subject: [PATCH 0449/2668] fixed bug where the confirm tab did not display the step summary --- .../grails-app/views/customactivity/_validate.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 9d5aef81f..091c8edda 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -96,7 +96,7 @@ function updateConfirmationMessage() { var container, keywords; - container = $('#customactivity-confirm-steps'); + container = $('#customactivity-confirm-action-steps'); container.html(""); $.each($(".step"), function(index, element) { var groupName, groupValue, messageText, output, stepType; From 26802578cb005509a6b71f9352f117cfd8be7673 Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 23 Jan 2013 12:53:07 +0300 Subject: [PATCH 0450/2668] modified do/check_for_bad_template_renders --- .../frontlinesms-core/do/check_for_bad_template_renders | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/do/check_for_bad_template_renders b/plugins/frontlinesms-core/do/check_for_bad_template_renders index 8cf4946bb..993527860 100755 --- a/plugins/frontlinesms-core/do/check_for_bad_template_renders +++ b/plugins/frontlinesms-core/do/check_for_bad_template_renders @@ -1,11 +1,11 @@ #!/bin/bash echo "# Checking views..." -grep -rn 'g:render.*template' grails-app/views/ +grep -rn "render.*template" grails-app/views/ | grep -rv "fsms.render" VIEW_OUTPUT=$? echo "" echo "# Checking controllers" -grep -rn "render.*template" grails-app/controllers/ +grep -rn "render.*template" grails-app/controllers/ | grep -rv "fsms.render" CONTROLLER_OUTPUT=$? if [ "$CONTROLLER_OUTPUT" -eq 1 ] && [ "$VIEW_OUTPUT" -eq 1 ]; then @@ -14,5 +14,4 @@ if [ "$CONTROLLER_OUTPUT" -eq 1 ] && [ "$VIEW_OUTPUT" -eq 1 ]; then else echo "The violations above were detected" exit 1 -fi - +fi \ No newline at end of file From 5d004cce8a4ecf8feb4ad9ee71a828e375e2c13d Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 23 Jan 2013 15:01:56 +0300 Subject: [PATCH 0451/2668] removed inlined CSS as well as commented code --- .../grails-app/views/webconnection/_validate.gsp | 6 ------ plugins/frontlinesms-core/web-app/css/controls.css | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 5ec97af35..a721e842d 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -121,15 +121,9 @@ testRouteBtn = $('', { id: "testRoute", type:"submit", - style:"margin:.5em .6em .5em 0; height:26px;", value: i18n('webconnection.testroute.label'), click: testRouteStatus }); - /*testRouteBtn.button({ - id: "testRoute", - value: i18n('webconnection.testroute.label'), - click: testRouteStatus - });*/ } else { testRouteBtn.show(); } diff --git a/plugins/frontlinesms-core/web-app/css/controls.css b/plugins/frontlinesms-core/web-app/css/controls.css index 01ff5f6e8..10060f8e9 100644 --- a/plugins/frontlinesms-core/web-app/css/controls.css +++ b/plugins/frontlinesms-core/web-app/css/controls.css @@ -84,3 +84,5 @@ input[type="text"].search{ background-image:url('../images/icons/search.png'); #thinking { background-color:transparent; z-index:99; display:none; background-image:url('../images/thinking.gif'); background-position:center; background-repeat:no-repeat; } +/*#testRoute { margin:.5em .6em .5em 0; height:26px; }*/ + From 12bb029b777996f2d741194e685c2ed3c1085c19 Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 23 Jan 2013 15:24:06 +0300 Subject: [PATCH 0452/2668] modified web-app/css/control.css --- plugins/frontlinesms-core/web-app/css/controls.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/css/controls.css b/plugins/frontlinesms-core/web-app/css/controls.css index 10060f8e9..9dfa86027 100644 --- a/plugins/frontlinesms-core/web-app/css/controls.css +++ b/plugins/frontlinesms-core/web-app/css/controls.css @@ -84,5 +84,5 @@ input[type="text"].search{ background-image:url('../images/icons/search.png'); #thinking { background-color:transparent; z-index:99; display:none; background-image:url('../images/thinking.gif'); background-position:center; background-repeat:no-repeat; } -/*#testRoute { margin:.5em .6em .5em 0; height:26px; }*/ +#testRoute { margin:.5em .6em .5em 0; height:26px; } From 2eaf6c4e5f32167a1c172f734add70543212615f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 23 Jan 2013 15:58:24 +0300 Subject: [PATCH 0453/2668] refractored FmessageService.groovy --- .../domain/frontlinesms2/Activity.groovy | 5 ++++ .../frontlinesms2/FmessageService.groovy | 24 +++++-------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index ee52c6f8e..944a56ce2 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -73,6 +73,11 @@ abstract class Activity extends MessageOwner { def deactivate() {} + def move(messageInstance) { + messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) + this.processKeyword(messageInstance, null) + } + private def logFail(c, ex) { ex.printStackTrace() log.warn("Error creating routes of webconnection with id $c?.id", ex) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy index 8710b5d38..7a99fb2fa 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy @@ -5,27 +5,14 @@ class FmessageService { def move(messageList, activity, params) { def messagesToSend = [] - messageList.each { messageInstance -> - if(messageInstance.isMoveAllowed()){ + messageList.each { messageInstance -> + if(messageInstance.isMoveAllowed()) { messageInstance.ownerDetail = null messageInstance.isDeleted = false Trash.findByObject(messageInstance)?.delete(failOnError:true) if (params.messageSection == 'activity') { - messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) - activity.addToMessages(messageInstance) - if(activity.metaClass.hasProperty(null, 'autoreplyText') && activity.autoreplyText) { - params.addresses = messageInstance.src - params.messageText = activity.autoreplyText - def outgoingMessage = messageSendService.createOutgoingMessage(params) - outgoingMessage.save() - messagesToSend << outgoingMessage - activity.addToMessages(outgoingMessage) - activity.save() - } else if(activity instanceof Webconnection) { - activity.processKeyword(messageInstance, null) - }else if(activity instanceof Autoforward) { - activity.processKeyword(messageInstance, null) - } + activity.move(messageInstance) + activity.save() } else if (params.ownerId && params.ownerId != 'inbox') { messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) MessageOwner.get(params.ownerId).addToMessages(messageInstance).save(failOnError:true) @@ -38,8 +25,9 @@ class FmessageService { } } } - } + } } + if(messagesToSend) { MessageSendJob.defer(messagesToSend) } From b67c008273418d76b8df3a0477cc57dde1d3918d Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 23 Jan 2013 16:01:07 +0300 Subject: [PATCH 0454/2668] renames to SNAPSHOT so as to make a build --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 79d559c88..60ce1063a 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0-rc5-SNAPSHOT +app.version=2.0-SNAPSHOT From 2bd03925c9873a15adf13087e2f1d3412128ee38 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 23 Jan 2013 16:28:06 +0300 Subject: [PATCH 0455/2668] Filled in missing translations for kiswahili --- .../grails-app/i18n/messages_sw.properties | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 956e6c343..6b3692aba 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -396,7 +396,9 @@ poll.choice.validation.error.deleting.response=Huwezi futa chagua iliyowekwa poll.alias=Malakabu poll.keywords=Maneno kuu poll.aliases.prompt=Andika malakabu yanayolingana na majibu. -poll.aliases.prompt.details=Malakabu hayo yatenganishwe na koma. Lakabu ya kwanza litatumwa katika risala. +poll.keywords.prompt.details=Neno kuu ya juu kabisa ita tumwa katika risala. Unaweza kutumia maneno kuu kwa kila majibu. +poll.keywords.prompt.more.details=Unaweza kutumia maneno kuu yatakayotenganishwa na koma kwa neno kuu ya juu. Kama maneno kuu ya juu hayatawekwa , basi maneno kuu ya majibu lazima yawe ya kipekee kwa kila SHUGULI +poll.keywords.response.label=Maneno kuu ya Majibu poll.response.keyword=Weka maneno kuu ya majibu poll.set.keyword=Weka neno kuu la ngazi ya juu poll.keywords.validation.error=Maneno kuu lazima yawe ya kipekee @@ -404,12 +406,21 @@ poll.sort.label=Panga moja kwa moja poll.autosort.no.description=Risala hazitapangwa moja kwa moja poll.autosort.description=Panga risala kulingana na neno kuu poll.sort.keyword=neno kuu +poll.sort.toplevel.keyword.label=Maneno Kuu(si lazima) poll.sort.by=Panga risala kulingana na neno kuu poll.autoreply.label=Jibu la moja kwa moja poll.autoreply.none=Hakuna poll.recipients.label=Wapokeaji poll.recipients.none=Hakuna poll.toplevelkeyword=Maneno kuu ya ngazi ya juu +poll.sort.example.toplevel=k.m TEAM +poll.sort.example.keywords.A=k.m A, AMAZING +poll.sort.example.keywords.B=k.m B, BEAUTIFUL +poll.sort.example.keywords.C=k.m C, COAURAGEOUS +poll.sort.example.keywords.D=k.m D, DELIGHTFUL +poll.sort.example.keywords.E=k.m E, EXEMPLARY +poll.sort.example.keywords.yn.A=k.m NDIO, YES +poll.sort.example.keywords.yn.B=k.m HAPANA, NO #TODO embed javascript values poll.recipients.count=Wapokeaji wamechaguliwa @@ -498,6 +509,7 @@ poll.replies.description=Ukipokea risala inayolingana na jibu la uchaguzi huu, t poll.autoreply.send=Tuma risala ya moja kwa moja kwa watumaji wa majibu ya uchaguzi huu poll.responses.prompt=Andika majibu unayotarajia (Kati ya 2 hadi 5) poll.sort.header=Panga risala kulingana na neno kuu (kwa hiari yako) +poll.sort.enter.keywords=Andika maneno kuu ya majibu poll.sort.description=Watumaji risala watakapotuma majibu wakitumia neno kuu, FrontlineSMS inaweza kupanga risala hizo kulingana na neno hilo poll.no.automatic.sort=Usipange risala kulingana na neno kuu poll.sort.automatically=Panga risala zinazotumia hili neno kuu moja kwa moja @@ -947,11 +959,13 @@ subscription.select.group=Chagua kikundi cha usajili subscription.group.none.selected=Chagua kikundi subscription.autoreplies=Majibu ya moja kwa moja subscription.sorting=Upangaji wa moja kwa moja +subscription.sorting.header=Risala zitalinganishwa na maneno kuu utakayo patia(si lazima). subscription.confirm=Thibitisha subscription.group.header=Chagua Kikundi subscription.group.description=Mwasiliani aweza ongezwa am kutolewa kwa kikundi wakati FrontlineSMS itapata risala iliyo na neno kuu -subscription.top.keyword.header=Andika maneno kuu ya ngazi ya juu (si lazima) +subscription.keyword.header=Andika maneno kuu ya Usajili hii. subscription.top.keyword.description=Unaweza kuandika maneno kuu kadhaa yaliyogawanyishwa na mkato. Ikiwa utatumia mtindo huu, ujumbe utapangwa katika usajili huu iwapo neno la kwanza litafanana na neno kuu +subscription.top.keyword.more.description=Unaweza kutumia maneno kuu ya juu zaidi ya moja. Andika maneno kuu hayo yakiwa yametenganishwa na koma. Maneno kuu haya lazima yawe ya kipekee kwa kila Shughuli. subscription.keywords.header=Andika maneno kuu kwa matendo ya usajili subscription.keywords.description=Andika maneno kuu ya kujiunga na kuondoka kundi hili. Unaweza kuandika maneno zaidi ya moja kama yame tenganishwa na mkato subscription.default.action.header=Kitendo Msingi @@ -981,6 +995,10 @@ subscription.categorise.toggle.label=Ongezea ama Toa wawasiliani kutoka {0} subscription.join=Ingia subscription.leave=Toka +subscription.sorting.example.toplevel=k.m JIBU +subscription.sorting.example.join=k.m INGIA, JOIN +subscription.sorting.example.leave=k.m TOKA, LEAVE + subscription.keyword.required=Neno kuu yahitajika subscription.jointext.required=Risala yakuingia yahitajika subscription.leavetext.required=Risala yakutoka yahitajika From 044093b4012d90ef647354a41dcd14907a979213 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 23 Jan 2013 16:57:39 +0300 Subject: [PATCH 0456/2668] reset app.version to 2.1-SNAPSHOT --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 60ce1063a..1872b5b4b 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=2.0-SNAPSHOT +app.version=2.1-SNAPSHOT From 9fe93827c1ca4131ad18ae9160347ca7315fa757 Mon Sep 17 00:00:00 2001 From: ivermac Date: Thu, 24 Jan 2013 11:08:26 +0300 Subject: [PATCH 0457/2668] changed grep search strings to 'fsms:render' and 'fsms\.render' --- plugins/frontlinesms-core/do/check_for_bad_template_renders | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/do/check_for_bad_template_renders b/plugins/frontlinesms-core/do/check_for_bad_template_renders index 993527860..84a549dc6 100755 --- a/plugins/frontlinesms-core/do/check_for_bad_template_renders +++ b/plugins/frontlinesms-core/do/check_for_bad_template_renders @@ -1,11 +1,11 @@ #!/bin/bash echo "# Checking views..." -grep -rn "render.*template" grails-app/views/ | grep -rv "fsms.render" +grep -rn "render.*template" grails-app/views/ | grep -v "fsms:render" VIEW_OUTPUT=$? echo "" echo "# Checking controllers" -grep -rn "render.*template" grails-app/controllers/ | grep -rv "fsms.render" +grep -rn "render.*template" grails-app/controllers/ | grep -v "fsms\.render" CONTROLLER_OUTPUT=$? if [ "$CONTROLLER_OUTPUT" -eq 1 ] && [ "$VIEW_OUTPUT" -eq 1 ]; then From d46fe14699f6b4c9f4d5814c87ca4bd961725ad0 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 24 Jan 2013 12:07:26 +0300 Subject: [PATCH 0458/2668] Added sortable routing List for connections --- .../grails-app/conf/CoreBootStrap.groovy | 1 + .../grails-app/conf/CoreResources.groovy | 2 +- .../frontlinesms2/SettingsController.groovy | 49 +++++++++++++++++++ .../grails-app/i18n/messages.properties | 1 + .../taglib/frontlinesms2/FsmsTagLib.groovy | 5 +- .../grails-app/views/settings/general.gsp | 22 ++++++++- .../controllers/SettingsControllerSpec.groovy | 42 +++++++++++++++- ...cAuthValidation.js => general_settings.js} | 5 ++ 8 files changed, 121 insertions(+), 6 deletions(-) rename plugins/frontlinesms-core/web-app/js/settings/{basicAuthValidation.js => general_settings.js} (97%) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 6f9e5ba6b..531c11ef4 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -46,6 +46,7 @@ class CoreBootStrap { appSettingsService['newfeatures.popup.show.immediately'] = false //default routing in tests is to use any available connections appSettingsService.set('routing.uselastreceiver', false) + appSettingsService.set('routing.rules', 'uselastreceiver') appSettingsService.set('routing.otherwise', 'any') appSettingsService.set('routing.preferences.edited', true) } diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 89475f689..f6f3d1430 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -103,7 +103,7 @@ modules = { settings { dependsOn "common" - resource url:[dir:'js', file:'/settings/basicAuthValidation.js'] + resource url:[dir:'js', file:'/settings/general_settings.js'] } overrides { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index ebd5c87ef..3e3d8a5be 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -30,14 +30,21 @@ class SettingsController extends ControllerUtils { def username = new String(appSettingsService.get("auth.basic.username").decodeBase64()) def password = new String(appSettingsService.get("auth.basic.password").decodeBase64()) def appSettings = [:] + + //TODO Filter out only connections with send enabled + appSettings['routing.uselastreceiver'] = appSettingsService.get("routing.uselastreceiver") appSettings['routing.otherwise'] = appSettingsService.get("routing.otherwise") + appSettings['routing.rules'] = appSettingsService.get("routing.rules") + + def routingRulesMap = getRoutingRules(appSettings['routing.rules']) [currentLanguage:i18nUtilService.getCurrentLanguage(request), authEnabled:authEnabled, username:username, password:password, languageList:i18nUtilService.allTranslations, + routingRulesMap:routingRulesMap, appSettings:appSettings] } @@ -47,6 +54,7 @@ class SettingsController extends ControllerUtils { } def basicAuth() { + println "params:: $params" if(appSettingsService.get("auth.basic.enabled") && appSettingsService.get("auth.basic.username") && appSettingsService.get("auth.basic.password")) { appSettingsService.set('auth.basic.enabled', params.enabled) } @@ -62,11 +70,52 @@ class SettingsController extends ControllerUtils { } def changeRoutingPreferences() { + println "params:: $params" appSettingsService.set('routing.uselastreceiver', params.uselastreceiver? 'true': 'false') + appSettingsService.set('routing.rules', "${processConnectionRules(params)}") appSettingsService.set('routing.otherwise', params.otherwise) redirect action:'general' } + private def processConnectionRules(params) { + def routingRules + routingRules = params.findAll {it.key == "uselastreceiver" || it.key ==~ /fconnection-\d/} + routingRules.getAllKeys().join(",") + } + + private getRoutingRules(routingRules) { + def routingRuleList = [] + def routingRulesMap = [:] + def connectionInstanceList = Fconnection.findAll() + + if(routingRules) { + routingRuleList = routingRules?.tokenize(",")?.flatten() + println "Routing Rules before refinement:::: $routingRules" + + // Replacing fconnection rules with fconnection instances + routingRuleList = routingRuleList.collect { rule -> + if(rule.contains("fconnection-")) connectionInstanceList.find { + println "Comparing rule:: $rule with id:: $it :: ${it.id == ((rule - 'fconnection-') as Integer)}" + it.id == ((rule - 'fconnection-') as Integer) + } + else rule + } + + if(routingRuleList) { + def length = routingRuleList.size() + if(!routingRuleList.contains("uselastreceiver")) routingRuleList << "uselastreceiver" + ((routingRuleList += connectionInstanceList) - null as Set).eachWithIndex {it, index -> + if(index < length) routingRulesMap[it] = true + else routingRulesMap[it] = false + } + } + + } else { + routingRuleList << "uselastreceiver" + ((routingRuleList + connectionInstanceList) as Set).findAll{ routingRulesMap[it] = false } + } + } + private def withFconnection = withDomainObject Fconnection, { params.id }, { render(view:'show_connections', model: [fconnectionInstanceTotal: 0]) } } diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 0c93eabab..3a6e90a80 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -1048,6 +1048,7 @@ routing.info=Define which connection will be used for message sending routing.rules.sending=When sending: routing.rules.otherwise=Otherwise: routing.rule.uselastreceiver=Use last connection that this contact messaged +routing.rules.device=Use {0} routing.rule.useany=Use any available connection routing.rule.dontsend=Do not send the message diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 82322ed70..b759e25a6 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -75,11 +75,11 @@ class FsmsTagLib { out << '' } - def checkboxGroup = { att -> + def checkboxGroup = { att,body -> out << "
    " if(att.title) out << "

    ${g.message(code:att.title)}

    " if(att.info) out << info([message:att.info]) - out << '
      ' + out << "
        " att.values.each { key, checked -> def label = g.message(code:att.label + '.' + key) def itemAttributes = [checked:checked, name:key, value:true] @@ -88,6 +88,7 @@ class FsmsTagLib { out << checkbox(itemAttributes) out << '' } + out << body() out << '
    ' } diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index 9b96b27aa..fc0db8314 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -53,8 +53,26 @@

    - + + + +
  • + + +
    • +     + +
  • + + +
    • +     +     +     appSettingsService.get(k, _) >> { v instanceof String? v.bytes.encodeBase64().toString(): v } diff --git a/plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js b/plugins/frontlinesms-core/web-app/js/settings/general_settings.js similarity index 97% rename from plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js rename to plugins/frontlinesms-core/web-app/js/settings/general_settings.js index bc2d59c86..107fd6bf7 100644 --- a/plugins/frontlinesms-core/web-app/js/settings/basicAuthValidation.js +++ b/plugins/frontlinesms-core/web-app/js/settings/general_settings.js @@ -1,3 +1,8 @@ + +$(function(){ + $("#sortable").sortable(); +}); + var basicAuthValidation = { enable: function() { var validatePassword = function(value, element) { From 66105c9e4c715b5a7d8cfe29c196f90bdfc89ac8 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 24 Jan 2013 12:27:54 +0300 Subject: [PATCH 0459/2668] Rolled up version for radio b2 release --- plugins/radio/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/radio/application.properties b/plugins/radio/application.properties index ddeda82ac..0aba6116d 100644 --- a/plugins/radio/application.properties +++ b/plugins/radio/application.properties @@ -3,5 +3,5 @@ app.grails.version=2.0.3 app.name=radio app.servlet.version=2.5 -app.version=0.a8-SNAPSHOT +app.version=0.b2 plugins.tomcat=2.0.3 From 1374b7e303b37425abbd9509054437eb86b2836e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 24 Jan 2013 15:05:11 +0300 Subject: [PATCH 0460/2668] modified do/deploy_builds and added tests for moving message from one activity to another --- plugins/frontlinesms-core/do/deploy_builds | 10 ++--- .../domain/frontlinesms2/Activity.groovy | 6 ++- .../domain/frontlinesms2/Poll.groovy | 19 ++++---- .../domain/frontlinesms2/Subscription.groovy | 4 +- .../frontlinesms2/FmessageService.groovy | 2 +- .../controller/MessageControllerISpec.groovy | 43 ++++++++++++++++++- 6 files changed, 65 insertions(+), 19 deletions(-) diff --git a/plugins/frontlinesms-core/do/deploy_builds b/plugins/frontlinesms-core/do/deploy_builds index 9396b5abb..2b7b4690a 100755 --- a/plugins/frontlinesms-core/do/deploy_builds +++ b/plugins/frontlinesms-core/do/deploy_builds @@ -24,7 +24,7 @@ mac_file=`ls install/target/install4j/ | grep mac` unix_file=`ls install/target/install4j/ | grep unix` r_windows_path=$r_path$windows_file -r_mac_path=$r_mac_path$mac_file +r_mac_path=$r_path$mac_file r_unix_path=$r_path$unix_file echo ">>>>>>>>>>> Uploading to"$remote_upload_path @@ -75,16 +75,16 @@ else exit 0 fi -exit ##Exiting so as not to upload link file + echo "#### Creating the xml file with file names" touch build_links.php -echo "" >> build_links.php +echo "" >> build_links.php echo "#### Uloading xml document with file names" local_json_path="build_links.php" -#curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" +curl -v -T $local_json_path -u $USERNAME:$PASSWORD -Q "TYPE I" "$remote_upload_path" cat build_links.php echo "#### Removing build_links.php... :(" rm build_links.php -echo "Complete .... :)" \ No newline at end of file +echo "Complete .... :)" diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index 944a56ce2..c7d2c2742 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -63,7 +63,11 @@ abstract class Activity extends MessageOwner { this.messages*.isDeleted = false } - def processKeyword(Fmessage message, Keyword match) {} + def processKeyword(Fmessage message, Keyword match) { + message.ownerDetail = null + this.addToMessages(message) + this.save(failOnError:true) + } /** * Activcate this activity. If it is already activated, this method should diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy index b34281cab..b65dd10df 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy @@ -161,25 +161,26 @@ class Poll extends Activity { def processKeyword(Fmessage message, Keyword keyword) { def response = getPollResponse(message, keyword) - response.addToMessages(message) - response.save() - def poll = this - if(poll.autoreplyText) { + response?.addToMessages(message) + response?.save() + this.addToMessages(message) + if(this.autoreplyText) { def params = [:] params.addresses = message.src - params.messageText = poll.autoreplyText + params.messageText = this.autoreplyText def outgoingMessage = messageSendService.createOutgoingMessage(params) - poll.addToMessages(outgoingMessage) + this.addToMessages(outgoingMessage) messageSendService.send(outgoingMessage) - poll.save(failOnError:true) + this.save(failOnError:true) } + this.save(failOnError:true) } def PollResponse getPollResponse(Fmessage message, Keyword keyword) { - if(keyword.isTopLevel && !keyword.ownerDetail){ + if(keyword?.isTopLevel && !keyword?.ownerDetail){ return this.unknown } else { - return this.responses.find{ keyword.ownerDetail == it.key } + return this.responses.find{ keyword?.ownerDetail == it.key } } } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy index 5f8af83d8..6b9aae308 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Subscription.groovy @@ -114,8 +114,8 @@ class Subscription extends Activity { } Action getAction(Keyword k) { - def actionText = k.ownerDetail - println "### OwnerDetail ## ${k.ownerDetail}" + def actionText = k?.ownerDetail + println "### OwnerDetail ## ${k?.ownerDetail}" if(actionText == Action.JOIN.toString()){ return Action.JOIN } else if(actionText == Action.LEAVE.toString()){ diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy index 7a99fb2fa..618db3475 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FmessageService.groovy @@ -12,7 +12,7 @@ class FmessageService { Trash.findByObject(messageInstance)?.delete(failOnError:true) if (params.messageSection == 'activity') { activity.move(messageInstance) - activity.save() + activity.save(failOnError:true, flush:true) } else if (params.ownerId && params.ownerId != 'inbox') { messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) MessageOwner.get(params.ownerId).addToMessages(messageInstance).save(failOnError:true) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy index 3fb084ab7..f48112d75 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy @@ -236,8 +236,49 @@ class MessageControllerISpec extends grails.plugin.spock.IntegrationSpec { message.messageOwner.id == announcement.id message.ownerDetail != 'ownerdetail-pending' } +@spock.lang.IgnoreRest +@spock.lang.Unroll + def 'moving messages to different activities and sections should work'() { + given: + def message = Fmessage.build(inbound:true) + def autoforward = Autoforward.build(name:'autoforward') + def autoreply = Autoreply.build(name:'autoreply') + def webconnection = GenericWebconnection.build(name:'webconnection') + def subscription = Subscription.build(name:'subscription') + def poll = new Poll(name: 'This is a poll') + poll.editResponses(choiceA: 'Manchester', choiceB:'Barcelona') + poll.save(failOnError:true, flush:true) + + controller.params.messageId = message.id + controller.params.ownerId = poll.id + controller.params.messageSection = 'activity' + when: + controller.move() + then: + message.messageOwner.id == poll.id + when: + controller.params.ownerId = autoforward.id + controller.move() + then: + message.messageOwner.id == autoforward.id + when: + controller.params.ownerId = autoreply.id + controller.move() + then: + message.messageOwner.id == autoreply.id + when: + controller.params.ownerId = webconnection.id + controller.move() + then: + message.messageOwner.id == webconnection.id + when: + controller.params.ownerId = subscription.id + controller.move() + then: + message.messageOwner.id == subscription.id + } private Date createDate(String dateAsString) { new SimpleDateFormat("yyyy/MM/dd").parse(dateAsString) } -} \ No newline at end of file +} From 35d9c10eb5edb41e75b698b0d828b39967712b44 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 24 Jan 2013 15:06:16 +0300 Subject: [PATCH 0461/2668] removed IgnoreRest :( --- .../frontlinesms2/controller/MessageControllerISpec.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy index f48112d75..4807c222a 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy @@ -236,8 +236,7 @@ class MessageControllerISpec extends grails.plugin.spock.IntegrationSpec { message.messageOwner.id == announcement.id message.ownerDetail != 'ownerdetail-pending' } -@spock.lang.IgnoreRest -@spock.lang.Unroll + def 'moving messages to different activities and sections should work'() { given: def message = Fmessage.build(inbound:true) From 4f771d40197e836a4dfd8050e498220cc1ad6416 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 24 Jan 2013 16:26:38 +0300 Subject: [PATCH 0462/2668] fixed validation for the custom actvity dialog --- .../grails-app/views/customactivity/_validate.gsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp index 091c8edda..9730934bb 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_validate.gsp @@ -11,6 +11,9 @@ rules: { autoreplyText: { required:true }, name: { required:true } + }, + errorPlacement: function(error, element){ + $(".error-panel").html(error); } }); From 141e4692ffe2aa51325811aacd69267c84c2de02 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Jan 2013 16:57:42 +0300 Subject: [PATCH 0463/2668] refactored js that was previously inserting inline JS to instead use class to hide --- .../views/contact/_single_contact_view.gsp | 26 ++++++++++++------- .../frontlinesms-core/web-app/css/contact.css | 3 ++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp index ffd9fde00..e2bb484eb 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp @@ -138,21 +138,29 @@ $(function() { setInterval(refreshMessageStats, 15000); var clear; $( "td > input[type=text]" ).each(function( index) { + clear = $(this).next(); if( $(this).val() == ''){ - clear = $(this).next(); - clear.attr("style","display:none"); + clear.addClass('hidden'); } else{ - clear = $(this).next(); - clear.removeAttr("style"); + clear.removeClass("hidden"); } }); - $( "td > input[type=text]" ).keypress(function() { - if( $(this).val() == ''){ - clear = $(this).next(); - clear.removeAttr("style"); - $(".send-message").removeAttr("style"); + $( "td > input[type=text]" ).keyup(function() { + clear = $(this).next(); + if( $(this).val() != ''){ + clear.removeClass("hidden"); + if($(this).attr('name') == 'mobile') { + $(".send-message").removeClass('hidden'); + } + } + else { + clear.addClass('hidden'); + if($(this).attr('name') == 'mobile') { + $(".send-message").addClass('hidden'); + } + } }); }); diff --git a/plugins/frontlinesms-core/web-app/css/contact.css b/plugins/frontlinesms-core/web-app/css/contact.css index d94fcd0cf..a16d05c47 100644 --- a/plugins/frontlinesms-core/web-app/css/contact.css +++ b/plugins/frontlinesms-core/web-app/css/contact.css @@ -53,7 +53,8 @@ .remove-command { background-image:url('../images/icons/remove.png'); background-repeat:no-repeat; display:inline-block; height:14px; text-indent:-999999px; display:ltr; width:14px; margin-left:3px; } .remove-command:hover { background-image:url('../images/icons/remove_hover.png'); } +.remove-command.hidden { display:none; } .send-message { background-image:url('../images/icons/send.png'); background-repeat:no-repeat; display:inline-block; height:14px; text-indent:-999999px; display:ltr; width:14px; margin-left:3px; } - +.send-message.hidden { display:none; } #modalBox #smartGroup-table { margin:20px; } From 2f0e8e7a7ecc43be0b752ca273bc70fe8bafb8ca Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 24 Jan 2013 17:12:14 +0300 Subject: [PATCH 0464/2668] Added integration tests and fixed functional tests --- .../CustomActivityCedSpec.groovy | 18 +------- .../CustomactivityControllerISpec.groovy | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy index 25b2b6a43..b103ceaf9 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy @@ -86,14 +86,6 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { confirm.stepActionsConfirm.contains("Sample Text") submit.click() waitFor("very slow") { summary.displayed } - cancel.click() - when: - to PageMessageCustomActivity, CustomActivity.findByName("Wewe wacha hakuna haja") - then: - waitFor { title?.toLowerCase().contains("custom activity") } - def activity = CustomActivity.findByName("Wewe wacha hakuna haja") - activity.name == "Wewe wacha hakuna haja" - activity.steps.size() == 2 } def 'can edit an existing custom activity'() { @@ -124,14 +116,6 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { confirm.stepActionsConfirm.contains("Sample Text") submit.click() waitFor("very slow") { summary.displayed } - cancel.click() - when: - to PageMessageCustomActivity, CustomActivity.findByName("ni hivyo hivyo tu") - then: - waitFor { title?.toLowerCase().contains("custom activity") } - def activity = CustomActivity.findByName("ni hivyo hivyo tu") - activity.name == "ni hivyo hivyo tu" - activity.steps.size() == 4 } -} \ No newline at end of file +} diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy new file mode 100644 index 000000000..568bbc3ef --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy @@ -0,0 +1,45 @@ +package frontlinesms2.controller + +import frontlinesms2.* + +class CustomactivityControllerISpec extends grails.plugin.spock.IntegrationSpec { + def controller = new CustomactivityController() + + def "can create a new custom activity"(){grails.plugin.spock.IntegrationSpec + given: + controller.params.jsonToSubmit = """[{"stepId":"","stepType":"join", "stepProperty": [{"key":"group", "value":"5"}] }, {"stepId":"","stepType":"leave", "stepProperty": [{"key":"group", "value":"5"}] }]""" + controller.params.name = "test save" + controller.params.keywords = "test, custom" + controller.params.sorting = "enabled" + when: + controller.save() + then: + def activity = CustomActivity.findByName("test save") + activity.keywords*.value.containsAll(["TEST", "CUSTOM"]) + activity.steps.size() == 2 + } + + def "can edit an existing custom activity"() { + given: + def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")).save(failOnError:true,flush:true) + def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")).save(failOnError:true,flush:true) + + def a = new CustomActivity(name:'Do it all') + .addToSteps(joinStep) + .addToSteps(leaveStep) + .addToKeywords(value:"CUSTOM") + .save(failOnError:true, flush:true) + + controller.params.name = "just edited" + controller.params.keywords = "new, just, yeah" + controller.params.sorting = "enabled" + controller.params.ownerId = a.id + controller.params.jsonToSubmit = """[{"stepId":"","stepType":"join", "stepProperty": [{"key":"group", "value":"5"}] } ]""" + when: + controller.save() + then: + def activity = CustomActivity.findByName("just edited") + activity.keywords*.value.containsAll(["NEW", "JUST", "YEAH"]) + activity.steps.size() == 1 + } +} From bcefff155a01a07537ac2661ecc3fb5b098e3679 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 08:38:47 +0300 Subject: [PATCH 0465/2668] Minor cleanup to comments in check_for_bad_template_renders; fixed violations. --- .../frontlinesms-core/do/check_for_bad_template_renders | 9 +++++---- .../controllers/frontlinesms2/ContactController.groovy | 2 +- .../controllers/frontlinesms2/StatusController.groovy | 2 +- .../grails-app/views/activity/announcement/show.gsp | 2 +- .../grails-app/views/activity/webconnection/show.gsp | 2 +- .../grails-app/views/smartGroup/create.gsp | 6 +++--- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/do/check_for_bad_template_renders b/plugins/frontlinesms-core/do/check_for_bad_template_renders index 84a549dc6..7042f5f6f 100755 --- a/plugins/frontlinesms-core/do/check_for_bad_template_renders +++ b/plugins/frontlinesms-core/do/check_for_bad_template_renders @@ -1,17 +1,18 @@ #!/bin/bash +echo "# Checking for bad calls to template renderer..." echo "# Checking views..." grep -rn "render.*template" grails-app/views/ | grep -v "fsms:render" VIEW_OUTPUT=$? -echo "" echo "# Checking controllers" grep -rn "render.*template" grails-app/controllers/ | grep -v "fsms\.render" CONTROLLER_OUTPUT=$? if [ "$CONTROLLER_OUTPUT" -eq 1 ] && [ "$VIEW_OUTPUT" -eq 1 ]; then - echo "Violations NOT detected" + echo "# No bad template renders detected" exit 0 else - echo "The violations above were detected" + echo "# Bad template renders detected" exit 1 -fi \ No newline at end of file +fi + diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index d7ccb78fd..47c6213f7 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -169,7 +169,7 @@ class ContactController extends ControllerUtils { } def search() { - render template:'search_results', model:contactSearchService.contactList(params) + fsms.render template:'search_results', model:contactSearchService.contactList(params) } def checkForDuplicates() { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy index 6af4d6211..04b2be7ed 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy @@ -26,7 +26,7 @@ class StatusController extends ControllerUtils { } def listDetected() { - render template:'device_detection', model:[detectedDevices:deviceDetectionService.detected] + fsms.render template:'device_detection', model:[detectedDevices:deviceDetectionService.detected] } def resetDetection() { diff --git a/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp index f03946781..dc474f7ea 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp @@ -1 +1 @@ - + diff --git a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp index f03946781..dc474f7ea 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp @@ -1 +1 @@ - + diff --git a/plugins/frontlinesms-core/grails-app/views/smartGroup/create.gsp b/plugins/frontlinesms-core/grails-app/views/smartGroup/create.gsp index ce34cc42f..a485660e4 100644 --- a/plugins/frontlinesms-core/grails-app/views/smartGroup/create.gsp +++ b/plugins/frontlinesms-core/grails-app/views/smartGroup/create.gsp @@ -25,16 +25,16 @@ - + - + - + From bb100935353fbc315f32263a782611939608ee62 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 08:47:05 +0300 Subject: [PATCH 0466/2668] Cleaned up comments and removed unused variables --- .../frontlinesms-core/do/build_uninstall_install_test | 7 +------ plugins/frontlinesms-core/do/uninstall_install_test | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_uninstall_install_test b/plugins/frontlinesms-core/do/build_uninstall_install_test index 58b94f6e5..28e11f38f 100755 --- a/plugins/frontlinesms-core/do/build_uninstall_install_test +++ b/plugins/frontlinesms-core/do/build_uninstall_install_test @@ -11,15 +11,10 @@ echo "## 5. check that the server is working! ##" echo "#############################################" PROJECT_DIR=../frontlinesms-core -INSTALL_DIR=~/frontlinesms2 -ALL_USER_INSTALL_DIR=/opt/frontlinesms2 -SETTINGS_DIR=~/.frontlinesms2 -SERVER_PORT=8130 -CONTEXT_PATH= echo "# clean target directories" -rm -rf $PROJECT_DIR/target/ rm -rf target/ +rm -rf $PROJECT_DIR/target/ rm -rf $PROJECT_DIR/install/target* rm -rf $PROJECT_DIR/install/src/web-app/ diff --git a/plugins/frontlinesms-core/do/uninstall_install_test b/plugins/frontlinesms-core/do/uninstall_install_test index 3b3c67a16..59c84cbb6 100755 --- a/plugins/frontlinesms-core/do/uninstall_install_test +++ b/plugins/frontlinesms-core/do/uninstall_install_test @@ -3,11 +3,10 @@ set -e echo "#############################################" echo "## This script aims to test new installers ##" -echo "## 1. Build installer ##" -echo "## 2. uninstall old installation ##" -echo "## 3. install new version ##" -echo "## 4. run new version ##" -echo "## 5. check that the server is working! ##" +echo "## 1. uninstall old installation ##" +echo "## 2. install new version ##" +echo "## 3. run new version ##" +echo "## 4. check that the server is working! ##" echo "#############################################" PROJECT_DIR=../frontlinesms-core From f3caf260aea4facc8e8c0d1dfc4fb95315b4446e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 09:19:28 +0300 Subject: [PATCH 0467/2668] Minor GSP cleanup --- .../grails-app/views/activity/create_new_activity.gsp | 4 ++-- .../grails-app/views/webconnection/_type.gsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp index a9d7a5b9a..15eabadef 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp @@ -24,9 +24,9 @@
    • diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp index e5ba73679..a877936af 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp @@ -9,7 +9,7 @@

    -

    + From 85f9faee840abe96543bfa389728f3280e57fd61 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 11:05:00 +0300 Subject: [PATCH 0468/2668] Updated selenium so tests work with firefox 18 --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index c72e817b4..99b21624c 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -49,7 +49,7 @@ grails.project.dependency.resolution = { // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg. // runtime 'mysql:mysql-connector-java:5.1.16' - def seleniumVersion = '2.25.0' + def seleniumVersion = '2.28.0' def camel = { def camelVersion = "2.9.2" "org.apache.camel:camel-$it:$camelVersion" From af143257f717ebc735a2232c11ffbd7bd92d8689 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 11:07:49 +0300 Subject: [PATCH 0469/2668] Implemented WebconnectionController.retryFailed() --- .../WebconnectionController.groovy | 38 ++++++++++++------- .../frontlinesms2/WebconnectionService.groovy | 6 +++ .../frontlinesms2/ControllerUtils.groovy | 14 ++++--- .../WebconnectionControllerISpec.groovy | 26 +++++++++---- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index aedba833f..d98208000 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -12,24 +12,24 @@ class WebconnectionController extends ActivityController { def create() {} def save() { - def webconnectionInstance - Class clazz = WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType] - if(params.ownerId) { - webconnectionInstance = clazz.get(params.ownerId) - } else { - webconnectionInstance = clazz.newInstance() + withWebconnection { webconnectionInstance -> + doSave('webconnection', webconnectionService, webconnectionInstance) } - doSave('webconnection', webconnectionService, webconnectionInstance) } def config() { - def activityInstanceToEdit - if(params.ownerId) activityInstanceToEdit = WEB_CONNECTION_TYPE_MAP[params.imp].get(params.ownerId) - else activityInstanceToEdit = WEB_CONNECTION_TYPE_MAP[params.imp].newInstance() - def responseMap = ['config', 'scripts', 'confirm'].collectEntries { - [it, g.render(template:"/webconnection/$params.imp/$it", model:[activityInstanceToEdit:activityInstanceToEdit])] + withWebconnection { activityInstanceToEdit -> + def responseMap = ['config', 'scripts', 'confirm'].collectEntries { + [it, g.render(template:"/webconnection/$params.imp/$it", model:[activityInstanceToEdit:activityInstanceToEdit])] + } + render responseMap as JSON + } + } + + def retryFailed() { + withWebconnection { c -> + webconnectionService.retryFailed(c) } - render responseMap as JSON } private def renderJsonErrors(webconnectionInstance) { @@ -41,6 +41,16 @@ class WebconnectionController extends ActivityController { } } - private def withWebconnection = withDomainObject Webconnection + private def withWebconnection(Closure c) { + Class clazz = WEB_CONNECTION_TYPE_MAP[params.webconnectionType?:params.imp]?: Webconnection + def webconnectionInstance + if(params.ownerId) { + webconnectionInstance = clazz.get(params.ownerId) + } else { + webconnectionInstance = clazz.newInstance() + } + if(!webconnectionInstance) handleNotFoundFailure() + else c.call(webconnectionInstance) + } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 7b1fb175a..dd97d7951 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -11,6 +11,12 @@ import frontlinesms2.api.* class WebconnectionService { def messageSendService + def retryFailed(Webconnection c) { + Fmessage.findAllByMessageOwnerAndOwnerDetail(c, Webconnection.OWNERDETAIL_FAILED).each { + send(it) + } + } + def preProcess(Exchange x) { println "x: ${x}" println "x.in: ${x.in}" diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy index 4f1a766ec..32ae0587a 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy @@ -8,13 +8,17 @@ class ControllerUtils { def o = objectId? domainClass.get(objectId): domainClass.newInstance() if(o) c.call(o) else { - def failureText = message('default.not.found.message', args:[message(code:domainClass.shortName+'.label'), objectId]) - if(onFail) { - flash.message = failureText - onFail.call() - } else render(text:failureText) + handleNotFoundFailure() } } } + + def handleNotFoundFailure() { + def failureText = message('default.not.found.message', args:[message(code:domainClass.shortName+'.label'), objectId]) + if(onFail) { + flash.message = failureText + onFail.call() + } else render(text:failureText) + } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy index 27ebae256..57aa9fd45 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy @@ -190,21 +190,31 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { } def 'retry failed action should result in all failed uploads being reattempted'() { - setup: + given: def keyword = new Keyword(value:'TEST') def webconnection = new GenericWebconnection(name:"Webconnection with failures", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.POST) webconnection.addToKeywords(keyword) // adding 3 successful uploads, two failed ones, and one pending 5.times { it -> - webconnection.addToMessages(new Fmessage(text: "test", inbound: true, src:"+12345$it", ownerDetail: ((it % 2) ? Webconnection.OWNERDETAIL_FAILED : Webconnection.OWNERDETAIL_SUCCESS ))) + webconnection.addToMessages(new Fmessage( + text:"test", + inbound:true, + src:"+1234$it", + ownerDetail: ((it % 2) ? Webconnection.OWNERDETAIL_FAILED : Webconnection.OWNERDETAIL_SUCCESS ))) } - webconnection.addToMessages(new Fmessage(text: "test", inbound: true, src:"+123455", ownerDetail: Webconnection.OWNERDETAIL_PENDING)) - webconnection.save(failOnError:true) - when: + webconnection.addToMessages(new Fmessage( + text:"test", + inbound:true, + src:"+12345", + ownerDetail:Webconnection.OWNERDETAIL_PENDING)) + webconnection.save(failOnError:true, flush:true) controller.params.ownerId = webconnection.id + when: controller.retryFailed() - then: - ["+12340", "+12342", "+12344"].collect { Fmessage.findBySrc(it).ownerDetail }.unique() == [Webconnection.OWNERDETAIL_SUCCESS] - ["+12341", "+12343", "+12345"].collect { Fmessage.findBySrc(it).ownerDetail }.unique() == [Webconnection.OWNERDETAIL_PENDING] + then: "Successful webconnections should not be changed" + Fmessage.findAllBySrcInList(["+12340", "+12342", "+12344"])*.ownerDetail == [Webconnection.OWNERDETAIL_SUCCESS] * 3 + and: "Failed webconnections should be retried" + Fmessage.findAllBySrcInList(["+12341", "+12343", "+12345"])*.ownerDetail == [Webconnection.OWNERDETAIL_PENDING] * 3 } } + From d0ee7c15c2ba863fd2b582ad317b22ee842aae48 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Jan 2013 11:52:37 +0300 Subject: [PATCH 0470/2668] removed capitalized customActivityISpec --- .../CustomActivityControllerISpec.groovy | 75 ------------------- 1 file changed, 75 deletions(-) delete mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomActivityControllerISpec.groovy diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomActivityControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomActivityControllerISpec.groovy deleted file mode 100644 index b1d2ca3d5..000000000 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomActivityControllerISpec.groovy +++ /dev/null @@ -1,75 +0,0 @@ -package frontlinesms2.controller - -import spock.lang.* -import frontlinesms2.* -import grails.plugin.spock.* - -class CustomActivityControllerISpec extends IntegrationSpec { - - def controller - def setup() { - controller = new CustomactivityController() - } - - def "can save a custom activity"() { - setup: - controller.params.jsonToSubmit = '[{"stepId":"","stepType":"join", "stepProperties": [{"key":"group", "value":"5"}, {"key":"group", "value":"10"}] }, {"stepId":"","stepType":"reply", "stepProperties":[{"key":"autoreplyText", "value":"This is it"}] }]' - controller.params.name = "Custom activity" - when: - controller.save() - then: - CustomActivity.findByName("Custom activity") - } - - def "can save a custom activity with a keyword"() { - setup: - controller.params.jsonToSubmit = '[{"stepId":"","stepType":"join", "stepProperties": [{"key":"group", "value":"5"}, {"key":"group", "value":"10"}] }, {"stepId":"","stepType":"reply", "stepProperties":[{"key":"autoreplyText", "value":"This is it"}] }]' - controller.params.name = "Custom activity 2" - controller.params.sorting = 'enabled' - controller.params.keywords = 'try,again' - when: - controller.save() - then: - def customActivity = CustomActivity.findByName("Custom activity 2") - customActivity - customActivity.keywords.size() == 2 - } - - def "can save a custom activity with a glabal keyword"() { - setup: - controller.params.jsonToSubmit = '[{"stepId":"","stepType":"join", "stepProperties": [{"key":"group", "value":"5"}, {"key":"group", "value":"10"}] }, {"stepId":"","stepType":"reply", "stepProperties":[{"key":"autoreplyText", "value":"This is it"}] }]' - controller.params.name = "Custom activity 2" - controller.params.sorting = 'global' - when: - controller.save() - then: - def customActivity = CustomActivity.findByName("Custom activity 2") - customActivity - customActivity.keywords.size() == 1 - } - - def "can edit a custom activity"() { - setup: - def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")).save(failOnError:true,flush:true) - def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")).save(failOnError:true,flush:true) - - def customActivity = new CustomActivity(name:'bummer') - .addToSteps(joinStep) - .addToSteps(leaveStep) - .addToKeywords(value:"CUSTOM") - .save(failOnError:true, flush:true) - - controller.params.ownerId = customActivity.id - controller.params.jsonToSubmit = '[{"stepId":"","stepType":"join", "stepProperties": [{"key":"group", "value":"5"}, {"key":"group", "value":"10"}] }, {"stepId":"","stepType":"reply", "stepProperties":[{"key":"autoreplyText", "value":"This is it"}] }]' - controller.params.name = "Do it again" - controller.params.sorting = 'enabled' - controller.params.keywords = 'CUSTOM' - when: - controller.save() - then: - def updatedActivity = CustomActivity.findByName("Do it again") - updatedActivity - updatedActivity.steps*.stepProperties*.flatten()*.value.flatten() == ["5", "10", "This is it"] - updatedActivity.keywords.size() == 1 - } -} \ No newline at end of file From 39edb9ead50ae3e3274a986048f7b26e817e19ed Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 25 Jan 2013 12:17:14 +0300 Subject: [PATCH 0471/2668] Implemented back end for defining routing tules for fconnections --- .../frontlinesms2/SettingsController.groovy | 38 +++++++------ .../DispatchRouterService.groovy | 54 +++++++++++++------ .../services/DispatchRouterServiceSpec.groovy | 27 ++++++++-- 3 files changed, 84 insertions(+), 35 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index 3e3d8a5be..d7b4cd1ef 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -2,6 +2,8 @@ package frontlinesms2 class SettingsController extends ControllerUtils { + static final String RULE_PREFIX = "fconnection-" + def i18nUtilService def appSettingsService @@ -37,14 +39,14 @@ class SettingsController extends ControllerUtils { appSettings['routing.otherwise'] = appSettingsService.get("routing.otherwise") appSettings['routing.rules'] = appSettingsService.get("routing.rules") - def routingRulesMap = getRoutingRules(appSettings['routing.rules']) + def fconnectionRoutingMap = getRoutingRules(appSettings['routing.rules']) [currentLanguage:i18nUtilService.getCurrentLanguage(request), authEnabled:authEnabled, username:username, password:password, languageList:i18nUtilService.allTranslations, - routingRulesMap:routingRulesMap, + fconnectionRoutingMap:fconnectionRoutingMap, appSettings:appSettings] } @@ -84,36 +86,38 @@ class SettingsController extends ControllerUtils { } private getRoutingRules(routingRules) { - def routingRuleList = [] - def routingRulesMap = [:] + def fconnectionRoutingList = [] + def fconnectionRoutingMap = [:] def connectionInstanceList = Fconnection.findAll() if(routingRules) { - routingRuleList = routingRules?.tokenize(",")?.flatten() + fconnectionRoutingList = routingRules?.tokenize(",")?.flatten() println "Routing Rules before refinement:::: $routingRules" // Replacing fconnection rules with fconnection instances - routingRuleList = routingRuleList.collect { rule -> - if(rule.contains("fconnection-")) connectionInstanceList.find { - println "Comparing rule:: $rule with id:: $it :: ${it.id == ((rule - 'fconnection-') as Integer)}" - it.id == ((rule - 'fconnection-') as Integer) + fconnectionRoutingList = fconnectionRoutingList.collect { rule -> + if(rule.contains(RULE_PREFIX)) connectionInstanceList.find { + println "Comparing rule:: $rule with id:: $it :: ${it.id == ((rule - RULE_PREFIX) as Integer)}" + it.id == ((rule - RULE_PREFIX) as Integer) } else rule } - if(routingRuleList) { - def length = routingRuleList.size() - if(!routingRuleList.contains("uselastreceiver")) routingRuleList << "uselastreceiver" - ((routingRuleList += connectionInstanceList) - null as Set).eachWithIndex {it, index -> - if(index < length) routingRulesMap[it] = true - else routingRulesMap[it] = false + if(fconnectionRoutingList) { + def length = fconnectionRoutingList.size() + if(!fconnectionRoutingList.contains("uselastreceiver")) fconnectionRoutingList << "uselastreceiver" + ((fconnectionRoutingList += connectionInstanceList) - null as Set).eachWithIndex {it, index -> + if(index < length) fconnectionRoutingMap[it] = true + else fconnectionRoutingMap[it] = false } } } else { - routingRuleList << "uselastreceiver" - ((routingRuleList + connectionInstanceList) as Set).findAll{ routingRulesMap[it] = false } + fconnectionRoutingList << "uselastreceiver" + ((fconnectionRoutingList + connectionInstanceList) as Set).findAll{ fconnectionRoutingMap[it] = false } } + + fconnectionRoutingMap } private def withFconnection = withDomainObject Fconnection, { params.id }, { render(view:'show_connections', model: [fconnectionInstanceTotal: 0]) } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index f1345f2c3..a14ed5091 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -5,6 +5,7 @@ import org.apache.camel.Header /** This is a Dynamic Router */ class DispatchRouterService { + static final String RULE_PREFIX = "fconnection-" def appSettingsService def camelContext @@ -33,23 +34,25 @@ class DispatchRouterService { return "seda:out-$requestedFconnectionId" } else { def routeId + log "appSettingsService.['routing.rules'] is ${appSettingsService.get('routing.rules')}" log "appSettingsService.['routing.uselastreceiver'] is ${appSettingsService.get('routing.uselastreceiver')}" - if(appSettingsService.get('routing.uselastreceiver') == 'true'){ - log "Dispatch is ${exchange.in.getBody()}" - def d = exchange.in.getBody() - log "dispatch to send # $d ### d.dst # $d?.dst" - def latestReceivedMessage = Fmessage.findBySrc(d.dst, [sort: 'dateCreated', order:'desc']) - log "## latestReceivedMessage ## is $latestReceivedMessage" - if(latestReceivedMessage?.receivedOn) { - log "## Sending message with receivedOn Connection ##" - def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } - println "Id of prefered route ## $latestReceivedMessage.receivedOn" - println "allOutRoutes ## $allOutRoutes" - println "ALL ROUTE IDS ## ${allOutRoutes*.id}" - def routeToTake = allOutRoutes.find{ it.id.endsWith("-${latestReceivedMessage.receivedOn.id}") } - println "Chosen Route ## $routeToTake" - routeId = routeToTake?routeToTake.id:null + + if(appSettingsService.get('routing.rules')) { + def fconnectionRoutingList = appSettingsService.get('routing.rules')?.tokenize(",")?.flatten() + + fconnectionRoutingList = fconnectionRoutingList.collect { route -> + if(route.contains(RULE_PREFIX)) ((route - RULE_PREFIX) as Integer) + else route + } + println "fconnectionRoutingList::: $fconnectionRoutingList" + for(route in fconnectionRoutingList) { + if(route instanceof String && route == "uselastreceiver") { routeId = getLastReceiverId(exchange)} + else { routeId = getCamelRouteId(Fconnection.get(route)) } + log "Route Id selected: $routeId" + if(routeId) break } + } else if(appSettingsService.get('routing.uselastreceiver') == 'true'){ + routeId = getLastReceiverId(exchange) } if(!routeId){ // if uselastreceiver did not set the routeId @@ -123,4 +126,25 @@ class DispatchRouterService { } } else log.info("No dispatch found for id: $id") } + + private getLastReceiverId(exchange) { + def log = { println "DispatchRouterService.slip() : $it" } + log "Dispatch is ${exchange.in.getBody()}" + def d = exchange.in.getBody() + log "dispatch to send # $d ### d.dst # $d?.dst" + def latestReceivedMessage = Fmessage.findBySrc(d.dst, [sort: 'dateCreated', order:'desc']) + log "## latestReceivedMessage ## is $latestReceivedMessage" + latestReceivedMessage?.receivedOn ? getCamelRouteId(latestReceivedMessage.receivedOn) : null + } + + private getCamelRouteId(connection) { + if(!connection) return null + println "## Sending message with Connection with $connection ##" + def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } + println "allOutRoutes ## $allOutRoutes" + println "ALL ROUTE IDS ## ${allOutRoutes*.id}" + def routeToTake = allOutRoutes.find{ it.id.endsWith("-${connection.id}") } + println "Chosen Route ## $routeToTake" + routeToTake?routeToTake.id:null + } } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index ec4cd7ba2..f7812f3e1 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -10,12 +10,14 @@ import org.apache.camel.Exchange import org.apache.camel.Message @TestFor(DispatchRouterService) -@Mock([Dispatch, Fmessage]) +@Mock([Dispatch, Fmessage, Fconnection, SmslibFconnection]) class DispatchRouterServiceSpec extends Specification { def setup() { Fmessage.metaClass.static.findBySrc = { src, map-> def m = Mock(Fmessage) - m.receivedOn >> '2' + def f = Mock(Fconnection) + f.id >> 2 + m.receivedOn >> f return m } @@ -74,6 +76,23 @@ class DispatchRouterServiceSpec extends Specification { routedTo == "seda:out-2" } + @Unroll + def 'slip should use the defined rules to determine fconnection to use'(){ + given: + mockAppSettingsService(settings) + def fconnection1 = new SmslibFconnection(name:"test 1", port:"/dev/ttyUSB0").save(flush:true) + def fconnection2 = new SmslibFconnection(name:"test 2", port:"/dev/ttyUSB0").save(flush:true) + def fconnection3 = new SmslibFconnection(name:"test 3", port:"/dev/ttyUSB0").save(flush:true) + mockRoutes(fconnection1.id.toInteger(), fconnection2.id.toInteger(), fconnection3.id.toInteger()) + def routedTo = service.slip(mockExchange(), null, null) + expect: + routedTo == route + where: + settings | route + ['true','any', 'fconnection-4, fconnection-1, fconnection-2'] | "seda:out-1" + ['true','any', 'uselastreceiver, fconnection-3, fconnection-1'] | "seda:out-2" + } + def 'slip should not assign messages to any route if routing preference is not to send messages even if routes are available'(){ given: mockAppSettingsService('false','dontsend') @@ -136,6 +155,7 @@ class DispatchRouterServiceSpec extends Specification { private mockExchangeMessage(headers, body){ def m = Mock(Message) body.id >> 1 + m.body >> body m.headers >> headers return m @@ -152,9 +172,10 @@ class DispatchRouterServiceSpec extends Specification { service.camelContext = c } - private mockAppSettingsService($userLastReceived, $otherwise){ + private mockAppSettingsService($userLastReceived, $otherwise, $rules = null){ AppSettingsService appSettingsService = Mock() appSettingsService.get("routing.uselastreceiver") >> $userLastReceived + appSettingsService.get("routing.rules") >> $rules appSettingsService.get("routing.otherwise") >> $otherwise service.appSettingsService = appSettingsService } From c75baf7deebf5452b8478b321133c8ca633df9d3 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 12:17:17 +0300 Subject: [PATCH 0472/2668] Allowed activity show action to clarify intent. --- .../controllers/frontlinesms2/ActivityController.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index c71d1ce17..146ce44ed 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -29,6 +29,11 @@ class ActivityController extends ControllerUtils { } } + def show() { + flash.message = flash.message + redirect controller:'message', action:'activity', params:params + } + def rename() {} def update() { From fcac22ad2d1ec22beaec1db74b6cd3d2f27f2a26 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 12:17:46 +0300 Subject: [PATCH 0473/2668] Added redirect on successful retry of failed messages. --- .../controllers/frontlinesms2/WebconnectionController.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index d98208000..7dcb63044 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -29,6 +29,8 @@ class WebconnectionController extends ActivityController { def retryFailed() { withWebconnection { c -> webconnectionService.retryFailed(c) + flash.message = g.message(code: 'webconnection.failed.retried') + redirect action:'show', params:[ownerId:c.id] } } From f146f8fd077099b35151e0ddfcd26cd5339333da Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 12:20:29 +0300 Subject: [PATCH 0474/2668] Extended activity.moreactions to allow for injection of new actions, and added webconnection.retryFailed action to that. --- .../domain/frontlinesms2/Activity.groovy | 2 ++ .../domain/frontlinesms2/Webconnection.groovy | 2 ++ .../grails-app/i18n/messages.properties | 2 ++ .../grails-app/views/activity/poll/_list_head.gsp | 3 ++- .../views/activity/webconnection/_list_head.gsp | 15 ++++++--------- .../views/message/_activity_buttons.gsp | 2 +- .../webconnection/PageMessageWebconnection.groovy | 2 +- .../webconnection/WebconnectionViewSpec.groovy | 1 + .../web-app/js/message/moreActions.js | 13 +++++++++---- 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index 01f2de20a..b335ce41e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -42,6 +42,8 @@ abstract class Activity extends MessageOwner { m ? m.size() : 0 } + def getMoreActions() { [] } + //> ACTIONS def archive() { this.archived = true diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index fc6d02855..e31213f7b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -167,6 +167,8 @@ abstract class Webconnection extends Activity implements FrontlineApi { webconnectionService.apiProcess(this, controller) } + def getMoreActions() { ['retryFailed'] } + String getFullApiUrl() { return apiEnabled? "http://[your-ip-address]:${appSettingsService.serverPort}/frontlinesms-core/api/1/$apiUrl/$id/" : "" } diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 597e661cb..061d766c1 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -839,6 +839,8 @@ webconnection.api.enable.label=Enable API webconnection.api.secret.label=API secret key: webconnection.api.disabled=API disabled webconnection.api.url=API URL +webconnection.moreactions.retryFailed=retry failed uploads +webconnection.failed.retried=Failed web connections have been scheduled for resending. # Webconnection - generic webconnection.generic.label=Other web service diff --git a/plugins/frontlinesms-core/grails-app/views/activity/poll/_list_head.gsp b/plugins/frontlinesms-core/grails-app/views/activity/poll/_list_head.gsp index fe6245fe3..78b9a4637 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/poll/_list_head.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/poll/_list_head.gsp @@ -20,4 +20,5 @@ -
    \ No newline at end of file +
    + diff --git a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp index 0af241320..5f9101631 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/_list_head.gsp @@ -1,4 +1,5 @@ <%@ page import="frontlinesms2.api.FrontlineApi1Utils" %> +

      @@ -10,14 +11,9 @@
    • - - ${ownerInstance?.url} - (${ownerInstance.httpMethod?.toString()}) - - - ${ownerInstance?.url} - (${ownerInstance.httpMethod?.toString()}) - + + ${ownerInstance?.url} + (${ownerInstance.httpMethod?.toString()})
    • : ${ownerInstance.fullApiUrl ?: '('+g.message(code:'webconnection.api.disabled')+')'} @@ -25,4 +21,5 @@
    • : ${ownerInstance?.keywords*.value.join(',')}
      • -

    \ No newline at end of file + + diff --git a/plugins/frontlinesms-core/grails-app/views/message/_activity_buttons.gsp b/plugins/frontlinesms-core/grails-app/views/message/_activity_buttons.gsp index 24cdc4fc2..5d5c5e5e8 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_activity_buttons.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_activity_buttons.gsp @@ -13,7 +13,7 @@ diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/PageMessageWebconnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/PageMessageWebconnection.groovy index 6686d4ad2..53e146186 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/PageMessageWebconnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/PageMessageWebconnection.groovy @@ -22,6 +22,6 @@ class WebconnectionHeaderModule extends ContentHeader { url { $("span#web_connection_url").text()?.toLowerCase() } sendMethod { $("span#web_connection_method").text()?.toLowerCase() - ')' -'('} archive { buttons.filter(text: iContains('Archive')) } - moreActions { $('div.header-buttons select#more-actions') } } } + diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy index 502ded793..8faf204a0 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy @@ -267,3 +267,4 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { at PageMessageWebconnection } } + diff --git a/plugins/frontlinesms-core/web-app/js/message/moreActions.js b/plugins/frontlinesms-core/web-app/js/message/moreActions.js index 6fba97172..37cc9abf2 100644 --- a/plugins/frontlinesms-core/web-app/js/message/moreActions.js +++ b/plugins/frontlinesms-core/web-app/js/message/moreActions.js @@ -1,13 +1,18 @@ $(document).ready(function() { $('.more-actions').bind('change', function() { - if ($(this).find('option:selected').val() === 'delete') { + var selectedValue = $(this).find('option:selected').val(); + if (selectedValue === 'delete') { deleteAction(); - } else if($(this).find('option:selected').val() === 'rename') { + } else if(selectedValue === 'rename') { renameAction(); - } else if($(this).find('option:selected').val() === 'edit') { + } else if(selectedValue === 'edit') { editAction(); - } else if($(this).find('option:selected').val() === 'export') { + } else if(selectedValue === 'export') { exportAction(); + } else { + activityType = $("#activityType").val(); + ownerId = $("#ownerId").val(); + window.location = url_root + activityType + '/' + selectedValue + '?ownerId=' + ownerId; } selectmenuTools.snapback($('#more-actions')); }); From 12bfe1e81241327a0886f75e25128b7d602f2e93 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 25 Jan 2013 15:18:12 +0300 Subject: [PATCH 0475/2668] Consolidated creation of radio groups for connection, webconnection and create_new_activity. --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 31 ++++++++++++++----- .../views/activity/create_new_activity.gsp | 19 ++++-------- .../grails-app/views/connection/_type.gsp | 21 ++++--------- .../grails-app/views/webconnection/_type.gsp | 23 +++++--------- .../frontlinesms-core/web-app/css/wizard.css | 2 ++ 5 files changed, 46 insertions(+), 50 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 82322ed70..547d4334b 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -92,19 +92,36 @@ class FsmsTagLib { } def radioGroup = { att -> - def values = att.values.tokenize(',')*.trim() - def labels = att.labels? att.labels.tokenize(',')*.trim(): null + def values = att.remove('values') + values = values instanceof String? values.tokenize(',')*.trim(): values + def labels = att.labels? att.remove('labels').tokenize(',')*.trim(): null def isChecked = { v -> v == att.checked } - out << "
    " - if(att.title) out << "

    ${g.message(code:att.title)}

    " + if(att.title) { + def hTag = att.solo == 'true'? 'h2': 'h3' + out << "<$hTag>${g.message(code:att.title)}" + } if(att.info) out << info([message:att.info]) - out << '
      ' + def labelPrefix = att.remove('labelPrefix')?: '' + def labelSuffix = att.remove('labelSuffix')?: '' + def descriptionPrefix = att.remove('descriptionPrefix')?: '' + def descriptionSuffix = att.remove('descriptionSuffix')?: '' + def hasDescription = descriptionPrefix || descriptionSuffix + def cssClasses = ['select', 'radio'] + if(!hasDescription) cssClasses << 'no-description' + out << "
      " + out << "
        " values.eachWithIndex { value, i -> - def label = labels? labels[i]: g.message(code:att.labelPrefix + value) + def labelCode = labels? labels[i]: g.message(code:labelPrefix + value + labelSuffix) + def label = g.message(code:labelCode) def id = att.name + '-' + i def itemAttributes = att + [value:value, checked:isChecked(value), id:id] out << '
        • ' } diff --git a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp index 15eabadef..8e10f6a4d 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp @@ -19,19 +19,12 @@ -
        -
          - -
        • - -
          • -           -
        -
        + + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp index dff76f6ca..989436954 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp @@ -1,20 +1,11 @@ <%@ page import="frontlinesms2.*" %> -
        - -
          - -
        • - -
          • -           -
        -
        +         diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp index a877936af..3d8dff91e 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp @@ -1,18 +1,11 @@ <%@ page import="frontlinesms2.Webconnection" %> -
        - -
          - -
        • - -
          • -           -
        -
        +         + diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index d55355bf4..9e443b969 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -29,6 +29,8 @@ div.input ul.select li input[type="checkbox"] { position:absolute; top:0; left:0 div.input ul.select li input[type="text"] { display:block; margin-left:25px; margin-top:10px; } div.input ul.select.radio label { margin:5px 0; position:relative; display:block; cursor:pointer; padding:10px; } +div.input ul.select.radio.no-description li { margin:0; } +div.input ul.select.radio.no-description label { text-indent:20px; margin:0; } div.input ul.select.radio label:hover, #modalBox.ui-dialog-content .select.radio label:hover > * { background-color:#e5eff3; } div.input ul.select.radio label input[type="radio"] { position:absolute; top:10px; left:10px; } div.input ul.select.radio label h3 { margin-left:25px; margin-bottom:10px; font-weight:bold; } From 93dc771c6a2f88ab196bc82bba30aa7bf601ccc0 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 25 Jan 2013 16:44:18 +0300 Subject: [PATCH 0476/2668] refactored showTestRouteBtn() and checkRouteStatus in grails-app/views/webconnection/_validate.gsp and added appendButton in mediumPopup.js --- .../grails-app/views/webconnection/_validate.gsp | 14 +++++++------- plugins/frontlinesms-core/web-app/css/controls.css | 1 - .../frontlinesms-core/web-app/js/mediumPopup.js | 9 +++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index a721e842d..3b22ce09a 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -118,12 +118,11 @@ buttonSet = $('.ui-dialog-buttonset'); testRouteBtn = buttonSet.find("#testRoute"); if(testRouteBtn.length === 0) { - testRouteBtn = $('', { - id: "testRoute", - type:"submit", - value: i18n('webconnection.testroute.label'), - click: testRouteStatus - }); + testRouteBtn = mediumPopup.appendButton("testRoute", "submit", i18n('webconnection.testroute.label')); + testRouteBtn.bind({ + click: testRouteStatus + }); + } else { testRouteBtn.show(); } @@ -162,7 +161,8 @@ function checkRouteStatus(response) { if(response.ok) { - $("#testRoute").attr("value", i18n('webconnection.testing.label')); + $("#testRoute").children().remove(); + $("#testRoute").append(""+i18n('webconnection.testing.label')+"") $.ajaxSetup({ type: 'post', data: {ownerId:response.ownerId}, diff --git a/plugins/frontlinesms-core/web-app/css/controls.css b/plugins/frontlinesms-core/web-app/css/controls.css index 9dfa86027..77cac62b4 100644 --- a/plugins/frontlinesms-core/web-app/css/controls.css +++ b/plugins/frontlinesms-core/web-app/css/controls.css @@ -84,5 +84,4 @@ input[type="text"].search{ background-image:url('../images/icons/search.png'); #thinking { background-color:transparent; z-index:99; display:none; background-image:url('../images/thinking.gif'); background-position:center; background-repeat:no-repeat; } -#testRoute { margin:.5em .6em .5em 0; height:26px; } diff --git a/plugins/frontlinesms-core/web-app/js/mediumPopup.js b/plugins/frontlinesms-core/web-app/js/mediumPopup.js index f996d43c8..0f2da2610 100644 --- a/plugins/frontlinesms-core/web-app/js/mediumPopup.js +++ b/plugins/frontlinesms-core/web-app/js/mediumPopup.js @@ -110,6 +110,14 @@ var mediumPopup = (function() { $(".ui-dialog").addClass("help"); initializePopup(); }; + appendButton = function(id, type, value){ + var button = $('', { + id: id, + type:type + }); + button.append(""+value+"") + return button + }; submitWithoutClose = function() { $("#submit").attr('disabled', 'disabled'); if(tabValidates(getCurrentTab())) { @@ -298,6 +306,7 @@ var mediumPopup = (function() { return { addValidation:addValidation, + appendButton:appendButton, disableTab:disableTab, editConnection:editConnection, // TODO move this somewhere more suitable enableTab:enableTab, From b9a1e835d106fae8f02fb59a954384b217267654 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Jan 2013 17:09:31 +0300 Subject: [PATCH 0477/2668] Step belongsTo CustomActivity --- plugins/frontlinesms-core/application.properties | 2 +- .../frontlinesms-core/grails-app/conf/CoreBootStrap.groovy | 4 ++-- .../grails-app/domain/frontlinesms2/Step.groovy | 1 + .../grails-app/services/frontlinesms2/AutoreplyService.groovy | 3 +++ .../services/frontlinesms2/CustomActivityService.groovy | 4 +--- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index a2cccd294..d8ff7b769 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Wed Jan 16 11:26:25 EAT 2013 +#Fri Jan 25 11:58:05 EAT 2013 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 5f8189e1c..736dfa8ed 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -438,8 +438,8 @@ class CoreBootStrap { private def dev_initCustomActivities() { if(!bootstrapData) return - def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")).save(failOnError:true,flush:true) - def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")).save(failOnError:true,flush:true) + def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")) + def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")) new CustomActivity(name:'Do it all') .addToSteps(joinStep) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index cc29393cb..c5e31cee3 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -3,6 +3,7 @@ package frontlinesms2 import grails.converters.JSON abstract class Step { + static belongsTo = [activity: CustomActivity] static hasMany = [stepProperties: StepProperty] static def implementations = [JoinActionStep, LeaveActionStep, ReplyActionStep] diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy index 0f096b973..9848886ad 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy @@ -39,6 +39,9 @@ class AutoreplyService { if (activityOrStep instanceof Activity) { activityOrStep.addToMessages(outgoingMessage) } + else { + activityOrStep.activity.addToMessages(outgoingMessage) + } messageSendService.send(outgoingMessage) activityOrStep.save() } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index 78e7c23dd..fa2ab1c73 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -48,7 +48,6 @@ class CustomActivityService { println "step:::: $step" def stepInstance = Step.implementations.find {it.shortName == step.stepType}.newInstance(step) - stepInstance.save() step.stepProperties.each { stepProperty -> def stepProp = new StepProperty(stepProperty) println "$stepProp::: ${stepProp.key}: ${stepProp.value}" @@ -56,7 +55,6 @@ class CustomActivityService { println "$stepInstance::: ${stepInstance.stepProperties}" } - stepInstance.save(flush:true, failOnError:true) stepInstanceList << stepInstance } stepInstanceList.each { @@ -76,4 +74,4 @@ class CustomActivityService { it.process(message) } } -} \ No newline at end of file +} From 231ec725344ff51f5c4a03147e4a3472593220cc Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Jan 2013 17:31:37 +0300 Subject: [PATCH 0478/2668] fixed customActivity saving --- .../services/frontlinesms2/CustomActivityService.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index fa2ab1c73..02bc41f7a 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -48,6 +48,7 @@ class CustomActivityService { println "step:::: $step" def stepInstance = Step.implementations.find {it.shortName == step.stepType}.newInstance(step) + stepInstance.save() step.stepProperties.each { stepProperty -> def stepProp = new StepProperty(stepProperty) println "$stepProp::: ${stepProp.key}: ${stepProp.value}" From 9c899747632f4928d833231c41129e95903599d9 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 09:52:58 +0300 Subject: [PATCH 0479/2668] Updated js_unit_test xml report so it is also echoed to stdout. --- plugins/frontlinesms-core/do/js_unit_test_xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/js_unit_test_xml b/plugins/frontlinesms-core/do/js_unit_test_xml index 76df4b611..9a29a3d0a 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_xml +++ b/plugins/frontlinesms-core/do/js_unit_test_xml @@ -2,4 +2,4 @@ set -e REPORT_DIR=target/test-reports mkdir -p $REPORT_DIR -do/js_unit_test 2>/dev/null | sgrep '("")' | sed -e 's:::' | do/js_unit_test_xml_filter.groovy > $REPORT_DIR/javascript-TestSuites.xml +do/js_unit_test 2>/dev/null | sgrep '("")' | sed -e 's:::' | do/js_unit_test_xml_filter.groovy | tee $REPORT_DIR/javascript-TestSuites.xml From 5a3dd8fc3aec12ff34e5ed510ebbfc82b44aec72 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 10:01:18 +0300 Subject: [PATCH 0480/2668] Moved getMoreActions() from Activity to MessageOwner --- .../grails-app/domain/frontlinesms2/Activity.groovy | 2 -- .../grails-app/domain/frontlinesms2/MessageOwner.groovy | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index d9e93634f..ee52c6f8e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -45,8 +45,6 @@ abstract class Activity extends MessageOwner { m ? m.size() : 0 } - def getMoreActions() { [] } - //> ACTIONS def archive() { this.archived = true diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageOwner.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageOwner.groovy index be0a786b3..4f1a7ae1b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageOwner.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/MessageOwner.groovy @@ -15,4 +15,7 @@ abstract class MessageOwner { def getDisplayText(Fmessage msg) { msg.text } + + def getMoreActions() { [] } } + From b013b1590ac26eb7d2df91540f14595814474826 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Jan 2013 11:24:28 +0300 Subject: [PATCH 0481/2668] updated quartz2 plugin, smssync timeout reminder now works as expected --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 533672b69..0e9cdda4e 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -89,7 +89,7 @@ grails.project.dependency.resolution = { runtime ":markdown:1.0.0.RC1" runtime ':routing:1.2.2-camel-2.9.4' runtime ":csv:0.3.1" - compile ":quartz2:0.2.3-frontlinesms" + compile ":quartz2:2.1.6.2" compile ':platform-core:1.0.RC3-frontlinesms' From 2cc630552ded4d4efbd34c9db8d2dc6080dc9833 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 28 Jan 2013 11:25:39 +0300 Subject: [PATCH 0482/2668] added filter for the steps in the custom activit list head --- .../frontlinesms2/JoinActionStep.groovy | 4 +-- .../frontlinesms2/LeaveActionStep.groovy | 4 +-- .../frontlinesms2/ReplyActionStep.groovy | 4 +-- .../activity/customactivity/_list_head.gsp | 16 ++++++--- .../activity/customactivity/_step_summary.gsp | 35 +++++++++++++++++++ 5 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/activity/customactivity/_step_summary.gsp diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy index 2938f251b..a061e5de8 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/JoinActionStep.groovy @@ -31,8 +31,8 @@ class JoinActionStep extends Step { subscriptionService.doJoin(this, message) } - def niceFormat() { - "Joining '${this.group?.name}' group" + def getNiceFormat() { + "Joining '${this?.group?.name}' group" } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy index c358ea111..10adbdf4e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LeaveActionStep.groovy @@ -32,8 +32,8 @@ class LeaveActionStep extends Step { subscriptionService.doLeave(this, message) } - def niceFormat() { - return "Leaving '${this.group?.name}' group" + def getNiceFormat() { + "Leaving '${this?.group?.name}' group" } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy index ba0616e0e..30e427590 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ReplyActionStep.groovy @@ -23,8 +23,8 @@ class ReplyActionStep extends Step { autoreplyService.doReply(this, message) } - def niceFormat() { - return "Replying with '${this.autoreplyText}'" + def getNiceFormat() { + "Replying with '${this.autoreplyText}'" } } diff --git a/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp index e9ed300ed..c1b2a379c 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_list_head.gsp @@ -6,12 +6,18 @@
      • - -

        ${step.niceFormat()}

        -         -
        • -
      • : ${ownerInstance?.keywords*.value.join(',')}
        • +

        : ${ownerInstance?.keywords*.value.join(',')}

         + +
      • + + +
      +
      + +
      diff --git a/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_step_summary.gsp b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_step_summary.gsp new file mode 100644 index 000000000..44e0c0e08 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/activity/customactivity/_step_summary.gsp @@ -0,0 +1,35 @@ +<%@ page import="frontlinesms2.JoinActionStep" %> +<%@ page import="frontlinesms2.LeaveActionStep" %> +<%@ page import="frontlinesms2.ReplyActionStep" %> + + + + + + + + + + + + + + + $("#toggleStep").on("change", function(){ + var stepID = $(this).val(); + $(".step-summary").addClass("hidden"); + $("#step-"+stepID).removeClass("hidden"); + }); + From 60aa30156854a2a096ad2a4b8d28a39bf303344d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 11:51:34 +0300 Subject: [PATCH 0483/2668] Fixed broken functional test (had bad jquery use and wrong text) --- .../frontlinesms2/webconnection/WebconnectionViewSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy index 8faf204a0..d14c2fa27 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy @@ -261,9 +261,9 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { then: waitFor { header.displayed } when: - header.moreActions.value("retry failed uploads").jquery.click() + header.moreActions.value('retryFailed') then: - waitFor { notifications.flashMessageText.contains("Failed uploads have been requeued for upload") } + waitFor { notifications.flashMessageText.contains('Failed web connections have been scheduled for resending') } at PageMessageWebconnection } } From 97809232cf10c76708323bead69dfd91375c842b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 11:59:27 +0300 Subject: [PATCH 0484/2668] Fixed reference to connectionType in ConnectionFSpec. --- .../functional/frontlinesms2/connection/ConnectionDialog.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy index 4a8369f50..ade270fb1 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy @@ -7,7 +7,7 @@ class ConnectionDialog extends MediumPopup { popupTitle.contains('connection') } static content = { - connectionType { $("#connectionType") } + connectionType { $("input[name=connectionType]") } connectionForm { $('#connectionForm') } confirmName { $("#confirm-name") } confirmType { $("#confirm-type") } From c130edd6988b6371e6b66a97114ead096131ad61 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 12:08:48 +0300 Subject: [PATCH 0485/2668] Fixed test references to basicInfo in ConnectionDialog --- .../functional/frontlinesms2/connection/ConnectionDialog.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy index ade270fb1..439f991fc 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy @@ -14,7 +14,7 @@ class ConnectionDialog extends MediumPopup { confirmPort { $("#confirm-port") } basicInfo { connectionType -> - $("p.info.$connectionType").text() + $("input", name:'connectionType', value:connectionType).parent().find('p.info').text() } confirmIntelliSmsConnectionName { $("#intellisms-confirm #confirm-name") } From 43f819e0338808ed31fa5e33cb0e0f897d6879d2 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 12:43:58 +0300 Subject: [PATCH 0486/2668] Fixed functional test for GenericWebconnectionWizard - reference to basicInfo has changed in Page Object. --- .../test/functional/frontlinesms2/popup/PageMediumPopup.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy index 4b401b11f..c07a1c0bd 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy @@ -292,7 +292,7 @@ class WebconnectionWizard extends MediumPopup { option(wait:true, cache:false) { shortName -> $('input', name:'webconnectionType', value:shortName) } getTitle { shortName -> option(shortName).previous('h3').text() } - getDescription { shortName -> option(shortName).next('p.info').text() } + getDescription { shortName -> option(shortName).previous('p.info').text() } testConnectionButton(required:false) { $("#testRoute")} } } From 335dcbb39c30458129fdf734c83795225dee12bc Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 28 Jan 2013 13:59:59 +0300 Subject: [PATCH 0487/2668] Fixed webconnection javascript. --- .../grails-app/views/webconnection/_validate.gsp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index a721e842d..85d13328d 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -85,14 +85,13 @@ } function toggleApiTab() { - $("#webconnectionType").live('change', function() { - if($(this).val() === 'generic') { - mediumPopup.enableTab('webconnection-api'); - } - else { - mediumPopup.disableTab('webconnection-api'); - } - }); + $("input[name=webconnectionType]").live('change', function() { + if($(this).val() === 'generic') { + mediumPopup.enableTab('webconnection-api'); + } else { + mediumPopup.disableTab('webconnection-api'); + } + }); } function setType(type) { @@ -193,3 +192,4 @@ } + From 8967792f6ec4def6962fe0baf275d4ccc19fd1f0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Jan 2013 14:00:53 +0300 Subject: [PATCH 0488/2668] added SimpleTrigger to trigger Timeout job --- .../frontlinesms2/ConnectionController.groovy | 11 +---------- .../frontlinesms2/SmssyncService.groovy | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index ef4b8b8e5..bfa4c4345 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -1,8 +1,6 @@ package frontlinesms2 import grails.converters.JSON - - class ConnectionController extends ControllerUtils { static allowedMethods = [save: "POST", update: "POST", delete:'GET'] @@ -119,14 +117,7 @@ class ConnectionController extends ControllerUtils { params.createRoute = true flash.message = message(code: 'connection.route.connecting') def connectionInstance = Fconnection.get(params.id) - if (connectionInstance instanceof SmssyncFconnection && connectionInstance?.timeout > 0) { - def sendTime = new Date() - use(groovy.time.TimeCategory) { - sendTime = sendTime + (connectionInstance.timeout).minutes - println "I will send the job at $sendTime" - } - ReportSmssyncTimeoutJob.schedule(sendTime, [connectionId:params.id]) - } + smssyncService.startTimeoutCounter(connectionInstance) redirect(action:'list', params:params) } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 184d9148d..63dc6d402 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -1,9 +1,9 @@ package frontlinesms2 import grails.converters.JSON - +import org.quartz.JobKey +import grails.plugin.quartz2.TriggerHelper import org.apache.camel.Exchange - import frontlinesms2.api.* class SmssyncService { @@ -40,6 +40,19 @@ class SmssyncService { } } + def startTimeoutCounter(connection) { + if (connectionInstance instanceof SmssyncFconnection && connectionInstance?.timeout > 0) { + def sendTime = new Date() + use(groovy.time.TimeCategory) { + sendTime = sendTime + (connectionInstance.timeout).minutes + println "I will send the job at $sendTime" + } + def trigger = TriggerHelper.simpleTrigger(new JobKey("test", "test"), sendTime, 0, 1, [connectionId:params.id]) + ReportSmssyncTimeoutJob.schedule(trigger) + } + + } + private def handleIncoming(connection, params) { if(!connection.receiveEnabled) throw new FrontlineApiException("Receive not enabled for this connection") From 12fccb4cbf8f66273dd50364294e61247ecf13f3 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Jan 2013 17:37:26 +0300 Subject: [PATCH 0489/2668] removed redundant line in do/build_uninstall_install_test --- plugins/frontlinesms-core/do/build_uninstall_install_test | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/build_uninstall_install_test b/plugins/frontlinesms-core/do/build_uninstall_install_test index 28e11f38f..f17a5d26d 100755 --- a/plugins/frontlinesms-core/do/build_uninstall_install_test +++ b/plugins/frontlinesms-core/do/build_uninstall_install_test @@ -13,7 +13,6 @@ echo "#############################################" PROJECT_DIR=../frontlinesms-core echo "# clean target directories" -rm -rf target/ rm -rf $PROJECT_DIR/target/ rm -rf $PROJECT_DIR/install/target* rm -rf $PROJECT_DIR/install/src/web-app/ From d72e76ca9f9cfa526a982a21b7a3e7d78b233fd7 Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 29 Jan 2013 10:50:59 +0300 Subject: [PATCH 0490/2668] The test button now reads 'Save and Test' after connection failure --- .../grails-app/views/webconnection/_validate.gsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 3b22ce09a..52e9442b3 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -179,14 +179,14 @@ if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}") { loadSummaryTab(response, i18n('webconnection.label')); } else { - $("#testRoute").attr("value", i18n('webconnection.testroute.label')); + $("#testRoute").children().remove(); + $("#testRoute").append(""+i18n('webconnection.testroute.label')+""); } clearInterval(pollInterval); } } }); }, 3000); - } else { displayErrors(response) } From af40af0e39fbdafc28d9d623fcf64e595345cfb5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 29 Jan 2013 11:58:47 +0300 Subject: [PATCH 0491/2668] Extended javascript unit test XML generation to allow proper integration with jenkins. --- .../xml_filter.groovy} | 4 ++- .../do/js_unit_test_lib/xml_split | 33 +++++++++++++++++++ plugins/frontlinesms-core/do/js_unit_test_xml | 4 ++- .../test/js/check_list_tests.js | 2 ++ .../test/js/recipient_selecter_tests.js | 2 ++ 5 files changed, 43 insertions(+), 2 deletions(-) rename plugins/frontlinesms-core/do/{js_unit_test_xml_filter.groovy => js_unit_test_lib/xml_filter.groovy} (93%) create mode 100755 plugins/frontlinesms-core/do/js_unit_test_lib/xml_split diff --git a/plugins/frontlinesms-core/do/js_unit_test_xml_filter.groovy b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy similarity index 93% rename from plugins/frontlinesms-core/do/js_unit_test_xml_filter.groovy rename to plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy index 291884996..0706354e0 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_xml_filter.groovy +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy @@ -14,7 +14,9 @@ suites.iterator().eachWithIndex { suite, i -> toRemove.each { suites.remove(it) } Node root = new Node(null, 'testsuites') -suites.each { root.append it.children() } +suites.each { + root.append it.children() +} def writer = new StringWriter() new XmlNodePrinter(new PrintWriter(writer)).print(root) diff --git a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_split b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_split new file mode 100755 index 000000000..717c53d19 --- /dev/null +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_split @@ -0,0 +1,33 @@ +#!/bin/bash +# Take input of unit test XML and split into separate files + +TARGET_DIRECTORY=target/test-reports + +OUTPUT_FILE="discard.me" +function output { + echo "Output -> $OUTPUT_FILE: $@" + echo "$@" >> $TARGET_DIRECTORY/$OUTPUT_FILE +} + +DEFAULT_OUTPUT_FILE_COUNT=0 +while IFS="" read -r LINE; do + # check if line is the start of a new file, and change OUTPUT_FILE if appropriate + if echo $LINE | grep -q '^' + fi + + # check if line is metadata not required in output file, and discard as appropriate + if [[ "discard.me" == "$OUTPUT_FILE" ]] || echo "$LINE" | grep -q ''; then + continue + fi + + # output useful output to the specific file + output "$LINE" +done + diff --git a/plugins/frontlinesms-core/do/js_unit_test_xml b/plugins/frontlinesms-core/do/js_unit_test_xml index 9a29a3d0a..403b1ab50 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_xml +++ b/plugins/frontlinesms-core/do/js_unit_test_xml @@ -2,4 +2,6 @@ set -e REPORT_DIR=target/test-reports mkdir -p $REPORT_DIR -do/js_unit_test 2>/dev/null | sgrep '("")' | sed -e 's:::' | do/js_unit_test_xml_filter.groovy | tee $REPORT_DIR/javascript-TestSuites.xml + +do/js_unit_test 2>/dev/null | sgrep '("")' | sed -e 's:::' | do/js_unit_test_lib/xml_filter.groovy | tee $REPORT_DIR/javascript-TestSuites.xml | do/js_unit_test_lib/xml_split + diff --git a/plugins/frontlinesms-core/test/js/check_list_tests.js b/plugins/frontlinesms-core/test/js/check_list_tests.js index 8558e5d7b..c9aafd11b 100644 --- a/plugins/frontlinesms-core/test/js/check_list_tests.js +++ b/plugins/frontlinesms-core/test/js/check_list_tests.js @@ -1,3 +1,5 @@ +QUnit.module("check_list"); + function setup() { dom_trix.initDomFromFile("test/js/check_list/standard.html"); diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js index 46ddb6722..eb99ef5dc 100644 --- a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js +++ b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js @@ -1,3 +1,5 @@ +QUnit.module("recipient_selecter"); + function setup() { dom_trix.initDomFromFile("test/js/recipient_selecter/standard.html"); From 00d6a1858eddc3e15cd904b2edd7c5211d19afb9 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 29 Jan 2013 12:13:08 +0300 Subject: [PATCH 0492/2668] Refractored Fconnection domain objects to use sendEnabled property name --- .../grails-app/conf/CoreBootStrap.groovy | 2 +- .../ClickatellFconnection.groovy | 2 ++ .../domain/frontlinesms2/Fconnection.groovy | 2 ++ .../IntelliSmsFconnection.groovy | 22 +++++++++---------- .../frontlinesms2/SmslibFconnection.groovy | 20 ++++++++--------- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 531c11ef4..758f30784 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -216,7 +216,7 @@ class CoreBootStrap { new EmailFconnection(name:"mr testy's email", receiveProtocol:EmailReceiveProtocol.IMAPS, serverName:'imap.zoho.com', serverPort:993, username:'mr.testy@zoho.com', password:'mister').save(failOnError:true) new ClickatellFconnection(name:"Clickatell Mock Server", apiId:"api123", username:"boris", password:"top secret").save(failOnError:true) - new IntelliSmsFconnection(name:"IntelliSms Mock connection", send:true, username:"johnmark", password:"pass_word").save(failOnError:true) + new IntelliSmsFconnection(name:"IntelliSms Mock connection", sendEnabled:true, username:"johnmark", password:"pass_word").save(failOnError:true) } private def dev_initRealSmslibFconnections() { diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index 373028dea..dfc1c6bff 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -18,6 +18,8 @@ class ClickatellFconnection extends Fconnection { String password // FIXME maybe encode this rather than storing plaintext boolean sendToUsa String fromNumber + boolean sendEnabled = true + boolean receiveEnabled = false static constraints = { apiId blank:false diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index 5bc088d29..dc25763d1 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -42,6 +42,8 @@ class Fconnection { } String name + boolean sendEnabled = true + boolean receiveEnabled = true static namedQueries = { findByMessages { messageInstance -> diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/IntelliSmsFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/IntelliSmsFconnection.groovy index f6cb1e762..c00781804 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/IntelliSmsFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/IntelliSmsFconnection.groovy @@ -10,18 +10,16 @@ import frontlinesms2.camel.exception.* class IntelliSmsFconnection extends Fconnection { private static final String INTELLISMS_URL = 'http://www.intellisoftware.co.uk/smsgateway/sendmsg.aspx?' static configFields = [name:null, - send: ['username', 'password'], - receive: ['receiveProtocol', 'serverName', 'serverPort', 'emailUserName', 'emailPassword']] + sendEnabled: ['username', 'password'], + receiveEnabled: ['receiveProtocol', 'serverName', 'serverPort', 'emailUserName', 'emailPassword']] static passwords = ['password', 'emailPassword'] static defaultValues = [] static String getShortName() { 'intellisms' } String username String password // FIXME maybe encode this rather than storing plaintext - // TODO rename sendEnabled - boolean send - // TODO rename receiveEnabled - boolean receive + boolean sendEnabled + boolean receiveEnabled //Http forwarding configuration EmailReceiveProtocol receiveProtocol @@ -35,15 +33,15 @@ class IntelliSmsFconnection extends Fconnection { } static constraints = { - send(validator: { val, obj -> + sendEnabled(validator: { val, obj -> if(val) { return obj.username && obj.password } - else return obj.receive + else return obj.receiveEnabled }) - receive(validator: { val, obj -> + receiveEnabled(validator: { val, obj -> if(val) return obj.receiveProtocol && obj.serverName && obj.emailUserName && obj.emailUserName - else return obj.send + else return obj.sendEnabled }) username(nullable:true, blank:false) password(nullable:true, blank:false) @@ -66,7 +64,7 @@ class IntelliSmsFconnection extends Fconnection { @Override void configure() {} List getRouteDefinitions() { def definitions = [] - if(isSend()) { + if(isSendEnabled()) { definitions << from("seda:out-${IntelliSmsFconnection.this.id}") .onException(AuthenticationException) .handled(true) @@ -83,7 +81,7 @@ class IntelliSmsFconnection extends Fconnection { .process(new IntelliSmsPostProcessor()) .routeId("out-internet-${IntelliSmsFconnection.this.id}") } - if(isReceive()) { + if(isReceiveEnabled()) { definitions << from(camelProducerAddress()) .setHeader(Fconnection.HEADER_FCONNECTION_ID, simple(IntelliSmsFconnection.this.id.toString())) .beanRef('intelliSmsTranslationService', 'process') diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy index 3a2195700..414dbec3f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmslibFconnection.groovy @@ -8,8 +8,8 @@ import org.smslib.NotConnectedException class SmslibFconnection extends Fconnection { static passwords = ['pin'] - static configFields = ['name', 'manufacturer', 'model', 'port', 'baud', 'pin', 'imsi', 'serial', 'send', 'receive'] - static defaultValues = [send:true, receive:true, baud:9600] + static configFields = ['name', 'manufacturer', 'model', 'port', 'baud', 'pin', 'imsi', 'serial', 'sendEnabled', 'receiveEnabled'] + static defaultValues = [sendEnabled:true, receiveEnabled:true, baud:9600] static String getShortName() { 'smslib' } private def camelAddress = { @@ -28,9 +28,9 @@ class SmslibFconnection extends Fconnection { String pin // FIXME maybe encode this rather than storing plaintext(?) boolean allMessages = true // TODO rename sendEnabled - boolean send = true + boolean sendEnabled = true // TODO rename receiveEnabled - boolean receive = true + boolean receiveEnabled = true static constraints = { manufacturer nullable:true @@ -39,14 +39,14 @@ class SmslibFconnection extends Fconnection { imsi nullable:true pin nullable:true serial nullable:true - send(nullable:true, validator: { val, obj -> + sendEnabled(nullable:true, validator: { val, obj -> if(!val) { - return obj.receive + return obj.receiveEnabled } }) - receive(nullable:true, validator: { val, obj -> + receiveEnabled(nullable:true, validator: { val, obj -> if(!val) { - return obj.send + return obj.sendEnabled } }) } @@ -77,7 +77,7 @@ class SmslibFconnection extends Fconnection { @Override void configure() {} List getRouteDefinitions() { def definitions = [] - if(isSend()) { + if(isSendEnabled()) { definitions << from("seda:out-${SmslibFconnection.this.id}") .onException(NotConnectedException) .handled(true) @@ -88,7 +88,7 @@ class SmslibFconnection extends Fconnection { .to(camelAddress()) .routeId("out-modem-${SmslibFconnection.this.id}") } - if(isReceive()) { + if(isReceiveEnabled()) { definitions << from(camelAddress()) .onException(NotConnectedException) .handled(true) From 204147399464c4056c2f6694109d50120322569d Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 29 Jan 2013 12:17:10 +0300 Subject: [PATCH 0493/2668] Routing rules now uses devices that have sending functionality enabled --- .../frontlinesms2/SettingsController.groovy | 11 +++++------ .../grails-app/i18n/messages.properties | 12 ++++++------ .../grails-app/views/settings/general.gsp | 10 +++++----- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index d7b4cd1ef..44b1b48c3 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -1,6 +1,5 @@ package frontlinesms2 - class SettingsController extends ControllerUtils { static final String RULE_PREFIX = "fconnection-" @@ -56,7 +55,6 @@ class SettingsController extends ControllerUtils { } def basicAuth() { - println "params:: $params" if(appSettingsService.get("auth.basic.enabled") && appSettingsService.get("auth.basic.username") && appSettingsService.get("auth.basic.password")) { appSettingsService.set('auth.basic.enabled', params.enabled) } @@ -73,6 +71,7 @@ class SettingsController extends ControllerUtils { def changeRoutingPreferences() { println "params:: $params" + appSettingsService.set('routing.uselastreceiver', params.uselastreceiver? 'true': 'false') appSettingsService.set('routing.rules', "${processConnectionRules(params)}") appSettingsService.set('routing.otherwise', params.otherwise) @@ -80,15 +79,15 @@ class SettingsController extends ControllerUtils { } private def processConnectionRules(params) { - def routingRules - routingRules = params.findAll {it.key == "uselastreceiver" || it.key ==~ /fconnection-\d/} - routingRules.getAllKeys().join(",") + def routingRules = params.findAll{ it.key ==~ /routeRule-\d/} + println "processConnectionRules::: ${routingRules}" + routingRules*.value?.join(",") } private getRoutingRules(routingRules) { def fconnectionRoutingList = [] def fconnectionRoutingMap = [:] - def connectionInstanceList = Fconnection.findAll() + def connectionInstanceList = Fconnection.findAllBySendEnabled(true) if(routingRules) { fconnectionRoutingList = routingRules?.tokenize(",")?.flatten() diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 3a6e90a80..68c4d45fe 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -182,10 +182,10 @@ smslib.baud.label=Baud rate smslib.pin.label=PIN smslib.imsi.label=SIM IMSI smslib.serial.label=Device Serial # -smslib.send.label=Use for sending -smslib.receive.label=Use for receiving -smslibFconnection.send.validator.error.send=Modem should be used for sending -smslibFconnection.receive.validator.error.receive=or receiving messages +smslib.sendEnabled.label=Use for sending +smslib.receiveEnabled.label=Use for receiving +smslibFconnection.sendEnabled.validator.error.send=Modem should be used for sending +smslibFconnection.receiveEnabled.validator.error.receive=or receiving messages smslib.description=Connect to USB, serial and bluetooth modems or phones smslib.global.info=FrontlineSMS will attempt to automatically configure any connected modem or phone, but you can manually configure them here @@ -622,8 +622,8 @@ intellisms.name.label=Name intellisms.username.label=Username intellisms.password.label=Password -intellisms.send.label=Use for sending -intellisms.receive.label=Use for receiving +intellisms.sendEnabled.label=Use for sending +intellisms.receiveEnabled.label=Use for receiving intellisms.receiveProtocol.label=Protocol intellisms.serverName.label=Server Name intellisms.serverPort.label=Server Port diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index fc0db8314..ea1c56a45 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -52,23 +52,23 @@

      - + - +
    • -
    • -
      • @@ -77,7 +77,7 @@ values="any,dontsend" labels="${g.message(code:'routing.rule.useany')}, ${g.message(code:'routing.rule.dontsend')}" checked="${appSettings['routing.otherwise']}"/> - +
      From d6212cd6fdda14ab7b4d0fb9ae4c6455b0f8fc06 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 29 Jan 2013 12:29:26 +0300 Subject: [PATCH 0494/2668] Minor modification to status tab layout as per CORE-1877 --- .../frontlinesms-core/grails-app/views/status/show.gsp | 4 +++- plugins/frontlinesms-core/web-app/css/status.css | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/status/show.gsp b/plugins/frontlinesms-core/grails-app/views/status/show.gsp index 852c67309..5fae79c49 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/show.gsp @@ -5,7 +5,9 @@ <g:message code="status.header"/> - +
      + +
      diff --git a/plugins/frontlinesms-core/web-app/css/status.css b/plugins/frontlinesms-core/web-app/css/status.css index f8dda70b9..3fb6a725b 100644 --- a/plugins/frontlinesms-core/web-app/css/status.css +++ b/plugins/frontlinesms-core/web-app/css/status.css @@ -1,10 +1,10 @@ #body.status #content { background-color:#eee; position:fixed; top:80px; bottom:0; left:0; right:0; } #body.status h3 { padding:17px 25px; text-transform:uppercase; font-weight:bold; border-bottom:1px solid #eee; } -#body.status #traffic-status{ position:fixed; top:83px; width:47%; background:white; margin:0 25px; - -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; overflow-x:hide; overflow-y:auto; } -#body.status #right-column{ position:fixed; right:0; top:83px; bottom:17px; width:47%; float:right; margin:0 25px; - overflow-x:hide; overflow-y:auto; } -#body.status #connection-status, #body.status #device-detection { background:white; margin: 0 25px 25px 25px; +#body.status #left-column { position:fixed; top:83px; bottom:0; width:47%; margin:0 25px; overflow-x:hidden; overflow-y:auto; } +#body.status #traffic-status{ background:white; -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; } +#body.status #right-column{ position:fixed; right:0; top:83px; bottom:0; width:47%; float:right; margin:0 25px; + overflow-x:hidden; overflow-y:auto; } +#body.status #connection-status, #body.status #device-detection { background:white; margin-left:25px; margin-bottom:25px; -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; } #body.status #device-detection { padding-bottom: 17px; } #body.status #device-detection h3 { float:left; display:inline-block; border:none; } From ffa74db3b5b6f1556631c834d3b1bf637e98bbfa Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 29 Jan 2013 12:29:48 +0300 Subject: [PATCH 0495/2668] format JS code and chained the functions --- .../grails-app/views/contact/_single_contact_view.gsp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp index e2bb484eb..ba7797f3f 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp @@ -145,11 +145,9 @@ $(function() { else{ clear.removeClass("hidden"); } - }); - - $( "td > input[type=text]" ).keyup(function() { + }).keyup(function() { clear = $(this).next(); - if( $(this).val() != ''){ + if( $(this).val() != ''){ clear.removeClass("hidden"); if($(this).attr('name') == 'mobile') { $(".send-message").removeClass('hidden'); @@ -160,7 +158,6 @@ $(function() { if($(this).attr('name') == 'mobile') { $(".send-message").addClass('hidden'); } - } }); }); From 22427d18be5594007bea13a24516ff13bc7c7198 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 29 Jan 2013 12:52:19 +0300 Subject: [PATCH 0496/2668] timeout report now works and is updated/cancelled as appropriate --- .../frontlinesms2/ConnectionController.groovy | 1 + .../grails-app/i18n/messages.properties | 2 +- .../frontlinesms2/FconnectionService.groovy | 4 ++++ .../frontlinesms2/SmssyncService.groovy | 17 ++++++++++++----- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index bfa4c4345..84c3ebeab 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -6,6 +6,7 @@ class ConnectionController extends ControllerUtils { def fconnectionService def messageSendService + def smssyncService def index() { redirect action:'list' diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index ab8f9ac8f..783e74ae3 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -223,7 +223,7 @@ smssync.timeout.label=Time (in minutes) to wait before warning about SMSSync not smssync.description=Use an Android phone with the Smssync app installed to send and receive SMS with FrontlineSMS smssync.field.secret.info=On your app, set the secret to match this field smssync.global.info=Download the SMSSync app from smssync.ushahidi.com -smssync.timeout=The Android phone associated with "{0}" has not contacted FrontlineSMS for {1} minutes +smssync.timeout=The Android phone associated with "{0}" has not contacted FrontlineSMS for {1} minute(s) [edit] # Messages Tab message.create.prompt=Enter message diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index a7c6bc0ce..bf0a5dba5 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -9,6 +9,7 @@ class FconnectionService { def camelContext def deviceDetectionService def i18nUtilService + def smssyncService def createRoutes(Fconnection c) { println "FconnectionService.createRoutes() :: ENTRY :: $c" @@ -57,6 +58,9 @@ class FconnectionService { ex.printStackTrace() } } + def connection = Fconnection.get(id) + if (connection instanceof SmssyncFconnection) + smssyncService.handleRouteDestroyed(connection) println "fconnectionService.destroyRoutes : EXIT" } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 63dc6d402..bf8334a85 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -20,7 +20,7 @@ class SmssyncService { } def reportTimeout(connection) { - new SystemNotification(text:i18nUtilService.getMessage(code:'smssync.timeout', args:[connection.name, connection.timeout])).save(failOnError:true) + new SystemNotification(text:i18nUtilService.getMessage(code:'smssync.timeout', args:[connection.name, connection.timeout, connection.id])).save(failOnError:true) } def apiProcess(connection, controller) { @@ -32,6 +32,7 @@ class SmssyncService { try { def payload = controller.params.task=='send'? handlePollForOutgoing(connection): handleIncoming(connection, controller.params) + startTimeoutCounter(connection) if(connection.secret) payload = [secret:connection.secret] + payload return [payload:payload] } catch(FrontlineApiException ex) { @@ -41,13 +42,15 @@ class SmssyncService { } def startTimeoutCounter(connection) { - if (connectionInstance instanceof SmssyncFconnection && connectionInstance?.timeout > 0) { + ReportSmssyncTimeoutJob.unschedule("SmssyncFconnection-${connection.id}", "SmssyncFconnectionTimeoutJobs") + if (connection instanceof SmssyncFconnection && connection?.timeout > 0) { def sendTime = new Date() use(groovy.time.TimeCategory) { - sendTime = sendTime + (connectionInstance.timeout).minutes - println "I will send the job at $sendTime" + sendTime = sendTime + (connection.timeout).minutes } - def trigger = TriggerHelper.simpleTrigger(new JobKey("test", "test"), sendTime, 0, 1, [connectionId:params.id]) + def trigger = TriggerHelper.simpleTrigger(new JobKey("SmssyncFconnection-${connection.id}", "SmssyncFconnectionTimeoutJobs"), sendTime, 0, 1, [connectionId:connection.id]) + trigger.name = "SmssyncFconnection-${connection.id}" + trigger.group = "SmssyncFconnectionTimeoutJobs" ReportSmssyncTimeoutJob.schedule(trigger) } @@ -79,6 +82,10 @@ class SmssyncService { return success(generateOutgoingResponse(connection, true)) } + private def handleRouteDestroyed(connection) { + ReportSmssyncTimeoutJob.unschedule("SmssyncFconnection-${connection.id}", "SmssyncFconnectionTimeoutJobs") + } + private def generateOutgoingResponse(connection, boolean includeWhenEmpty) { def responseMap = [:] From 78f2ae3726a85beb3076387eae7bd25ae243a82d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 29 Jan 2013 14:15:51 +0300 Subject: [PATCH 0497/2668] SmssyncServiceSpec fixes --- .../frontlinesms2/services/SmssyncServiceSpec.groovy | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy index 46210b821..27e47b027 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy @@ -13,6 +13,7 @@ class SmssyncServiceSpec extends Specification { def controller def camelSentMessage def rendered + def unscheduleInvokationCount def setup() { controller = [params:[:], render:{ rendered = (it as String) }] @@ -28,6 +29,11 @@ class SmssyncServiceSpec extends Specification { } } Dispatch.metaClass.save = { Map params -> } + unscheduleInvokationCount = 0 + ReportSmssyncTimeoutJob.metaClass.static.unschedule = { String name, String group -> + println "unscheduling $name, $group" + unscheduleInvokationCount ++ + } } def setupDefaultConnection(boolean sendEnabled=true) { @@ -120,7 +126,7 @@ class SmssyncServiceSpec extends Specification { true | false | true | 0 } - def 'generateApiResponse for incoming message should forward new Fmessage to storage route'() { + def 'generateApiResponse for incoming message should forward new Fmessage to storage route and unschedule the timeout counter job'() { given: setupDefaultConnection(false) controller.params.from = '12345' @@ -138,6 +144,7 @@ class SmssyncServiceSpec extends Specification { storageQueue[0].inbound && storageQueue[0].src == '12345' && storageQueue[0].text == 'hi there boris' + unscheduleInvokationCount == 1 } @Unroll From 63e8b2548e5336a364b7afd1b8e0a1a919eb6251 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 29 Jan 2013 14:34:23 +0300 Subject: [PATCH 0498/2668] SmssyncServiceSpec fixes --- .../services/frontlinesms2/SmssyncService.groovy | 2 +- .../frontlinesms2/services/SmssyncServiceSpec.groovy | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index bf8334a85..cd56dad76 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -42,8 +42,8 @@ class SmssyncService { } def startTimeoutCounter(connection) { - ReportSmssyncTimeoutJob.unschedule("SmssyncFconnection-${connection.id}", "SmssyncFconnectionTimeoutJobs") if (connection instanceof SmssyncFconnection && connection?.timeout > 0) { + ReportSmssyncTimeoutJob.unschedule("SmssyncFconnection-${connection.id}", "SmssyncFconnectionTimeoutJobs") def sendTime = new Date() use(groovy.time.TimeCategory) { sendTime = sendTime + (connection.timeout).minutes diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy index 27e47b027..e0db1eb8b 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy @@ -1,5 +1,6 @@ package frontlinesms2.services +import org.quartz.Trigger import frontlinesms2.* import spock.lang.* @@ -14,6 +15,7 @@ class SmssyncServiceSpec extends Specification { def camelSentMessage def rendered def unscheduleInvokationCount + def scheduleInvokationCount def setup() { controller = [params:[:], render:{ rendered = (it as String) }] @@ -30,10 +32,15 @@ class SmssyncServiceSpec extends Specification { } Dispatch.metaClass.save = { Map params -> } unscheduleInvokationCount = 0 + scheduleInvokationCount = 0 ReportSmssyncTimeoutJob.metaClass.static.unschedule = { String name, String group -> println "unscheduling $name, $group" unscheduleInvokationCount ++ } + ReportSmssyncTimeoutJob.metaClass.static.schedule = { Trigger trigger -> + println "scheduling $trigger" + scheduleInvokationCount ++ + } } def setupDefaultConnection(boolean sendEnabled=true) { @@ -126,8 +133,9 @@ class SmssyncServiceSpec extends Specification { true | false | true | 0 } - def 'generateApiResponse for incoming message should forward new Fmessage to storage route and unschedule the timeout counter job'() { + def 'generateApiResponse for incoming message should forward new Fmessage to storage route and reschedule the timeout counter job'() { given: + connection.timeout >> 1 setupDefaultConnection(false) controller.params.from = '12345' controller.params.message = 'hi there boris' @@ -145,6 +153,7 @@ class SmssyncServiceSpec extends Specification { storageQueue[0].src == '12345' && storageQueue[0].text == 'hi there boris' unscheduleInvokationCount == 1 + scheduleInvokationCount == 1 } @Unroll From af6ee9540efd2253de9cf9c41b1d1d5344b3cceb Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 29 Jan 2013 15:15:23 +0300 Subject: [PATCH 0499/2668] Merged latest master; minor refactor to names of routing appSettings; added hidden field to track sort order. --- .../frontlinesms-core/application.properties | 2 +- .../do/build_uninstall_install_test | 6 -- .../do/check_for_bad_template_renders | 11 ++- .../xml_filter.groovy} | 4 +- .../do/js_unit_test_lib/xml_split | 33 +++++++ plugins/frontlinesms-core/do/js_unit_test_xml | 4 +- .../do/uninstall_install_test | 9 +- .../grails-app/conf/CoreBootStrap.groovy | 3 +- .../grails-app/conf/CoreResources.groovy | 1 + .../frontlinesms2/ActivityController.groovy | 44 +++++---- .../frontlinesms2/ContactController.groovy | 2 +- .../frontlinesms2/SettingsController.groovy | 24 ++--- .../frontlinesms2/StatusController.groovy | 2 +- .../WebconnectionController.groovy | 32 +++--- .../domain/frontlinesms2/Autoreply.groovy | 1 + .../domain/frontlinesms2/Fmessage.groovy | 1 + .../domain/frontlinesms2/Poll.groovy | 3 +- .../domain/frontlinesms2/Webconnection.groovy | 37 +++++-- .../grails-app/i18n/messages.properties | 8 ++ .../frontlinesms2/TestWebconnectionJob.groovy | 10 ++ .../DeviceDetectionService.groovy | 1 + .../DispatchRouterService.groovy | 36 +++---- .../ExpressionProcessorService.groovy | 63 ++++++------ .../frontlinesms2/FconnectionService.groovy | 21 +++- .../frontlinesms2/WebconnectionService.groovy | 44 ++++++++- .../taglib/frontlinesms2/FsmsTagLib.groovy | 33 +++++-- .../views/activity/announcement/show.gsp | 2 +- .../views/activity/create_new_activity.gsp | 19 ++-- .../views/activity/webconnection/show.gsp | 2 +- .../views/connection/_connection.gsp | 14 +++ .../views/connection/_connection_list.gsp | 36 +------ .../views/connection/_selected_connection.gsp | 32 ++++++ .../grails-app/views/connection/_type.gsp | 21 ++-- .../grails-app/views/connection/show.gsp | 12 +-- .../grails-app/views/poll/_validate.gsp | 2 +- .../grails-app/views/settings/general.gsp | 23 ++--- .../grails-app/views/smartGroup/create.gsp | 6 +- .../grails-app/views/status/show.gsp | 4 +- .../grails-app/views/webconnection/_type.gsp | 23 ++--- .../views/webconnection/_validate.gsp | 97 +++++++++++++++++-- .../views/webconnection/generic/_scripts.gsp | 5 + .../views/webconnection/ushahidi/_confirm.gsp | 3 +- .../views/webconnection/ushahidi/_scripts.gsp | 4 + .../frontlinesms2/ControllerUtils.groovy | 3 +- .../archive/PageArchiveSent.groovy | 4 +- .../connection/ConnectionDialog.groovy | 4 +- .../connection/ConnectionFSpec.groovy | 26 ++--- .../connection/PageConnection.groovy | 6 +- .../popup/PageMediumPopup.groovy | 5 +- .../settings/BasicAuthenticationSpec.groovy | 38 +++----- .../settings/PageGeneralSettings.groovy | 17 ++-- .../GenericWebconnectionCedSpec.groovy | 16 ++- .../UshahidiWebconnectionCedSpec.groovy | 11 +++ .../WebconnectionControllerISpec.groovy | 37 ++++++- .../frontlinesms2/domain/FmessageISpec.groovy | 2 +- .../domain/UshahidiWebconnectionISpec.groovy | 22 ----- .../domain/WebconnectionISpec.groovy | 1 + .../ExpressionProcessorServiceISpec.groovy | 38 +++++--- .../service/WebconnectionServiceISpec.groovy | 34 ++++++- .../test/js/check_list_tests.js | 2 + .../test/js/recipient_selecter_tests.js | 2 + .../WebconnectionServiceSpec.groovy | 53 ++++++++++ .../controllers/SettingsControllerSpec.groovy | 16 ++- .../services/DispatchRouterServiceSpec.groovy | 31 +++--- .../web-app/css/controls.css | 3 + .../frontlinesms-core/web-app/css/status.css | 10 +- .../frontlinesms-core/web-app/css/wizard.css | 2 + .../web-app/js/activity/popups.js | 38 +++++--- .../web-app/js/fconnection.js | 11 +++ .../frontlinesms-core/web-app/js/magicwand.js | 9 +- .../web-app/js/mediumPopup.js | 6 +- .../web-app/js/message/moreActions.js | 2 +- .../web-app/js/new_features.js | 6 +- .../web-app/js/sanchez.min.js | 1 + .../web-app/js/settings/general_settings.js | 11 ++- .../radio/grails-app/conf/BuildConfig.groovy | 2 +- plugins/radio/grails-app/conf/Config.groovy | 2 +- 77 files changed, 791 insertions(+), 420 deletions(-) rename plugins/frontlinesms-core/do/{js_unit_test_xml_filter.groovy => js_unit_test_lib/xml_filter.groovy} (93%) create mode 100755 plugins/frontlinesms-core/do/js_unit_test_lib/xml_split create mode 100644 plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy create mode 100644 plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp create mode 100644 plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy create mode 100644 plugins/frontlinesms-core/web-app/js/sanchez.min.js diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 1f1f936b6..a04c77246 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Thu Jan 17 13:04:52 EAT 2013 +#Fri Jan 18 10:43:42 EAT 2013 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/do/build_uninstall_install_test b/plugins/frontlinesms-core/do/build_uninstall_install_test index 58b94f6e5..f17a5d26d 100755 --- a/plugins/frontlinesms-core/do/build_uninstall_install_test +++ b/plugins/frontlinesms-core/do/build_uninstall_install_test @@ -11,15 +11,9 @@ echo "## 5. check that the server is working! ##" echo "#############################################" PROJECT_DIR=../frontlinesms-core -INSTALL_DIR=~/frontlinesms2 -ALL_USER_INSTALL_DIR=/opt/frontlinesms2 -SETTINGS_DIR=~/.frontlinesms2 -SERVER_PORT=8130 -CONTEXT_PATH= echo "# clean target directories" rm -rf $PROJECT_DIR/target/ -rm -rf target/ rm -rf $PROJECT_DIR/install/target* rm -rf $PROJECT_DIR/install/src/web-app/ diff --git a/plugins/frontlinesms-core/do/check_for_bad_template_renders b/plugins/frontlinesms-core/do/check_for_bad_template_renders index 4f08d1767..7042f5f6f 100755 --- a/plugins/frontlinesms-core/do/check_for_bad_template_renders +++ b/plugins/frontlinesms-core/do/check_for_bad_template_renders @@ -1,15 +1,18 @@ #!/bin/bash +echo "# Checking for bad calls to template renderer..." echo "# Checking views..." -grep -rn 'g:render.*template' grails-app/views/ +grep -rn "render.*template" grails-app/views/ | grep -v "fsms:render" VIEW_OUTPUT=$? -echo "" echo "# Checking controllers" -grep -rn "render.*template" grails-app/controllers/ +grep -rn "render.*template" grails-app/controllers/ | grep -v "fsms\.render" CONTROLLER_OUTPUT=$? if [ "$CONTROLLER_OUTPUT" -eq 1 ] && [ "$VIEW_OUTPUT" -eq 1 ]; then - echo "Violations NOT detected" + echo "# No bad template renders detected" + exit 0 +else + echo "# Bad template renders detected" exit 1 fi diff --git a/plugins/frontlinesms-core/do/js_unit_test_xml_filter.groovy b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy similarity index 93% rename from plugins/frontlinesms-core/do/js_unit_test_xml_filter.groovy rename to plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy index 291884996..0706354e0 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_xml_filter.groovy +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy @@ -14,7 +14,9 @@ suites.iterator().eachWithIndex { suite, i -> toRemove.each { suites.remove(it) } Node root = new Node(null, 'testsuites') -suites.each { root.append it.children() } +suites.each { + root.append it.children() +} def writer = new StringWriter() new XmlNodePrinter(new PrintWriter(writer)).print(root) diff --git a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_split b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_split new file mode 100755 index 000000000..717c53d19 --- /dev/null +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_split @@ -0,0 +1,33 @@ +#!/bin/bash +# Take input of unit test XML and split into separate files + +TARGET_DIRECTORY=target/test-reports + +OUTPUT_FILE="discard.me" +function output { + echo "Output -> $OUTPUT_FILE: $@" + echo "$@" >> $TARGET_DIRECTORY/$OUTPUT_FILE +} + +DEFAULT_OUTPUT_FILE_COUNT=0 +while IFS="" read -r LINE; do + # check if line is the start of a new file, and change OUTPUT_FILE if appropriate + if echo $LINE | grep -q '^' + fi + + # check if line is metadata not required in output file, and discard as appropriate + if [[ "discard.me" == "$OUTPUT_FILE" ]] || echo "$LINE" | grep -q ''; then + continue + fi + + # output useful output to the specific file + output "$LINE" +done + diff --git a/plugins/frontlinesms-core/do/js_unit_test_xml b/plugins/frontlinesms-core/do/js_unit_test_xml index 76df4b611..e5627a68a 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_xml +++ b/plugins/frontlinesms-core/do/js_unit_test_xml @@ -2,4 +2,6 @@ set -e REPORT_DIR=target/test-reports mkdir -p $REPORT_DIR -do/js_unit_test 2>/dev/null | sgrep '("")' | sed -e 's:::' | do/js_unit_test_xml_filter.groovy > $REPORT_DIR/javascript-TestSuites.xml + +do/js_unit_test 2>/dev/null | sgrep '("")' | sed -e 's:::' | do/js_unit_test_lib/xml_filter.groovy | tee $REPORT_DIR/TESTS-javascript-TestSuites.xml | do/js_unit_test_lib/xml_split + diff --git a/plugins/frontlinesms-core/do/uninstall_install_test b/plugins/frontlinesms-core/do/uninstall_install_test index 3b3c67a16..59c84cbb6 100755 --- a/plugins/frontlinesms-core/do/uninstall_install_test +++ b/plugins/frontlinesms-core/do/uninstall_install_test @@ -3,11 +3,10 @@ set -e echo "#############################################" echo "## This script aims to test new installers ##" -echo "## 1. Build installer ##" -echo "## 2. uninstall old installation ##" -echo "## 3. install new version ##" -echo "## 4. run new version ##" -echo "## 5. check that the server is working! ##" +echo "## 1. uninstall old installation ##" +echo "## 2. install new version ##" +echo "## 3. run new version ##" +echo "## 4. check that the server is working! ##" echo "#############################################" PROJECT_DIR=../frontlinesms-core diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 758f30784..3c0067a61 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -45,8 +45,7 @@ class CoreBootStrap { // never show new popup during tests appSettingsService['newfeatures.popup.show.immediately'] = false //default routing in tests is to use any available connections - appSettingsService.set('routing.uselastreceiver', false) - appSettingsService.set('routing.rules', 'uselastreceiver') + appSettingsService.set('routing.use', 'uselastreceiver') appSettingsService.set('routing.otherwise', 'any') appSettingsService.set('routing.preferences.edited', true) } diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index f6f3d1430..0909be1e6 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -38,6 +38,7 @@ modules = { resource url:[dir:'js', file:"new_features.js"], disposition:'head' resource url:[dir:'js', file:"pagination.js"], disposition:'head' resource url:[dir:'js', file:"recipient_selecter.js"], disposition:'head' + resource url:[dir:'js', file:"sanchez.min.js"], disposition:'head' resource url:[dir:'js', file:"smallPopup.js"], disposition:'head' resource url:[dir:'js', file:"status_indicator.js"], disposition:'head' resource url:[dir:'js', file:"system_notification.js"], disposition:'head' diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 7edd5e12b..e3e6f932b 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -2,7 +2,6 @@ package frontlinesms2 import grails.converters.JSON - class ActivityController extends ControllerUtils { static allowedMethods = [save: "POST", update: "POST", delete: "POST"] @@ -110,7 +109,7 @@ class ActivityController extends ControllerUtils { def create_new_activity() {} - def getCollidingKeywords(topLevelKeywords, instance) { + private def getCollidingKeywords(topLevelKeywords, instance) { if (topLevelKeywords == null) return [:] def collidingKeywords = [:] @@ -124,10 +123,10 @@ class ActivityController extends ControllerUtils { return collidingKeywords } - protected void doSave(classShortname, service, instance) { + protected void doSave(classShortname, service, instance, activate=true) { try { service.saveInstance(instance, params) - instance.activate() + if(activate) instance.activate() flash.message = message([code:"${instance.class.shortName}.save.success", args:[instance.name]]) params.activityId = instance.id withFormat { @@ -135,25 +134,30 @@ class ActivityController extends ControllerUtils { html { [ownerId:instance.id] } } } catch(Exception ex) { - def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords, instance) - def errors - if (collidingKeywords) { - errors = collidingKeywords.collect { - if(it.key == '') { - message(code:'activity.generic.global.keyword.in.use', args:[it.value]) - } else { - message(code:'activity.generic.keyword.in.use', args:[it.key, it.value]) - } - }.join('\n') - } else { - errors = instance.errors.allErrors.collect { message(error:it) }.join('\n') - } - withFormat { - json { render([ok:false, text:errors] as JSON) } - } + ex.printStackTrace() + generateErrorMessages(instance) } } + private def generateErrorMessages(instance) { + def collidingKeywords = getCollidingKeywords(params.sorting == 'global'? '' : params.keywords, instance) + def errors + if (collidingKeywords) { + errors = collidingKeywords.collect { + if(it.key == '') { + message(code:'activity.generic.global.keyword.in.use', args:[it.value]) + } else { + message(code:'activity.generic.keyword.in.use', args:[it.key, it.value]) + } + }.join('\n') + } else { + errors = instance.errors.allErrors.collect { message(error:it) }.join('\n') + } + withFormat { + json { render([ok:false, text:errors] as JSON) } + } + } + private def withActivity = withDomainObject Activity private def defaultMessage(String code, args=[]) { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index d7ccb78fd..47c6213f7 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -169,7 +169,7 @@ class ContactController extends ControllerUtils { } def search() { - render template:'search_results', model:contactSearchService.contactList(params) + fsms.render template:'search_results', model:contactSearchService.contactList(params) } def checkForDuplicates() { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index 44b1b48c3..144543a7f 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -36,9 +36,9 @@ class SettingsController extends ControllerUtils { appSettings['routing.uselastreceiver'] = appSettingsService.get("routing.uselastreceiver") appSettings['routing.otherwise'] = appSettingsService.get("routing.otherwise") - appSettings['routing.rules'] = appSettingsService.get("routing.rules") + appSettings['routing.use'] = appSettingsService.get("routing.use") - def fconnectionRoutingMap = getRoutingRules(appSettings['routing.rules']) + def fconnectionRoutingMap = getRoutingRules(appSettings['routing.use']) [currentLanguage:i18nUtilService.getCurrentLanguage(request), authEnabled:authEnabled, @@ -73,41 +73,35 @@ class SettingsController extends ControllerUtils { println "params:: $params" appSettingsService.set('routing.uselastreceiver', params.uselastreceiver? 'true': 'false') - appSettingsService.set('routing.rules', "${processConnectionRules(params)}") + appSettingsService.set('routing.use', params.routingUseOrder) appSettingsService.set('routing.otherwise', params.otherwise) redirect action:'general' } - private def processConnectionRules(params) { - def routingRules = params.findAll{ it.key ==~ /routeRule-\d/} - println "processConnectionRules::: ${routingRules}" - routingRules*.value?.join(",") - } - private getRoutingRules(routingRules) { def fconnectionRoutingList = [] def fconnectionRoutingMap = [:] def connectionInstanceList = Fconnection.findAllBySendEnabled(true) if(routingRules) { - fconnectionRoutingList = routingRules?.tokenize(",")?.flatten() + fconnectionRoutingList = routingRules.split(/\s*,\s*/) println "Routing Rules before refinement:::: $routingRules" // Replacing fconnection rules with fconnection instances fconnectionRoutingList = fconnectionRoutingList.collect { rule -> - if(rule.contains(RULE_PREFIX)) connectionInstanceList.find { + if(rule.startsWith(RULE_PREFIX)) { + connectionInstanceList.find { println "Comparing rule:: $rule with id:: $it :: ${it.id == ((rule - RULE_PREFIX) as Integer)}" it.id == ((rule - RULE_PREFIX) as Integer) } - else rule + } else rule } if(fconnectionRoutingList) { def length = fconnectionRoutingList.size() if(!fconnectionRoutingList.contains("uselastreceiver")) fconnectionRoutingList << "uselastreceiver" - ((fconnectionRoutingList += connectionInstanceList) - null as Set).eachWithIndex {it, index -> - if(index < length) fconnectionRoutingMap[it] = true - else fconnectionRoutingMap[it] = false + ((fconnectionRoutingList += connectionInstanceList) - null as Set).eachWithIndex { it, index -> + fconnectionRoutingMap[it] = index < length } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy index 6af4d6211..04b2be7ed 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy @@ -26,7 +26,7 @@ class StatusController extends ControllerUtils { } def listDetected() { - render template:'device_detection', model:[detectedDevices:deviceDetectionService.detected] + fsms.render template:'device_detection', model:[detectedDevices:deviceDetectionService.detected] } def resetDetection() { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index 966902ebc..806e86108 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -12,14 +12,9 @@ class WebconnectionController extends ActivityController { def create() {} def save() { - def webconnectionInstance - Class clazz = WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType] - if(params.ownerId) { - webconnectionInstance = clazz.get(params.ownerId) - } else { - webconnectionInstance = clazz.newInstance() + withWebconnection { webconnectionInstance -> + doSave('webconnection', webconnectionService, webconnectionInstance) } - doSave('webconnection', webconnectionService, webconnectionInstance) } def config() { @@ -32,15 +27,24 @@ class WebconnectionController extends ActivityController { render responseMap as JSON } - private def renderJsonErrors(webconnectionInstance) { - def errorMessages = webconnectionInstance.errors.allErrors.collect { message(error:it) }.join("\n") - withFormat { - json { - render([ok:false, text:errorMessages] as JSON) - } + def testRoute() { + withWebconnection { webconnectionInstance -> + doSave('webconnection', webconnectionService, webconnectionInstance, false) + if(webconnectionService) TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) } } - private def withWebconnection = withDomainObject Webconnection + def checkRouteStatus() { + def webconnectionInstance = Webconnection.get(params.ownerId) + def response = [ownerId:params.ownerId, ok:true] + if(webconnectionInstance) { + def message = Fmessage.findByMessageOwnerAndText(webconnectionInstance, Fmessage.TEST_MESSAGE_TEXT) + response.status = message?.ownerDetail + } + + render response as JSON + } + + private def withWebconnection = withDomainObject WebconnectionController.WEB_CONNECTION_TYPE_MAP[params.webconnectionType], { params.ownerId } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy index ac7c2ba9b..05711b39f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy @@ -27,6 +27,7 @@ class Autoreply extends Activity { params.messageText = autoreplyText addToMessages(message) def outgoingMessage = messageSendService.createOutgoingMessage(params) + outgoingMessage.ownerDetail = message.id addToMessages(outgoingMessage) messageSendService.send(outgoingMessage) save() diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 8d1aa51d0..dff52a810 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -5,6 +5,7 @@ import org.hibernate.criterion.CriteriaSpecification class Fmessage { static final int MAX_TEXT_LENGTH = 1600 + static final String TEST_MESSAGE_TEXT = "Test Message" static belongsTo = [messageOwner:MessageOwner] static transients = ['hasSent', 'hasPending', 'hasFailed', 'displayName' ,'outboundContactList', 'receivedOn'] diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy index 6e7b24844..b34281cab 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Poll.groovy @@ -135,7 +135,8 @@ class Poll extends Activity { println "###### V :: ${v}" println attrs["keywords${k}"] attrs["keywords${k}"]?.replaceAll(/\s/, "").split(",").each{ - this.addToKeywords(new Keyword(value:"${it.toUpperCase()}", ownerDetail:"${k}", isTopLevel:!(attrs.topLevelKeyword?.trim().length() > 0)))//adds the keyword without setting the ownerDetail as pollResponse.id + if(it.size() > 0) + this.addToKeywords(new Keyword(value:"${it.toUpperCase()}", ownerDetail:"${k}", isTopLevel:!(attrs.topLevelKeyword?.trim().length() > 0)))//adds the keyword without setting the ownerDetail as pollResponse.id } } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index 1b1c3609c..140b8cc6c 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -70,6 +70,27 @@ abstract class Webconnection extends Activity implements FrontlineApi { webconnectionService.send(message) } + List getTestRouteDefinitions() { + return new RouteBuilder() { + @Override void configure() {} + List getRouteDefinitions() { + return [from("seda:activity-webconnection-${Webconnection.this.id}") + .beanRef('webconnectionService', 'preProcess') + .setHeader(Exchange.HTTP_PATH, simple('${header.url}')) + .onException(Exception) + .redeliveryDelay(0) + .handled(true) + .beanRef('webconnectionService', 'handleException') + .beanRef('webconnectionService', 'createStatusNotification') + .end() + .to(Webconnection.this.url) + .beanRef('webconnectionService', 'postProcess') + .beanRef('webconnectionService', 'createStatusNotification') + .routeId("activity-webconnection-${Webconnection.this.id}")] + } + }.routeDefinitions + } + List getRouteDefinitions() { return new RouteBuilder() { @Override void configure() {} @@ -93,15 +114,13 @@ abstract class Webconnection extends Activity implements FrontlineApi { } def activate() { - try { - deactivate() - } catch(Exception ex) { - log.info("Exception thrown while deactivating webconnection '$name'", ex) - } - println "*** ACTIVATING ACTIVITY ***" + createRoute(this.routeDefinitions) + } + + def createRoute(routes) { try { - def routes = this.routeDefinitions + deactivate() camelContext.addRouteDefinitions(routes) println "################# Activating Webconnection :: ${this}" LogEntry.log("Created Webconnection routes: ${routes*.id}") @@ -109,8 +128,7 @@ abstract class Webconnection extends Activity implements FrontlineApi { println ex } catch(Exception ex) { println ex - camelContext.stopRoute("activity-webconnection-${this.id}") - camelContext.removeRoute("activity-webconnection-${this.id}") + deactivate() } } @@ -152,6 +170,7 @@ abstract class Webconnection extends Activity implements FrontlineApi { println "###### Webconnection.postProcess() with Exchange # ${x}" println "Web Connection Response::\n ${x.in.body}" log.info "Web Connection Response::\n ${x.in.body}" + x } private String urlEncode(String s) throws UnsupportedEncodingException { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 68c4d45fe..f8d386a00 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -490,6 +490,7 @@ wizard.messages.replyall.title=Reply All wizard.send.message.title=Send Message wizard.ok=Ok wizard.create=Create +wizard.save=Save wizard.send=Send common.settings=Settings common.help=Help @@ -927,6 +928,13 @@ webconnection.url.label=Server Url: webconnection.param.name=Name: webconnection.param.value=Value: webconnection.add.anotherparam=Add parameter +webconnection.test.prompt=Send Test Message +webconnection.success.label=Test message sent successfully to {0} +webconnection.popup.success.label=Test message sent successfully +webconnection.failed.label=Test message failed sending to {0} +webconnection.popup.failed.label=Test message failed sending +webconnection.testroute.label=Save and Test +webconnection.testing.label=Testing... dynamicfield.message_body.label=Message Text dynamicfield.message_body_with_keyword.label=Message Text With keyword diff --git a/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy new file mode 100644 index 000000000..9b733724f --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/jobs/frontlinesms2/TestWebconnectionJob.groovy @@ -0,0 +1,10 @@ +package frontlinesms2 + +class TestWebconnectionJob { + def webconnectionService + + def execute(context) { + def webconnection = Webconnection.get(context.mergedJobDataMap.get('webconnectionId')?.toLong()) + if(webconnection) webconnectionService.testRoute(webconnection) + } +} diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy index dbb9e9682..fb7ea4cfc 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DeviceDetectionService.groovy @@ -67,3 +67,4 @@ class DeviceDetectionService { return (detectorThread != null && threadState != Thread.State.TERMINATED) } } + diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index a14ed5091..0f4d5a46d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -34,32 +34,32 @@ class DispatchRouterService { return "seda:out-$requestedFconnectionId" } else { def routeId - log "appSettingsService.['routing.rules'] is ${appSettingsService.get('routing.rules')}" - log "appSettingsService.['routing.uselastreceiver'] is ${appSettingsService.get('routing.uselastreceiver')}" + log "appSettingsService.['routing.use'] is ${appSettingsService.get('routing.use')}" - if(appSettingsService.get('routing.rules')) { - def fconnectionRoutingList = appSettingsService.get('routing.rules')?.tokenize(",")?.flatten() + if(appSettingsService.get('routing.use')) { +println "USE :: ${appSettingsService.get('routing.use')}" + def fconnectionRoutingList = appSettingsService.get('routing.use').split(/\s*,\s*/) fconnectionRoutingList = fconnectionRoutingList.collect { route -> - if(route.contains(RULE_PREFIX)) ((route - RULE_PREFIX) as Integer) - else route + route.startsWith(RULE_PREFIX)? route.substring(RULE_PREFIX.size()): route } println "fconnectionRoutingList::: $fconnectionRoutingList" for(route in fconnectionRoutingList) { - if(route instanceof String && route == "uselastreceiver") { routeId = getLastReceiverId(exchange)} - else { routeId = getCamelRouteId(Fconnection.get(route)) } + if(route == 'uselastreceiver') { + routeId = getLastReceiverId(exchange) + } else { + routeId = getCamelRouteId(Fconnection.get(route)) + } log "Route Id selected: $routeId" if(routeId) break } - } else if(appSettingsService.get('routing.uselastreceiver') == 'true'){ - routeId = getLastReceiverId(exchange) } - if(!routeId){ // if uselastreceiver did not set the routeId + if(!routeId) { if(appSettingsService.get('routing.otherwise') == 'any') { log "## Sending to any available connection ##" - routeId = getDispatchRouteId() - }else{ + routeId = getRouteIdByRoundRobin() + } else { log "## Not sending message at all ##" } } @@ -72,12 +72,13 @@ class DispatchRouterService { return queueName } else { // TODO may want to queue for retry here, after incrementing retry-count header + // TODO CORE-1694 create a system notification here throw new RuntimeException("No outbound route available for dispatch.") } } } - def getDispatchRouteId() { + def getRouteIdByRoundRobin() { def allOutRoutes = camelContext.routes.findAll { it.id.startsWith('out-') } if(allOutRoutes.size > 0) { // check for internet routes and prioritise them over modems @@ -85,8 +86,8 @@ class DispatchRouterService { if(!filteredRouteList) filteredRouteList = allOutRoutes.findAll { it.id.contains('-modem-') } if(!filteredRouteList) filteredRouteList = allOutRoutes - println "DispatchRouterService.getDispatchConnectionId() : Routes available: ${filteredRouteList*.id}" - println "DispatchRouterService.getDispatchConnectionId() : Counter has counted up to $counter" + println "DispatchRouterService.getRouteIdByRoundRobin() : Routes available: ${filteredRouteList*.id}" + println "DispatchRouterService.getRouteIdByRoundRobin() : Counter has counted up to $counter" return filteredRouteList[++counter % filteredRouteList.size]?.id } } @@ -145,6 +146,7 @@ class DispatchRouterService { println "ALL ROUTE IDS ## ${allOutRoutes*.id}" def routeToTake = allOutRoutes.find{ it.id.endsWith("-${connection.id}") } println "Chosen Route ## $routeToTake" - routeToTake?routeToTake.id:null + routeToTake? routeToTake.id: null } } + diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy index 0c4145b1f..747206aa7 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy @@ -18,20 +18,11 @@ class ExpressionProcessorService { fields.findAll { controllerName in it.value }.keySet() } - String replaceExpressions(Dispatch dispatch) { - def messageBody = dispatch.message.text - matches = messageBody.findAll(regex) - matches.each { - messageBody = messageBody.replaceFirst(regex, getReplacement(it, dispatch)) - } - messageBody - } - String process(Dispatch dispatch) { def messageBody = dispatch.message.text def matches = getExpressions(messageBody) - matches.each { - messageBody = messageBody.replaceFirst(regex, getReplacement(it, dispatch)) + matches.unique().each { match -> + messageBody = messageBody.replace(match, getReplacement(match, dispatch)) } messageBody } @@ -49,30 +40,36 @@ class ExpressionProcessorService { } private getReplacement(expression, dispatch) { - def incomingMessage = Fmessage.get(dispatch.message.ownerDetail) - if (expression == "\${message_text}"){ - def keyword = incomingMessage.messageOwner?.keywords?.find{ incomingMessage.text.toUpperCase().startsWith(it.value) }?.value - def text = incomingMessage.text - if (keyword?.size() && text.toUpperCase().startsWith(keyword.toUpperCase())) { - text = text.substring(keyword.size()).trim() + try { + // TODO could replace this manual mapping wth...a Map! e.g. [sender_number:{incomingMessage.src}] + def incomingMessage = Fmessage.get(dispatch.message.ownerDetail) + def getKeyword = { incomingMessage.messageOwner?.keywords?.find { incomingMessage.text.toUpperCase().startsWith(it.value) }?.value } + if (expression == '${message_text}') { + def keyword = getKeyword() + def text = incomingMessage.text + if (keyword?.size() && text.toUpperCase().startsWith(keyword.toUpperCase())) { + text = text.substring(keyword.size()).trim() + } + return text } - return text - } - if (expression == "\${message_text_with_keyword}") - return incomingMessage.text - if (expression == "\${sender_number}") - return incomingMessage.src - if (expression == "\${sender_name}") - return Contact.findByMobileLike(incomingMessage.src)? Contact.findByMobileLike(incomingMessage.src).name : incomingMessage.src - if (expression == "\${recipient_number}") - return dispatch.dst - if (expression == "\${recipient_name}") - return Contact.findByMobileLike(dispatch.dst)? Contact.findByMobileLike(dispatch.dst).name : dispatch.dst - if (expression == "\${keyword}"){ - def keyword = incomingMessage.messageOwner?.keywords?.find{ incomingMessage.text.toUpperCase().startsWith(it.value) }?.value - return keyword + if (expression == '${message_text_with_keyword}') + return incomingMessage.text + if (expression == '${sender_number}') + return incomingMessage.src + if (expression == '${sender_name}') + return incomingMessage.inboundContactName?: incomingMessage.src + if (expression == '${recipient_number}') + return dispatch.dst + if (expression == '${recipient_name}') { + def recipient = Contact.findByMobileLike(dispatch.dst) + return recipient? recipient.name: dispatch.dst + } + if (expression == '${keyword}') + return getKeyword() + return expression + } catch (Exception e) { + return expression } - return "" } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index a7c6bc0ce..3695f3629 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -9,6 +9,7 @@ class FconnectionService { def camelContext def deviceDetectionService def i18nUtilService + def connectingIds = [].asSynchronized() def createRoutes(Fconnection c) { println "FconnectionService.createRoutes() :: ENTRY :: $c" @@ -23,6 +24,7 @@ class FconnectionService { } println "creating route for fconnection $c" try { + connectingIds << c.id def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) @@ -32,6 +34,8 @@ class FconnectionService { } catch(Exception ex) { logFail(c, ex) destroyRoutes(c.id as long) + } finally { + connectingIds -= c.id } println "FconnectionService.createRoutes() :: EXIT :: $c" } @@ -61,10 +65,19 @@ class FconnectionService { } def getConnectionStatus(Fconnection c) { - if (c instanceof SmslibFconnection) - return camelContext.routes.any { it.id ==~ /.*-$c.id$/ } ? ConnectionStatus.CONNECTED : deviceDetectionService.isConnecting((c as SmslibFconnection).port) ? ConnectionStatus.CONNECTING : ConnectionStatus.NOT_CONNECTED - else - return camelContext.routes.any { it.id ==~ /.*-$c.id$/ } ? ConnectionStatus.CONNECTED : ConnectionStatus.NOT_CONNECTED + if(c.id in connectingIds) { + return ConnectionStatus.CONNECTING + } + if (c instanceof SmslibFconnection) { + return camelContext.routes.any { it.id ==~ /.*-$c.id$/ }? + ConnectionStatus.CONNECTED: + deviceDetectionService.isConnecting((c as SmslibFconnection).port)? + ConnectionStatus.CONNECTING: + ConnectionStatus.NOT_CONNECTED + } + return camelContext.routes.any { it.id ==~ /.*-$c.id$/ }? + ConnectionStatus.CONNECTED: + ConnectionStatus.NOT_CONNECTED } // TODO rename 'handleNotConnectedException' diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index bfbcc1052..5cf516efd 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -9,6 +9,8 @@ import frontlinesms2.api.* class WebconnectionService { + def camelContext + def i18nUtilService def messageSendService def preProcess(Exchange x) { @@ -39,10 +41,14 @@ class WebconnectionService { log.info "Web Connection request failed with exception: ${x.in.body}" } - def handleFailed(Exchange x) { - } - - def handleCompleted(Exchange x) { + def createStatusNotification(Exchange x) { + def webConn = Webconnection.get(x.in.headers.'webconnection-id') + def message = Fmessage.get(x.in.headers.'fmessage-id') + def text = i18nUtilService.getMessage(code:"webconnection.${message.ownerDetail}.label", args:[webConn.name]) + println "######## StatusNotification::: $text #########" + def notification = SystemNotification.findByText(text) ?: new SystemNotification(text:text) + notification.read = false + notification.save(failOnError:true, flush:true) } def send(Fmessage message) { @@ -73,6 +79,30 @@ class WebconnectionService { webconnectionInstance.save(failOnError:true, flush:true) } + def testRoute(Webconnection webconnectionInstance) { + def message = Fmessage.findByMessageOwnerAndText(webconnectionInstance, Fmessage.TEST_MESSAGE_TEXT) + println "testRoute::: $message" + if(!message) { + message = createTestMessage() + webconnectionInstance.addToMessages(message) + webconnectionInstance.save(failOnError:true) + } + webconnectionInstance.createRoute(webconnectionInstance.testRouteDefinitions) + if(getStatusOf(webconnectionInstance) == ConnectionStatus.CONNECTED) { + def headers = [:] + headers.'fmessage-id' = message.id + headers.'webconnection-id'= webconnectionInstance.id + sendMessageAndHeaders("seda:activity-webconnection-${webconnectionInstance.id}", message, headers) + changeMessageOwnerDetail(message, Webconnection.OWNERDETAIL_PENDING) + } else { + changeMessageOwnerDetail(message, Webconnection.OWNERDETAIL_FAILED) + } + } + + def getStatusOf(Webconnection w) { + camelContext.routes.any { it.id ==~ /.*activity-webconnection-${w.id}$/ } ? ConnectionStatus.CONNECTED : ConnectionStatus.NOT_CONNECTED + } + private changeMessageOwnerDetail(Fmessage message, String s) { message.ownerDetail = s message.save(failOnError:true, flush:true) @@ -155,5 +185,9 @@ class WebconnectionService { webcon.save(failOnError: true) "message successfully queued to send to ${m.dispatches.size()} recipient(s)" } -} + private Fmessage createTestMessage() { + Fmessage fm = new Fmessage(src:"0000", text:Fmessage.TEST_MESSAGE_TEXT, inbound:true) + fm.save(failOnError:true, flush:true) + } +} diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index b759e25a6..da18072c7 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -79,7 +79,7 @@ class FsmsTagLib { out << "
      " if(att.title) out << "

      ${g.message(code:att.title)}

      " if(att.info) out << info([message:att.info]) - out << "
        " + out << "
          " att.values.each { key, checked -> def label = g.message(code:att.label + '.' + key) def itemAttributes = [checked:checked, name:key, value:true] @@ -93,19 +93,36 @@ class FsmsTagLib { } def radioGroup = { att -> - def values = att.values.tokenize(',')*.trim() - def labels = att.labels? att.labels.tokenize(',')*.trim(): null + def values = att.remove('values') + values = values instanceof String? values.tokenize(',')*.trim(): values + def labels = att.labels? att.remove('labels').tokenize(',')*.trim(): null def isChecked = { v -> v == att.checked } - out << "
          " - if(att.title) out << "

          ${g.message(code:att.title)}

          " + if(att.title) { + def hTag = att.solo == 'true'? 'h2': 'h3' + out << "<$hTag>${g.message(code:att.title)}" + } if(att.info) out << info([message:att.info]) - out << '
            ' + def labelPrefix = att.remove('labelPrefix')?: '' + def labelSuffix = att.remove('labelSuffix')?: '' + def descriptionPrefix = att.remove('descriptionPrefix')?: '' + def descriptionSuffix = att.remove('descriptionSuffix')?: '' + def hasDescription = descriptionPrefix || descriptionSuffix + def cssClasses = ['select', 'radio'] + if(!hasDescription) cssClasses << 'no-description' + out << "
            " + out << "
              " values.eachWithIndex { value, i -> - def label = labels? labels[i]: g.message(code:att.labelPrefix + value) + def labelCode = labels? labels[i]: g.message(code:labelPrefix + value + labelSuffix) + def label = g.message(code:labelCode) def id = att.name + '-' + i def itemAttributes = att + [value:value, checked:isChecked(value), id:id] out << '
              • ' } diff --git a/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp index f03946781..dc474f7ea 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/announcement/show.gsp @@ -1 +1 @@ - + diff --git a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp index a9d7a5b9a..8e10f6a4d 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/create_new_activity.gsp @@ -19,19 +19,12 @@ -
              -
                - -
              • - -
                • -                 -
              -
              + + diff --git a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp index f03946781..dc474f7ea 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/webconnection/show.gsp @@ -1 +1 @@ - + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp new file mode 100644 index 000000000..1ee672b4d --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -0,0 +1,14 @@ + +
              +

              '${c.name}'

              +

              ()

              + + +

              ${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

              +               +

              +
              +               + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index 1dd310c54..53dde8880 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -1,4 +1,3 @@ -<%@ page import="frontlinesms2.ConnectionStatus" %>

              @@ -19,40 +18,9 @@
              • - -
                -

                '${c.name}'

                -

                ()

                - - -

                ${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

                -                 -

                -
                -                 - + -
                - - - - - - - - - - - - - - - - - -
                +
                • diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp new file mode 100644 index 000000000..34084119d --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp @@ -0,0 +1,32 @@ +
                + + + + + + + + +$(function() { + fconnection_show.update("${c.status}", ${c.id}); +}); + + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp index dff76f6ca..989436954 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_type.gsp @@ -1,20 +1,11 @@ <%@ page import="frontlinesms2.*" %> -
                - -
                  - -
                • - -
                  • -                   -
                -
                +                 diff --git a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp index 301ac3a63..3691ceffc 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp @@ -6,18 +6,16 @@ $(function() { - var count = 0; var connectionTimer = setInterval(refreshConnectionStatus, 2000); function refreshConnectionStatus() { $.get("${createLink(controller:'connection', action:'list', id:params?.id, params:[format:'json'])}", function(connection) { - if (count < 2 && connection.status == i18n("connectionstatus.connecting")) { - count++; - } else { + var status; + status = connection.status.substring(17).toUpperCase(); + if(status !== "CONNECTING") { clearInterval(connectionTimer); $("div.flash").hide(); - $("#connection-" + connection.id).find(".connection-status").text(i18n(connection.status)); - if(!$(".controls").find("a").is(":visible")) window.location = window.location; - } + fconnection_show.update(status, connection.id); + } }); } }); diff --git a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp index 0fc48583d..e6f6533b7 100644 --- a/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/poll/_validate.gsp @@ -48,7 +48,7 @@ var aliases = ""; var rawKey = $(field).attr('id').trim(); var rawVal = $(field).val().trim(); - var value = rawVal.split(' ')[0] + var value = rawVal.split(/[\s,]+/)[0] var key = rawKey.substring(rawKey.length-1); var aliasTextFieldLabel = $("ul#poll-aliases li label[for='keywords" + value + "']"); var aliasTextField = $("ul#poll-aliases li input#keywords" + key); diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index ea1c56a45..62fbec9c8 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -53,24 +53,21 @@

                - + + - -
              • -
              • + -
                • -                 - -
              • - -
                • -                 +                 + + - + - + - + diff --git a/plugins/frontlinesms-core/grails-app/views/status/show.gsp b/plugins/frontlinesms-core/grails-app/views/status/show.gsp index 852c67309..5fae79c49 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/show.gsp @@ -5,7 +5,9 @@ <g:message code="status.header"/> - +
                + +
                diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp index e5ba73679..3d8dff91e 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_type.gsp @@ -1,18 +1,11 @@ <%@ page import="frontlinesms2.Webconnection" %> -
                - -
                  - -
                • - -
                  • -                   -
                -
                +                 + diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp index 718924f7a..85d13328d 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/_validate.gsp @@ -53,7 +53,6 @@ var initialScripts = ; webconnectionDialog.setScripts(initialScripts); toggleApiTab(); - aliasCustomValidation(); @@ -86,14 +85,13 @@ } function toggleApiTab() { - $("#webconnectionType").live('change', function() { - if($(this).val() === 'generic') { - mediumPopup.enableTab('webconnection-api'); - } - else { - mediumPopup.disableTab('webconnection-api'); - } - }); + $("input[name=webconnectionType]").live('change', function() { + if($(this).val() === 'generic') { + mediumPopup.enableTab('webconnection-api'); + } else { + mediumPopup.disableTab('webconnection-api'); + } + }); } function setType(type) { @@ -113,4 +111,85 @@ function setPara(selecter, text) { $(selecter).html("

                " + text + "

                "); } + + function showTestRouteBtn() { + var buttonSet, testRouteBtn; + buttonSet = $('.ui-dialog-buttonset'); + testRouteBtn = buttonSet.find("#testRoute"); + if(testRouteBtn.length === 0) { + testRouteBtn = $('', { + id: "testRoute", + type:"submit", + value: i18n('webconnection.testroute.label'), + click: testRouteStatus + }); + } else { + testRouteBtn.show(); + } + buttonSet.append(testRouteBtn); + } + + function testRouteStatus() { + if(mediumPopup.tabValidates(mediumPopup.getCurrentTab())) { + $.ajax({ + type: 'post', + data: $("#new-webconnection-form").serialize(), + url: "${g.createLink(controller:'webconnection', action:'testRoute', params:['ownerId': activityInstanceToEdit?.id, 'format':'json'])}", + success: function(data, textStatus) { checkRouteStatus(data)} + }); + } else { + $('.error-panel').show(); + } + return false; + } + + var pollInterval + + function toggleWizardButtons() { + if($("#submit").is(":disabled")) { + $("#testRoute").attr('disabled', false); + $("#submit").attr('disabled', false); + $("#cancel").attr('disabled', false); + $("#prevPage").attr('disabled', false); + } else { + $("#testRoute").attr('disabled', "disabled"); + $("#submit").attr('disabled', "disabled"); + $("#cancel").attr('disabled', "disabled"); + $("#prevPage").attr('disabled', "disabled"); + } + } + + function checkRouteStatus(response) { + if(response.ok) { + $("#testRoute").attr("value", i18n('webconnection.testing.label')); + $.ajaxSetup({ + type: 'post', + data: {ownerId:response.ownerId}, + url: "${g.createLink(controller:'webconnection', action:'checkRouteStatus')}" + }); + toggleWizardButtons(); + pollInterval = setInterval( function() { + $.ajax({ + success: function(response) { + if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}" || response.status === "${Webconnection.OWNERDETAIL_FAILED}") { + $(".error-panel").text(i18n('webconnection.popup.'+ response.status + '.label')); + $(".error-panel").show(); + toggleWizardButtons(); + if(response.status === "${Webconnection.OWNERDETAIL_SUCCESS}") { + loadSummaryTab(response, i18n('webconnection.label')); + } else { + $("#testRoute").attr("value", i18n('webconnection.testroute.label')); + } + clearInterval(pollInterval); + } + } + }); + }, 3000); + + } else { + displayErrors(response) + } + } + + diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp index 53644364a..658865657 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp @@ -24,6 +24,11 @@ } }); } + + if(mediumPopup.getCurrentTabIndex() === mediumPopup.getTabLength()) { + showTestRouteBtn(); + } + $("#confirm-url").html('

                ' + url + '

                '); $("#confirm-httpMethod").html('

                ' + httpMethod + '

                '); $("#confirm-keyword").html('

                ' + keyword + '

                '); diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp index a094dac36..fc40c44bb 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_confirm.gsp @@ -6,5 +6,4 @@

                -
                - +
                \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp index 0156f0ac6..d90c209be 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/ushahidi/_scripts.gsp @@ -32,6 +32,10 @@ } })(); + if(mediumPopup.getCurrentTabIndex() === mediumPopup.getTabLength()) { + showTestRouteBtn(); + } + $("#confirm-service").html('

                ' + $("input[name=serviceType]:checked").val() + '

                '); $("#confirm-url").html('

                ' + $("input[name=url]").val() + '

                '); $("#confirm-fsmskey").html('

                ' + fsmsApiKey + '

                '); diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy index 4f1a766ec..2fa5e3913 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy @@ -4,7 +4,8 @@ class ControllerUtils { def withDomainObject(domainClass, Closure objectIdFetcher={ params.id }, Closure onFail=null) { return { c -> if(domainClass instanceof Closure) domainClass = domainClass.call() - def objectId = objectIdFetcher.call() + def objectId = objectIdFetcher.call() + println "domainClass::: $domainClass" def o = objectId? domainClass.get(objectId): domainClass.newInstance() if(o) c.call(o) else { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy index 3c0a8ee30..da1100e8b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/PageArchiveSent.groovy @@ -12,7 +12,7 @@ class PageArchiveSent extends PageArchive { def restOfPath = "" if (args[0] instanceof Fmessage) restOfPath += "/inbox/show/"+(args[0] as Fmessage).id - else if (args[0] instanceof Number) + else if (args[0] instanceof Number) restOfPath += "/inbox/show/"+args[0] else restOfPath += "/activity/"+Activity.findByName(args[0])?.id+"?messageSection=activity&viewingMessages=true" @@ -22,4 +22,4 @@ class PageArchiveSent extends PageArchive { static at = { title.endsWith('sent') } -} \ No newline at end of file +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy index 4a8369f50..439f991fc 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy @@ -7,14 +7,14 @@ class ConnectionDialog extends MediumPopup { popupTitle.contains('connection') } static content = { - connectionType { $("#connectionType") } + connectionType { $("input[name=connectionType]") } connectionForm { $('#connectionForm') } confirmName { $("#confirm-name") } confirmType { $("#confirm-type") } confirmPort { $("#confirm-port") } basicInfo { connectionType -> - $("p.info.$connectionType").text() + $("input", name:'connectionType', value:connectionType).parent().find('p.info').text() } confirmIntelliSmsConnectionName { $("#intellisms-confirm #confirm-name") } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy index fab20011d..356dbc240 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy @@ -20,32 +20,28 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'There is a Not Connected label shown for inactive connection'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.status == "Not connected" } def 'there is a DELETE button shown for inactive connection'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.btnDelete.displayed } def 'should show "create route" button for inactive connection'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.btnCreateRoute.displayed } def 'DELETE button should remove selected fconnection from the list'() { given: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() when: connectionList.btnDelete.click() then: @@ -58,8 +54,8 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def testConnection = createTestSmsConnection() SmslibFconnection.build(name:"test modem", port:"COM2", baud:11200) when: - to PageConnection - waitFor{ connectionList.btnCreateRoute.displayed } + to PageConnection, testConnection + waitFor { connectionList.btnCreateRoute.displayed } then: !connectionList.btnTestRoute.displayed when: @@ -71,9 +67,9 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'delete button is not displayed for a connected Fconnection'() { given: - createTestEmailConnection() + def c = createTestEmailConnection() when: - to PageConnection + to PageConnection, c connectionList.btnCreateRoute.click() then: waitFor('very slow') { connectionList.status == "Connected" } @@ -82,8 +78,7 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'The first connection in the connection list page is selected'() { when: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() then: connectionList.selectedConnection.size() == 1 } @@ -195,8 +190,7 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'clicking Send test message displays a popup with a default message and empty address field'() { given: - createTestEmailConnection() - to PageConnection + to PageConnection, createTestEmailConnection() when: connectionList.btnCreateRoute.click() then: diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index db63258d0..c8c5cfbb3 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -6,7 +6,11 @@ import frontlinesms2.popup.MediumPopup import geb.Module class PageConnection extends PageBase { - static url = 'connection/list' + String convertToPath(Object[] args) { + if(!args) 'connection/list' + else if(args[0] instanceof Number) 'connection/show/' + args[0] + else 'connection/show/' + args[0].id + } static content = { connectionList { module ConnectionList } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy index a760d39de..c07a1c0bd 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy @@ -291,8 +291,9 @@ class WebconnectionWizard extends MediumPopup { configureUshahidi(required:false) { module ConfigureUshahidiWebconnectionTab } option(wait:true, cache:false) { shortName -> $('input', name:'webconnectionType', value:shortName) } - getTitle { shortName -> option(shortName).previous('label').text() } - getDescription { shortName -> option(shortName).previous('p').text() } + getTitle { shortName -> option(shortName).previous('h3').text() } + getDescription { shortName -> option(shortName).previous('p.info').text() } + testConnectionButton(required:false) { $("#testRoute")} } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/BasicAuthenticationSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/BasicAuthenticationSpec.groovy index 973dd4bff..fc67d037c 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/BasicAuthenticationSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/BasicAuthenticationSpec.groovy @@ -13,33 +13,26 @@ class BasicAuthenticationSpec extends grails.plugin.geb.GebSpec { setupAuthentication() then: at PageGeneralSettings - basicAuthentication.enabledAuthentication - basicAuthentication.username == "test" - basicAuthentication.password == "pass" + basicAuthentication.enabled + basicAuthentication.username == 'test' + basicAuthentication.password == '' // password should not be passed in HTML, even if set cleanup: - go url - basicAuthentication.enabledAuthentication.click() + basicAuthentication.enabled = false basicAuthentication.save.click() - } def 'can disable basic application authentication from the settings screen'() { - when: + given: setupAuthentication() - then: - at PageGeneralSettings - basicAuthentication.enabledAuthentication - basicAuthentication.username == "test" - basicAuthentication.password == "pass" when: go url - basicAuthentication.enabledAuthentication.click() + basicAuthentication.enabled = false basicAuthentication.save.click() then: at PageGeneralSettings - !basicAuthentication.enabledAuthentication.value() - basicAuthentication.username.disabled - basicAuthentication.password.disabled + waitFor { !basicAuthentication.enabled } + basicAuthentication.username().disabled + basicAuthentication.password().disabled } @@ -47,29 +40,30 @@ class BasicAuthenticationSpec extends grails.plugin.geb.GebSpec { when: go url at PageGeneralSettings - basicAuthentication.enabledAuthentication.click() + basicAuthentication.enabled = true basicAuthentication.username = "john" basicAuthentication.password = "doe" - basicAuthentication.save.jquery.trigger("click") + basicAuthentication.save.click() then: - errors.displayed + waitFor { errors.displayed } when: basicAuthentication.username = "john" basicAuthentication.password = "doe" basicAuthentication.confirmPassword = "daa" - basicAuthentication.save.jquery.trigger("click") + basicAuthentication.save.click() then: - errors.displayed + waitFor { errors.displayed } } def setupAuthentication() { go url at PageGeneralSettings - if(!basicAuthentication.enabledAuthentication.value()) basicAuthentication.enabledAuthentication.click() + basicAuthentication.enabled = true basicAuthentication.username = "test" basicAuthentication.password = "pass" basicAuthentication.confirmPassword = "pass" basicAuthentication.save.click() + at PageGeneralSettings } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy index b617b7d27..00fb66194 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy @@ -12,10 +12,10 @@ class PageGeneralSettings extends PageSettings { languageList.jquery.val(newVal) languageList.jquery.trigger('change') } - errors(required:false) { $('label.error')} - basicAuthentication {module BasicAuthentication} - databaseBackup {module DatabaseBackup} - routing { module RoutingConnections} + errors(required:false) { $('label.error') } + basicAuthentication { module BasicAuthentication } + databaseBackup { module DatabaseBackup } + routing { module RoutingConnections } } static at = { title.contains('Settings') || title.contains('Mazingira') @@ -32,15 +32,10 @@ class DatabaseBackup extends geb.Module { } class BasicAuthentication extends geb.Module { - static base = { $('#basic-authentication') } + static base = { $('#basic-authentication form#basic-auth') } static content = { - authenticationForm { $('form#basic-auth')} - enabledAuthentication { $("input#enabledAuthentication")} - username { $("input#username")} - password { $("input#password")} - confirmPassword { $("input#confirmPassword")} - save { $("input#save")} + save { $('input#submit') } } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy index 395c7d525..ec9755ede 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/GenericWebconnectionCedSpec.groovy @@ -146,6 +146,18 @@ class GenericWebconnectionCedSpec extends WebconnectionBaseSpec { // N.B. there is no text displayed for this error } + def "Test Webconnection button is displayed on the confirm tab"() { + given: + startAtTab('keyword') + when: + keywordTab.keyword = "" + keywordTab.useKeyword('disabled').click() // to disable + next.click() + then: + waitFor { confirmTab.displayed } + testConnectionButton.displayed + } + def 'secret is enabled when API is exposed'() { when: startAtTab('api') @@ -171,8 +183,7 @@ class GenericWebconnectionCedSpec extends WebconnectionBaseSpec { confirmTab.name = 'random webconnection' submit.click() then: - waitFor { summary.displayed } - def c = Webconnection.findByName('random webconnection') + def c = waitFor { Webconnection.findByName('random webconnection') } c.apiEnabled c.secret == 'spray-on-shoes' } @@ -187,7 +198,6 @@ class GenericWebconnectionCedSpec extends WebconnectionBaseSpec { nextTab(apiTab) if(tabName == 'api') return; - nextTab(keywordTab) if(tabName == 'keyword') return; diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy index 57396b042..d25abf46e 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy @@ -142,6 +142,17 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { header['url'] == 'https://frontlinecrowd.crowdmap.com/frontlinesms/' } + def '"Test Connection" button is displayed on confirm screen'() { + given: + launchWizard('ushahidi') + and: + fillValidConfig() + when: 'skip past sorting page' + next.click() + then: + testConnectionButton.displayed + } + private def fillValidConfig() { configureUshahidi.subType('crowdmap').click() configureUshahidi.crowdmapDeployAddress = 'default' diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy index 7a033b683..b5e7b961b 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy @@ -11,6 +11,8 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller def trashService def i18nUtilService + def withUshahidiWebconnection = { c -> c.call(UshahidiWebconnection.get(controller.params.ownerId) ?: UshahidiWebconnection.newInstance()) } + def withGenericWebconnection = { c -> c.call(GenericWebconnection.get(controller.params.ownerId) ?: GenericWebconnection.newInstance()) } //TODO Asserts need refractoring def setup() { @@ -25,6 +27,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.keywords = "keyword" controller.params.webconnectionType = "ushahidi" controller.params.key = '12345678' + controller.withWebconnection = withUshahidiWebconnection when: controller.save() then: @@ -45,6 +48,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "generic" controller.params.'param-name' = 'username' controller.params.'param-value' = 'bob' + controller.withWebconnection = withGenericWebconnection when: controller.save() then: @@ -67,6 +71,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "generic" controller.params.'param-name' = ['username', 'password'] as String[] controller.params.'param-value' = ['bob','secret'] as String[] + controller.withWebconnection = withGenericWebconnection when: controller.save() webconnection.refresh() @@ -94,6 +99,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "generic" controller.params.'param-name' = "username" controller.params.'param-value' = "geoffrey" + controller.withWebconnection = withGenericWebconnection when: controller.save() then: @@ -106,21 +112,22 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { def "should not save requestParameters without a name value"() { setup: def keyword = new Keyword(value:'AWESOME') - def webconnection = new GenericWebconnection(name:"Ushahidi", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword) + def webconnection = new GenericWebconnection(name:"Generic", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword) webconnection.addToRequestParameters(new RequestParameter(name:"name", value:'${name}')) webconnection.addToRequestParameters(new RequestParameter(name:"age", value:'${age}')) webconnection.save(failOnError:true) controller.params.ownerId = webconnection.id - controller.params.name = "Ushahidi Connection" + controller.params.name = "Generic Connection" controller.params.keywords = "Test" controller.params.httpMethod = "post" controller.params.'param-name' = "" controller.params.webconnectionType = "generic" controller.params.'param-value' = "geoffrey" + controller.withWebconnection = withGenericWebconnection when: controller.save() then: - webconnection.name == "Ushahidi Connection" + webconnection.name == "Generic Connection" !webconnection.requestParameters } @@ -136,6 +143,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "ushahidi" controller.params.httpMethod = "get" controller.params.key = "get" + controller.withWebconnection = withUshahidiWebconnection when: controller.save() then: @@ -159,6 +167,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "ushahidi" controller.params.httpMethod = "get" controller.params.key = "get" + controller.withWebconnection = withUshahidiWebconnection when: controller.save() then: @@ -179,6 +188,7 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.webconnectionType = "ushahidi" controller.params.httpMethod = "get" controller.params.key = "get" + controller.withWebconnection = withUshahidiWebconnection when: controller.params.sorting = sorting controller.save() @@ -191,4 +201,25 @@ class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { "enabled"|"TEST,TESTING" "disabled"|null } + + + def 'can edit an existing ushahidi web connection'(){ + given: + def keyword = new Keyword(value:'USHAHIDI') + def webConnectionInstance = new UshahidiWebconnection(name:"Trial", url:"https://trial.crowdmap.com", httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword).save(failOnError:true) + controller.params.ownerId = webConnectionInstance.id + controller.params.webconnectionType = 'ushahidi' + controller.params.name = 'Trial' + controller.params.url = 'https://frontlineCrowd.crowdmap.com' + controller.params.key = '2343asdasd' + controller.params.keyword = 'Repo' + controller.withWebconnection = withUshahidiWebconnection + when: + controller.save() + then: + def connection = UshahidiWebconnection.findByName('Trial') + connection.name == "Trial" + connection.url == "https://frontlineCrowd.crowdmap.com" + connection.requestParameters*.value.containsAll(["2343asdasd"]) + } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index f24511a5b..5c67a836a 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -390,7 +390,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { then: message.receivedOn == null } -@spock.lang.IgnoreRest + def 'doing a Fmessage.findBySrc should give me youngest message'() { when: Fmessage.build(src:'111', text:'oldest') diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy index 7f32fd467..fbc691cf6 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy @@ -33,26 +33,4 @@ class UshahidiWebconnectionISpec extends grails.plugin.spock.IntegrationSpec { then: 1 * webCService.send(incomingMessage) } - - def 'can edit an existing ushahidi web connection'(){ - given: 'an UshahidiWebconnection exists' - def keyword = new Keyword(value:'USHAHIDI') - def webConnectionInstance = new UshahidiWebconnection(name:"Trial", url:"https://trial.crowdmap.com", httpMethod:Webconnection.HttpMethod.POST).addToKeywords(keyword).save(failOnError:true) - and: - def controller = new WebconnectionController() - when: 'new parameters are passed' - controller.params.ownerId = webConnectionInstance.id - controller.params.webconnectionType = 'ushahidi' - controller.params.name = 'Trial' - controller.params.url = 'https://frontlineCrowd.crowdmap.com' - controller.params.key = '2343asdasd' - controller.params.keyword = 'Repo' - and: 'save action is called' - controller.save() - then: 'existing UshahidiWebconnection properties should have changed' - def connection = UshahidiWebconnection.findByName('Trial') - connection.name == "Trial" - connection.url == "https://frontlineCrowd.crowdmap.com" - connection.requestParameters*.value.containsAll(["2343asdasd"]) - } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy index 7801b8096..1dfbe3acc 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/WebconnectionISpec.groovy @@ -2,6 +2,7 @@ package frontlinesms2.domain import frontlinesms2.* import spock.lang.* +import org.apache.camel.* class WebconnectionISpec extends grails.plugin.spock.IntegrationSpec { def webCService = Mock(WebconnectionService) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy index da0f1cff0..686e23981 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy @@ -8,38 +8,45 @@ class ExpressionProcessorServiceISpec extends grails.plugin.spock.IntegrationSpe def expressionProcessorService @Unroll - def 'process should return message content with no expressions in it'() { + def 'process should return message content with no expressions in it, unless some expressions are not recognised'() { setup: - def contact =new Contact(name:'Gedi', mobile:"10983").save(failOnError:true, flush:true) - def m = new Fmessage(src: '10983', inbound: false, archived: false, hasSent: false, date: new Date()) + def contact = new Contact(name:'Gedi', mobile:'10983').save(failOnError:true, flush:true) + def m = new Fmessage(src:'10983', inbound:false) m.text = messageText - Dispatch dis = new Dispatch(dst: '10983', message: m, status: DispatchStatus.FAILED, dateSent: new Date()) - def processedMessageText = expressionProcessorService.process(dis) + def d = new Dispatch(dst:'10983', status:DispatchStatus.FAILED) + m.addToDispatches(d) + m.save(failOnError:true, flush:true) + d.refresh() + def processedMessageText = expressionProcessorService.process(d) expect: processedMessageText == expectedMessageText where: - messageText | expectedMessageText - 'message text sample' | 'message text sample' - 'please call us on ${recipient_number}' | 'please call us on 10983' - 'sender name ${recipient_name}, number ${recipient_number}' | 'sender name Gedi, number 10983' + messageText | expectedMessageText + 'message text sample' | 'message text sample' + 'please call us on ${recipient_number}' | 'please call us on 10983' + 'sender name ${recipient_name}, number ${recipient_number}' | 'sender name Gedi, number 10983' + 'the expression ${message_text_with_keyword} cannot work here' | 'the expression ${message_text_with_keyword} cannot work here' + 'the expression ${that_i_just_made_up} is not recognised' | 'the expression ${that_i_just_made_up} is not recognised' + '${recipient_number} - ${message_text_with_keyword} - ${that_i_just_made_up} - ${recipient_number} - ${recipient_name} .' | '10983 - ${message_text_with_keyword} - ${that_i_just_made_up} - 10983 - Gedi .' } @Unroll def 'process should work for autoforward expressions which require further context from the message and its owner'() { setup: - def source =new Contact(name:'Source', mobile:"112233").save(failOnError:true, flush:true) - def destination =new Contact(name:'Destination', mobile:"445566").save(failOnError:true, flush:true) + def source = new Contact(name:'Source', mobile:'112233').save(failOnError:true, flush:true) + def destination = new Contact(name:'Destination', mobile:'445566').save(failOnError:true, flush:true) def autoforward = new Autoforward(name:'I forward stuff', sentMessageText:'This is not too relevant as we are manually setting message text') .addToKeywords(value:'INCOMING') .addToContacts(destination) .save(failOnError:true, flush:true) - def inbound = new Fmessage(src: '112233', inbound: true, archived: false, hasSent: false, date: new Date(), text:'Incoming Message Text').save(failOnError:true) + def inbound = new Fmessage(src:'112233', inbound:true, text:'Incoming Message Text').save(failOnError:true, flush:true) autoforward.addToMessages(inbound) - def outbound = new Fmessage(src: '0', inbound: false, archived: false, hasSent: false, date: new Date(), ownerDetail: inbound.id, text: outboundMessageText) - Dispatch dis = new Dispatch(dst: '445566', status: DispatchStatus.PENDING) + def outbound = new Fmessage(src:'0', inbound:false, ownerDetail:inbound.id, text:outboundMessageText) + Dispatch dis = new Dispatch(dst:'445566', status:DispatchStatus.PENDING) outbound.addToDispatches(dis) outbound.text = outboundMessageText - autoforward.addToMessages(outbound).save(failOnError:true) + autoforward.addToMessages(outbound).save(failOnError:true, flush:true) + inbound.refresh() def processedMessageText = expressionProcessorService.process(dis) expect: processedMessageText == expectedDispatchText @@ -53,3 +60,4 @@ class ExpressionProcessorServiceISpec extends grails.plugin.spock.IntegrationSpe 'the original message says: ${message_text_with_keyword}' | 'the original message says: Incoming Message Text' } } + diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy index 21eceea99..f32e85503 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy @@ -2,7 +2,7 @@ package frontlinesms2.service import frontlinesms2.* import spock.lang.* -import org.apache.camel.Exchange +import org.apache.camel.* import org.apache.camel.Message import org.apache.camel.spi.UnitOfWork import org.apache.camel.spi.RouteContext @@ -97,6 +97,38 @@ class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ Fmessage.findByText("simple").ownerDetail == "failed" } + def 'webconnectionservice.getWebconnectionStatus should return NOT_CONNECTED when the webconnection is not active'() { + given: + def webconnection = Webconnection.findByName("Sync") + expect: + webconnectionService.getStatusOf(webconnection) == ConnectionStatus.NOT_CONNECTED + } + + def 'webconnectionservice.getWebconnectionStatus should return CONNECTED when the webconnection is active'() { + setup: + def camelContext = Mock(CamelContext) + def webconnection = Webconnection.findByName("Sync") + webconnection.camelContext = camelContext + webconnectionService.metaClass.getStatusOf = {Webconnection w -> ConnectionStatus.CONNECTED} + webconnection.save(failOnError:true) + when: + webconnection.activate() + then: + webconnectionService.getStatusOf(webconnection) == ConnectionStatus.CONNECTED + } + + def 'testRoute should set message ownerDetail to failed when it fails'() { + setup: + def camelContext = Mock(CamelContext) + def webconnection = Webconnection.findByName("Sync") + webconnection.camelContext = camelContext + webconnection.save(failOnError:true) + when: + webconnectionService.testRoute(webconnection) + then: + Fmessage.findByMessageOwnerAndText(webconnection, Fmessage.TEST_MESSAGE_TEXT).ownerDetail + } + Exchange mockExchange(messageText,method,messageOnly){ def webconnection = Webconnection.findByName("Sync") if(method == 'get'){ diff --git a/plugins/frontlinesms-core/test/js/check_list_tests.js b/plugins/frontlinesms-core/test/js/check_list_tests.js index 8558e5d7b..c9aafd11b 100644 --- a/plugins/frontlinesms-core/test/js/check_list_tests.js +++ b/plugins/frontlinesms-core/test/js/check_list_tests.js @@ -1,3 +1,5 @@ +QUnit.module("check_list"); + function setup() { dom_trix.initDomFromFile("test/js/check_list/standard.html"); diff --git a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js index 46ddb6722..eb99ef5dc 100644 --- a/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js +++ b/plugins/frontlinesms-core/test/js/recipient_selecter_tests.js @@ -1,3 +1,5 @@ +QUnit.module("recipient_selecter"); + function setup() { dom_trix.initDomFromFile("test/js/recipient_selecter/standard.html"); diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy new file mode 100644 index 000000000..32013bfea --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy @@ -0,0 +1,53 @@ +package frontlinesms2 + +import spock.lang.* + +import org.apache.camel.* + +@TestFor(WebconnectionService) +@Mock([GenericWebconnection, Fmessage]) +class WebconnectionServiceSpec extends Specification { + def requestedId + def mockConnection + + def setup() { + mockConnection = Mock(Webconnection) + Webconnection.metaClass.static.get = { Serializable id -> + requestedId = id + return mockConnection + } + Fmessage.metaClass.static.get = { Serializable id -> + return Mock(Fmessage) + } + } + + def 'preprocess call is handed back to the relevant domain object'() { + given: + def x = mockExchange(null, ['webconnection-id':'123']) + when: + service.preProcess(x) + then: + requestedId == '123' + 1 * mockConnection.preProcess(x) + } + + + def 'postprocess call is handed back to the relevant domain object'() { + given: + def x = mockExchange(null, ['webconnection-id':'123','fmessage-id':'1']) + when: + service.postProcess(x) + then: + requestedId == '123' + 1 * mockConnection.postProcess(x) + } + + Exchange mockExchange(body, Map headers) { + Exchange x = Mock() + def inMessage = Mock(Message) + if(body) inMessage.body >> body + inMessage.headers >> headers + x.in >> inMessage + return x + } +} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy index beb99edff..cb9a2c5ac 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy @@ -51,7 +51,7 @@ class SettingsControllerSpec extends Specification { def "can enable application authentication from settings if details validate"() { given: - params.enabledAuthentication = 'true' + params.enabled = 'true' params.username = "test" params.password = "pass" params.confirmPassword = "pass" @@ -66,10 +66,10 @@ class SettingsControllerSpec extends Specification { def "should not enable application authentication from settings if details don't validate"() { given: - mockAppSettings(enabledAuthentication: false, + mockAppSettings('auth.basic.enabled': false, username:'', password:'') when: - params.enabledAuthentication = "true" + params.enabled = "true" params.username = "test" params.password = "pass" params.confirmPassword = "me" @@ -85,9 +85,8 @@ class SettingsControllerSpec extends Specification { when: controller.changeRoutingPreferences() then: - 1 * appSettingsService.set('routing.uselastreceiver',params.uselastreceiver) 1 * appSettingsService.set('routing.otherwise', params.otherwise) - 1 * appSettingsService.set('routing.rules','uselastreceiver') + 1 * appSettingsService.set('routing.use','uselastreceiver') 0 * appSettingsService.set(_, _) } @@ -101,8 +100,7 @@ class SettingsControllerSpec extends Specification { when: controller.changeRoutingPreferences() then: - 1 * appSettingsService.set('routing.uselastreceiver',params.uselastreceiver) - 1 * appSettingsService.set('routing.rules','uselastreceiver,fconnection-1,fconnection-3,fconnection-5') + 1 * appSettingsService.set('routing.use','uselastreceiver,fconnection-1,fconnection-3,fconnection-5') 1 * appSettingsService.set('routing.otherwise', params.otherwise) } @@ -111,7 +109,7 @@ class SettingsControllerSpec extends Specification { def conn1 = new SmslibFconnection(name:"Huawei Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) def conn2 = new SmslibFconnection(name:"COM4", port:'COM4', baud:9600).save(failOnError:true) def conn3 = new SmslibFconnection(name:"COM5", port:'COM5', baud:9600).save(failOnError:true) - controller.appSettingsService = ['routing.rules':"uselastreceiver,fconnection-${conn2.id},fconnection-${conn1.id}"] + controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-${conn1.id}"] when: def model = controller.general() then: @@ -123,7 +121,7 @@ class SettingsControllerSpec extends Specification { given: def conn1 = new SmslibFconnection(name:"Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) def conn2 = new SmslibFconnection(name:"COM5", port:'COM4', baud:9600).save(failOnError:true) - controller.appSettingsService = ['routing.rules':"uselastreceiver,fconnection-${conn2.id},fconnection-3,fconnection-${conn1.id}"] + controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-3,fconnection-${conn1.id}"] when: def model = controller.general() then: diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index f7812f3e1..b76411e1c 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -66,9 +66,9 @@ class DispatchRouterServiceSpec extends Specification { id << [1, 10, 100] } - def 'slip should assign message to the last received route if route preference set to last received route'(){ + def 'slip should assign message to the last received route if route preference set to last received route'() { given: - mockAppSettingsService('true','any') + mockAppSettingsService(true, 'any') mockRoutes(1, 2, 3) when: def routedTo = service.slip(mockExchange(), null, null) @@ -89,13 +89,13 @@ class DispatchRouterServiceSpec extends Specification { routedTo == route where: settings | route - ['true','any', 'fconnection-4, fconnection-1, fconnection-2'] | "seda:out-1" - ['true','any', 'uselastreceiver, fconnection-3, fconnection-1'] | "seda:out-2" + [true, 'any', 'fconnection-4, fconnection-1, fconnection-2'] | "seda:out-1" + [true, 'any', 'uselastreceiver, fconnection-3, fconnection-1'] | "seda:out-2" } def 'slip should not assign messages to any route if routing preference is not to send messages even if routes are available'(){ given: - mockAppSettingsService('false','dontsend') + mockAppSettingsService(false, 'dontsend') mockRoutes(1, 2, 3) when: def routedTo = service.slip(mockExchange(), null, null) @@ -106,7 +106,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should not assign messages to any route if routing preference is not to send messages when routes are not avalilable'(){ given: - mockAppSettingsService('false','dontsend') + mockAppSettingsService(false, 'dontsend') when: def routedTo = service.slip(mockExchange(), null, null) then: @@ -116,8 +116,8 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should fall back to the -otherwise- if received connection is set as prefered route and it is not avalilable'(){ given://'route 2 is the receivedOn route and it is not available' - mockAppSettingsService(true,'any') - mockRoutes(1,3) + mockAppSettingsService(true, 'any') + mockRoutes(1, 3) when: def routedTo = service.slip(mockExchange(), null, null) then: 'message routed to available message' @@ -126,7 +126,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should assign messages to round robin if routing preference is set to use avalilable routes'() { given: - mockAppSettingsService('false','any') + mockAppSettingsService(false, 'any') mockRoutes(1, 2, 3) when: def routedTo = (1..5).collect { service.slip(mockExchange(), null, null) } @@ -136,7 +136,7 @@ class DispatchRouterServiceSpec extends Specification { def 'slip should prioritise internet services over modems if routing preference is set to use avalilable routes'() { given: - mockAppSettingsService('false','any') + mockAppSettingsService(false, 'any') mockRoutes(1:'internet', 2:'modem', 3:'internet', 4:'modem') when: def routedTo = (1..5).collect { service.slip(mockExchange(), null, null) } @@ -160,7 +160,7 @@ class DispatchRouterServiceSpec extends Specification { m.headers >> headers return m } - private def mockRoutes(int...ids) { + private def mockRoutes(int... ids) { CamelContext c = Mock() c.routes >> ids.collect { [[id:"in-$it"], [id:"out-$it"]] }.flatten() service.camelContext = c @@ -172,11 +172,12 @@ class DispatchRouterServiceSpec extends Specification { service.camelContext = c } - private mockAppSettingsService($userLastReceived, $otherwise, $rules = null){ + private mockAppSettingsService(useLastReceiver, otherwise, use = null) { AppSettingsService appSettingsService = Mock() - appSettingsService.get("routing.uselastreceiver") >> $userLastReceived - appSettingsService.get("routing.rules") >> $rules - appSettingsService.get("routing.otherwise") >> $otherwise + if(useLastReceiver) use = use? "$use,uselastreceiver": 'uselastreceiver' + appSettingsService.get("routing.use") >> use + appSettingsService.get("routing.otherwise") >> otherwise service.appSettingsService = appSettingsService } } + diff --git a/plugins/frontlinesms-core/web-app/css/controls.css b/plugins/frontlinesms-core/web-app/css/controls.css index 01ff5f6e8..9836481af 100644 --- a/plugins/frontlinesms-core/web-app/css/controls.css +++ b/plugins/frontlinesms-core/web-app/css/controls.css @@ -22,6 +22,9 @@ th.sortable.asc a, th.sortable.desc a { padding-left:15px; } th.sortable.asc a { background-image:url("../images/icons/down_arrow.png"); } th.sortable.desc a { background-image:url("../images/icons/up_arrow.png"); } +ul.sortable li, ul.sortable label { cursor:move; } +ul.sortable input[type=checkbox] { cursor:default; } + a.prevLink, a.nextLink { display:inline-block; width:25px; height:25px; background-position:left center; background-repeat:no-repeat; } a.prevLink { background-image:url("../images/pagination/left.png"); } a.prevLink:hover { background-image:url("../images/pagination/left_hover.png"); } diff --git a/plugins/frontlinesms-core/web-app/css/status.css b/plugins/frontlinesms-core/web-app/css/status.css index f8dda70b9..3fb6a725b 100644 --- a/plugins/frontlinesms-core/web-app/css/status.css +++ b/plugins/frontlinesms-core/web-app/css/status.css @@ -1,10 +1,10 @@ #body.status #content { background-color:#eee; position:fixed; top:80px; bottom:0; left:0; right:0; } #body.status h3 { padding:17px 25px; text-transform:uppercase; font-weight:bold; border-bottom:1px solid #eee; } -#body.status #traffic-status{ position:fixed; top:83px; width:47%; background:white; margin:0 25px; - -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; overflow-x:hide; overflow-y:auto; } -#body.status #right-column{ position:fixed; right:0; top:83px; bottom:17px; width:47%; float:right; margin:0 25px; - overflow-x:hide; overflow-y:auto; } -#body.status #connection-status, #body.status #device-detection { background:white; margin: 0 25px 25px 25px; +#body.status #left-column { position:fixed; top:83px; bottom:0; width:47%; margin:0 25px; overflow-x:hidden; overflow-y:auto; } +#body.status #traffic-status{ background:white; -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; } +#body.status #right-column{ position:fixed; right:0; top:83px; bottom:0; width:47%; float:right; margin:0 25px; + overflow-x:hidden; overflow-y:auto; } +#body.status #connection-status, #body.status #device-detection { background:white; margin-left:25px; margin-bottom:25px; -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; } #body.status #device-detection { padding-bottom: 17px; } #body.status #device-detection h3 { float:left; display:inline-block; border:none; } diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index d55355bf4..9e443b969 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -29,6 +29,8 @@ div.input ul.select li input[type="checkbox"] { position:absolute; top:0; left:0 div.input ul.select li input[type="text"] { display:block; margin-left:25px; margin-top:10px; } div.input ul.select.radio label { margin:5px 0; position:relative; display:block; cursor:pointer; padding:10px; } +div.input ul.select.radio.no-description li { margin:0; } +div.input ul.select.radio.no-description label { text-indent:20px; margin:0; } div.input ul.select.radio label:hover, #modalBox.ui-dialog-content .select.radio label:hover > * { background-color:#e5eff3; } div.input ul.select.radio label input[type="radio"] { position:absolute; top:10px; left:10px; } div.input ul.select.radio label h3 { margin-left:25px; margin-bottom:10px; font-weight:bold; } diff --git a/plugins/frontlinesms-core/web-app/js/activity/popups.js b/plugins/frontlinesms-core/web-app/js/activity/popups.js index d88b48db1..8c1b5204c 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/popups.js +++ b/plugins/frontlinesms-core/web-app/js/activity/popups.js @@ -9,15 +9,28 @@ function chooseActivity() { dataType: "html", url: url_root + activityUrl, beforeSend: function(){ showThinking(); }, - success: function(data, textStatus) { hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.create'), 675, 500, false); } + success: function(data, textStatus) { hideThinking(); mediumPopup.launchMediumWizard(title, data, i18n('wizard.save'), 675, 500, false); } }); } function checkForSuccessfulSave(response, type) { - var errors, messageDialog; $("#submit").removeAttr('disabled'); if (response.ok) { - $("div.confirm").parent().hide(); + loadSummaryTab(response, type); + } else { + displayErrors(response); + } +} + +function summaryRedirect() { + var activityId = $(".summary #activityId").val(); + $(this).dialog('close'); + window.location.replace(url_root + "message/activity/" + activityId); +} + +function loadSummaryTab(response, type) { + var messageDialog; + $("div.confirm").parent().hide(); $(".ui-tabs-nav").hide(); $("div.summary").show(); $(".summary #activityId").val(response.ownerId); @@ -34,17 +47,12 @@ function checkForSuccessfulSave(response, type) { } ); messageDialog.css("height", "389px"); - - } else { - errors = $(".error-panel"); - errors.text(response.text); - errors.show(); - $("#submit").removeAttr('disabled'); - } } - -function summaryRedirect() { - var activityId = $(".summary #activityId").val(); - $(this).dialog('close'); - window.location.replace(url_root + "message/activity/" + activityId); + +function displayErrors(response) { + var errors; + errors = $(".error-panel"); + errors.text(response.text); + errors.show(); + $("#submit").removeAttr('disabled'); } diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index 6e444fbe9..a7386dfa8 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -1,3 +1,14 @@ +fconnection_show = (function() { + var showControls; + update = function(status, id) { + $("#body-content.connections .selected .connection-status").text(i18n("connectionstatus." + status.toLowerCase())); + sanchez.replaceContent("#body-content.connections .selected .controls", "fconnection-controls-" + status, {connectionId:id}); + }; + return { + update:update + }; +}()); + fconnection = (function() { var attachCheckBoxListener, handleSaveResponse, init, isValid, show, validator; diff --git a/plugins/frontlinesms-core/web-app/js/magicwand.js b/plugins/frontlinesms-core/web-app/js/magicwand.js index 1f78636e0..1b2a4677a 100644 --- a/plugins/frontlinesms-core/web-app/js/magicwand.js +++ b/plugins/frontlinesms-core/web-app/js/magicwand.js @@ -14,16 +14,21 @@ var magicwand = { * @arg list jquery selecter for the

              - +
              @@ -45,6 +45,6 @@
              - + -
              +
              \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp index 88ecee9bd..3e7bf06e9 100644 --- a/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp +++ b/plugins/frontlinesms-core/grails-app/views/webconnection/generic/_scripts.gsp @@ -56,7 +56,7 @@ $(list).trigger("keyup"); } - var addNewParam = function() { + var addNewParam = function(tableParent) { if($('.web-connection-parameter:hidden').length === 1) { $('.web-connection-parameter').show(); $('.web-connection-parameter').removeClass("disabled"); @@ -74,7 +74,7 @@ newRow.find('input.param-name').val(""); newRow.find('input.param-value').val(""); newRow.find('.remove-command').show(); - $('#web-connection-param-table tbody').append(newRow); + $(tableParent).find("tbody").append(newRow); magicwand.init(newRow.find('select[id^="magicwand-select"]')); magicwand.reset(template.find("select")); } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy index 359da5318..e7dbbd8b1 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/popup/PageMediumPopup.groovy @@ -315,7 +315,7 @@ class WebconnectionRequestFormatTab extends geb.Module { get { $("input[value='GET']") } url { $("input#url") } addParam { $('a.btn.addNew') } - parameters { moduleList WebconnectionParam, $('#web-connection-param-table tbody tr') } + parameters { moduleList WebconnectionParam, $('.web-connection-param-table tbody tr') } } } diff --git a/plugins/frontlinesms-core/web-app/css/activity/webconnection.css b/plugins/frontlinesms-core/web-app/css/activity/webconnection.css index 03faee92c..f469904d6 100644 --- a/plugins/frontlinesms-core/web-app/css/activity/webconnection.css +++ b/plugins/frontlinesms-core/web-app/css/activity/webconnection.css @@ -1,8 +1,8 @@ #tabs div.info { padding:4px 0 5px 25px; margin:15px 0; background-position:top left; background-repeat:no-repeat; background-image:url("../images/icons/help.png"); }#web-connection-param-table { margin-bottom:10px; margin-left:20px; } -#web-connection-param-table td { padding:2px; } -#web-connection-param-table td .ui-selectmenu-wrapper > a { margin:0 !important; } -#web-connection-param-table td .ui-selectmenu-wrapper > a > span { padding:2px; } +.web-connection-param-table td { padding:2px; } +.web-connection-param-table td .ui-selectmenu-wrapper > a { margin:0 !important; } +.web-connection-param-table td .ui-selectmenu-wrapper > a > span { padding:2px; } #new-webconnection-form a.btn.addNew { margin-left:20px; } #webconnection-config input#url { display:inline-block; } diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index b1160a746..0f8390d84 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -114,7 +114,9 @@ var customActivityDialog = (function(){ detail = element.find("select[name=group] option:selected").text(); } else if(stepType === "reply") { detail = element.find("textarea[name=autoreplyText]").val(); - } + } else if(stepType === "webconnectionStep") { + detail = element.find("input[name=url]").val(); + } output = "

              " + i18n("customactivity." + stepType + ".description", detail) + "

              "; From eff24c08c0122b9e1cd449d5fe338ccbc33d2bb6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 13 Feb 2013 11:09:12 +0300 Subject: [PATCH 0791/2668] Fixed bug in js_unit_test which prevented full suite from running. --- plugins/frontlinesms-core/do/js_unit_test | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/do/js_unit_test b/plugins/frontlinesms-core/do/js_unit_test index 70a0bf4d2..19efa597b 100755 --- a/plugins/frontlinesms-core/do/js_unit_test +++ b/plugins/frontlinesms-core/do/js_unit_test @@ -1,6 +1,15 @@ #!/bin/bash ERROR_FILE=target/js_unit_test.log.err +if [ -z "$@" ]; then + pushd test/js + TESTS=`ls *_tests.js | sed -e "s/_tests.js//"` + popd +else + TESTS="$@" +fi +echo "# Tests to run: $TESTS" + function err { 1>&2 echo "$@" } @@ -21,8 +30,6 @@ check_npm_module_available jquery check_npm_module_available jsdom check_npm_module_available qunit -set -e - function run_test() { TARGET=$1 echo "# Running tests for $TARGET..." @@ -30,15 +37,6 @@ function run_test() { grep -v "^ERROR.*" $ERROR_FILE } -if [ -z "$@" ]; then - pushd test/js - TESTS=`ls *_tests.js | sed -e "s/_tests.js//"` - popd -else - TESTS="$@" -fi -echo "# Tests to run: $TESTS" - for TEST in $TESTS; do run_test $TEST done From 6c5a0d8ccc289f944b3a35f177a3262eeb166897 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 13 Feb 2013 11:10:03 +0300 Subject: [PATCH 0792/2668] Fixed bug in js_unit_test XML generation which would lead to bad test reports if number of tests in a module was not equal to 6. --- .../do/js_unit_test_lib/xml_filter.groovy | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy index efaaf9aa0..9a89bf7eb 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy @@ -6,12 +6,7 @@ def unfiltered = '' + sin.text + '' def slurp = new XmlParser().parseText(unfiltered) def suites = slurp.testsuites -def toRemove = [] -suites.iterator().eachWithIndex { suite, i -> - if(i % 6 != 0) toRemove << suite -} - -toRemove.each { suites.remove(it) } +suites.retainAll { suites.lastIndexOf(it) == suites.size() - 1 } Node root = new Node(null, 'testsuites') suites.each { testsuites -> From 36958b92cb382f6307005854eeb0211b1220da6c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 13 Feb 2013 11:20:47 +0300 Subject: [PATCH 0793/2668] Minor formatting cleanup. --- .../services/frontlinesms2/WebconnectionService.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 38ba816be..a4b628c61 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -7,7 +7,6 @@ import grails.converters.JSON import frontlinesms2.api.* - class WebconnectionService { def camelContext def i18nUtilService From 540d3a01049ec6efab645e88d43e2087108ccb49 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Feb 2013 11:45:40 +0300 Subject: [PATCH 0794/2668] removed hard-coded default fconnection type. First implementation is now default (so no effect on core) --- .../frontlinesms-core/grails-app/views/connection/wizard.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp b/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp index c7cb46778..8fb5dc786 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp @@ -68,7 +68,7 @@ fconnection.setType = function(connectionType) { function initializePopup() { fconnection.validator(); - fconnection.setType("${fconnectionInstance?fconnectionInstance.getClass().shortName: 'smslib'}"); + fconnection.setType("${fconnectionInstance?fconnectionInstance.getClass().shortName: Fconnection.implementations[0].shortName}"); fconnection.init(); From e665b380b25db2e52e8e9eb82bdd79ba547f5971 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Wed, 13 Feb 2013 12:09:11 +0300 Subject: [PATCH 0795/2668] Internationalized the 'help file not found' message --- .../grails-app/controllers/frontlinesms2/HelpController.groovy | 2 +- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index ee76dd6a3..49ab34297 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -19,7 +19,7 @@ class HelpController extends ControllerUtils { helpText = markdownFile.text } } - if(!helpText) helpText = "This help file is not yet available, sorry." + if(!helpText) helpText = g.message(code:"help.notfound") render text:helpText.markdownToHtml() } def updateShowNewFeatures() { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 796c08d47..214557bc0 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -619,7 +619,7 @@ tab.status=Status tab.search=Search help.info=This version is a beta so there is no built-in help. Please go to the user forums to get help at this stage - +help.notfound=This help file is not yet available, sorry. # IntelliSms Fconnection intellisms.label=IntelliSms Account intellisms.type.label=Type From 93aec8a6e7de720b332876ecc6b24e7d14acb436 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 13 Feb 2013 12:12:11 +0300 Subject: [PATCH 0796/2668] refactor _webconnectionStep.gsp --- .../domain/frontlinesms2/WebconnectionActionStep.groovy | 9 +++++---- .../views/customactivity/steps/_webconnectionStep.gsp | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/WebconnectionActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/WebconnectionActionStep.groovy index adb316145..3fc186b9a 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/WebconnectionActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/WebconnectionActionStep.groovy @@ -38,13 +38,14 @@ class WebconnectionActionStep extends Step { } def getRequestParameters() { - def params = [] + def parameters = [] this.stepProperties?.each { property-> - if((property.key =! "url") && (property.key =! "httpMethod") ) { - params << new RequestParameter(name:property.key, value:property.value) + if(!(property.key in ["url", "httpMethod"])) { + parameters << [name:property.key, value:property.value] } } - return params + println "## webconnectionStep.params # ${parameters}" + return parameters } def process(Fmessage message) { diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_webconnectionStep.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_webconnectionStep.gsp index 084e58a57..8826420fe 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_webconnectionStep.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_webconnectionStep.gsp @@ -8,14 +8,14 @@ - + - +

              - ### ${requestParameters} #### + From 963fcf7b0813c1754112aff63a9aff4aa22ac7a3 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 13 Feb 2013 12:30:03 +0300 Subject: [PATCH 0797/2668] fixed saving of stepProperties in CustomActivityService --- .../frontlinesms2/CustomActivityService.groovy | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index 14a52d7f7..b042559c7 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -54,11 +54,14 @@ class CustomActivityService { def stepInstance = Step.implementations.find {it.shortName == step.stepType}.newInstance(step) stepInstance.save() - step.stepProperties.each { stepProperty -> - def stepProp = new StepProperty(stepProperty) - println "$stepProp::: ${stepProp.key}: ${stepProp.value}" - stepInstance.addToStepProperties(stepProp) - println "$stepInstance::: ${stepInstance.stepProperties}" + step.each { k,v -> + def stepProp + if(!(k in ["stepType", "stepId"])) { + stepProp = new StepProperty(key:k, value:v) + println "$stepProp::: ${stepProp.key}: ${stepProp.value}" + stepInstance.addToStepProperties(stepProp) + println "$stepInstance::: ${stepInstance.stepProperties}" + } } stepInstanceList << stepInstance From cc62f13cc08633cd7a69b14925f17fbf4166d0ff Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 13 Feb 2013 14:51:54 +0300 Subject: [PATCH 0798/2668] can save webconnectionstep parameters --- .../web-app/js/activity/custom_activity.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index 0f8390d84..e9efba2eb 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -97,7 +97,15 @@ var customActivityDialog = (function(){ var data = {}; container.find(fieldSelecter).each(function(index, field) { field = $(field); - data[field.attr("name")] = field.val(); + if((field.attr("name") != "param-name") && (field.attr("name") != "param-value")) { + data[field.attr("name")] = field.val(); + } + //handling for webconnection step + if(field.val() == "webconnectionStep") { + var names = $.map($(field).parent().find("input[name='param-name']"), function(element, index){ return $(element).val(); }); + var values = $.map($(field).parent().find("input[name='param-value']"), function(element, index){ return $(element).val(); }); + $.each(names,function(index, name){ data[name] = values[index]; }); + } }); return data; }, From ead29288432edb7ed1bf4c45fa4769ebecc0ef6e Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Wed, 13 Feb 2013 15:08:28 +0300 Subject: [PATCH 0799/2668] Updated help controller to resolve helpfiles based on plugin structure --- .../controllers/frontlinesms2/HelpController.groovy | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index 49ab34297..ee9d0e84d 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -2,6 +2,7 @@ package frontlinesms2 import frontlinesms2.* import grails.converters.JSON +import org.codehaus.groovy.grails.plugins.PluginManagerHolder class HelpController extends ControllerUtils { def appSettingsService @@ -14,7 +15,12 @@ class HelpController extends ControllerUtils { def helpText if(params.helpSection) { // FIXME this is open to injection attacks - def markdownFile = new File("web-app/help/" + params.helpSection + ".txt") + def pluginManager = PluginManagerHolder.pluginManager + def plugin = pluginManager.allPlugins.find { plugin -> + plugin.name.startsWith("frontlinesmsCore") + } + def pluginDir = plugin.descriptor.file.parentFile + def markdownFile = new File("$pluginDir/web-app/help/" + params.helpSection + ".txt") if (markdownFile.canRead()) { helpText = markdownFile.text } From 783b09edf591d10d75a33fa9dc0631b6a88be4bd Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Feb 2013 15:15:12 +0300 Subject: [PATCH 0800/2668] fixed some connection wizard js --- .../grails-app/views/connection/wizard.gsp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp b/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp index 8fb5dc786..930d415f2 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/wizard.gsp @@ -21,10 +21,12 @@ fconnection.getType = function() { }; fconnection.setType = function(connectionType) { - if(!$("input[name=connectionType]:checked")) { + if(!$("input[name=connectionType]:checked").size()) { $("input[name=connectionType]").each(function() { var e = $(this); - e.attr("checked", e.val() == connectionType); + if (e.val() == connectionType) { + e.attr("checked", "checked"); + } }); } From 1c423e229b2f26b9d7294217dbdc39e5aa226d19 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 13 Feb 2013 15:23:56 +0300 Subject: [PATCH 0801/2668] added validation for webconnectionsteps --- .../web-app/js/activity/custom_activity.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index e9efba2eb..c7d91059c 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -48,7 +48,9 @@ var customActivityDialog = (function(){ errorContainer: ".error-panel", rules: { autoreplyText: { required:true }, - name: { required:true } + name: { required:true }, + url: { required :true }, + 'param-name' : { required : true } }, errorPlacement: function(error, element){ $(".error-panel").html(error); @@ -72,6 +74,14 @@ var customActivityDialog = (function(){ valid = valid && validator.element($(element)); }); + $.each($("input[name='url']"), function(index, element) { + valid = valid && validator.element($(element)); + }); + + $.each($("input[name='param-name']"), function(index, element) { + valid = valid && validator.element($(element)); + }); + return valid; }, confirmTabValidation = function() { From dcae2eb1c2797c6c1f928ed03623f6584084f81f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 13 Feb 2013 16:29:08 +0300 Subject: [PATCH 0802/2668] Minor cleanup to WebconnectionServiceSpec --- .../WebconnectionServiceSpec.groovy | 53 ------------------- .../services/WebconnectionServiceSpec.groovy | 4 +- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy deleted file mode 100644 index 32013bfea..000000000 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/WebconnectionServiceSpec.groovy +++ /dev/null @@ -1,53 +0,0 @@ -package frontlinesms2 - -import spock.lang.* - -import org.apache.camel.* - -@TestFor(WebconnectionService) -@Mock([GenericWebconnection, Fmessage]) -class WebconnectionServiceSpec extends Specification { - def requestedId - def mockConnection - - def setup() { - mockConnection = Mock(Webconnection) - Webconnection.metaClass.static.get = { Serializable id -> - requestedId = id - return mockConnection - } - Fmessage.metaClass.static.get = { Serializable id -> - return Mock(Fmessage) - } - } - - def 'preprocess call is handed back to the relevant domain object'() { - given: - def x = mockExchange(null, ['webconnection-id':'123']) - when: - service.preProcess(x) - then: - requestedId == '123' - 1 * mockConnection.preProcess(x) - } - - - def 'postprocess call is handed back to the relevant domain object'() { - given: - def x = mockExchange(null, ['webconnection-id':'123','fmessage-id':'1']) - when: - service.postProcess(x) - then: - requestedId == '123' - 1 * mockConnection.postProcess(x) - } - - Exchange mockExchange(body, Map headers) { - Exchange x = Mock() - def inMessage = Mock(Message) - if(body) inMessage.body >> body - inMessage.headers >> headers - x.in >> inMessage - return x - } -} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy index 4b8f438ce..41b133b22 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy @@ -53,7 +53,7 @@ class WebconnectionServiceSpec extends Specification { def controller = [request:[:], render: { renderedArgs = it }] controller.request = [JSON:requestBody] when: - def responseBody = service.apiProcess(webcon, controller) + service.apiProcess(webcon, controller) then: renderedArgs.status == 401 renderedArgs.text == expectedResponse @@ -77,7 +77,7 @@ class WebconnectionServiceSpec extends Specification { messageSendService.createOutgoingMessage(_) >> m service.messageSendService = messageSendService when: - def responseBody = service.apiProcess(webcon, controller) + service.apiProcess(webcon, controller) then: renderedArgs.status == 400 renderedArgs.text == expectedResponse From 6fa39342297c7cd08e928fe9987b6f6f83599138 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 13 Feb 2013 16:29:55 +0300 Subject: [PATCH 0803/2668] Minor improvement to js_unit_test_xml --- plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy index 9a89bf7eb..dd1405fa7 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy @@ -6,7 +6,7 @@ def unfiltered = '' + sin.text + '' def slurp = new XmlParser().parseText(unfiltered) def suites = slurp.testsuites -suites.retainAll { suites.lastIndexOf(it) == suites.size() - 1 } +suites = suites? [suites[-1]]: [] Node root = new Node(null, 'testsuites') suites.each { testsuites -> From 12c3b476f3c107845f57d455b85835ed1a28b0e9 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 13 Feb 2013 16:32:30 +0300 Subject: [PATCH 0804/2668] forced receive on Smpp even if source is not present --- .../frontlinesms2/SmppFconnection.groovy | 4 ++-- .../MessageStorageService.groovy | 2 ++ .../SmppTranslationService.groovy | 23 +++++++++++-------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy index 63863507f..51498fa4c 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy @@ -67,10 +67,10 @@ class SmppFconnection extends Fconnection { } private getSendingUrl(){ - return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=3000&transactionTimer=5000&systemType=producer" + return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=30000&transactionTimer=50000&systemType=producer" } private getReceivingUrl(){ - return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=3000&transactionTimer=5000&systemType=consumer" + return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=30000&transactionTimer=50000&systemType=consumer" } } \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageStorageService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageStorageService.groovy index 86ff5dcf9..773c62e99 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageStorageService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageStorageService.groovy @@ -5,6 +5,8 @@ import org.apache.camel.Processor class MessageStorageService implements Processor { public void process(Exchange ex) { + def log = { println "MessageStorageService.process() : $it" } + log "headers # $ex.in.headers" def message = ex.in.body assert message instanceof Fmessage message = message.id ? Fmessage.findById(message.id) : message diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy index 67c3593a8..c2e3b2937 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy @@ -5,21 +5,25 @@ import org.apache.camel.Exchange class SmppTranslationService implements Processor { void process(Exchange exchange) { - println "ENTRY" def log = { t-> println "SmppTranslationService.process ${t}" } - println("exchange ${exchange}") + log "ENTRY" + log ("exchange ${exchange}") def i = exchange.in - println("in: ${i}") - println("in.headers: ${i.headers}") - println("in.getHeaders: ${i.getHeaders()}") + log ("in: ${i}") + log ("in.headers: ${i.headers}") + log ("in.body: ${i.body}") + log ("in.getHeaders: ${i.getHeaders()}") - if(i.headers['CamelSmppSourceAddr']) { + //TODO allow messages is source is set + //if(i.headers['CamelSmppSourceAddr']) { + if(true) { Fmessage message = new Fmessage(inbound:true) def messageBody = i.body - def messageSource = i.headers['CamelSmppSourceAddr'] - def messageDate = i.headers['CamelSmppDoneDate'] + log "###### If the Source and Date are not available ## Fake ones will be set +999999999 and 1306142323 ######" + def messageSource = i.headers['CamelSmppSourceAddr']?:'+999999999' + def messageDate = i.headers['CamelSmppDoneDate']?:'1306142323' message.src = messageSource message.text = messageBody @@ -30,9 +34,8 @@ class SmppTranslationService implements Processor { log "message sent on ${message.date}" - exchange.out.body = message + exchange.in.body = message log "IN::BODY ${exchange.in.body}" - log "OUT::BODY ${exchange.out.body}" } else { exchange.setProperty(Exchange.ROUTE_STOP, Boolean.TRUE); } From e0ff6157e065326509af5d8f40b9a7b493d86e94 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 13 Feb 2013 16:48:31 +0300 Subject: [PATCH 0805/2668] Implemented new app info service and controller to provide app data as required. --- .../frontlinesms2/AppInfoController.groovy | 18 ++++++ .../frontlinesms2/AppInfoService.groovy | 22 +++++++ .../controller/AppInfoControllerISpec.groovy | 62 +++++++++++++++++++ .../services/AppInfoServiceSpec.groovy | 52 ++++++++++++++++ .../services/FconnectionServiceSpec.groovy | 1 - .../services/FmessageServiceSpec.groovy | 28 --------- 6 files changed, 154 insertions(+), 29 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy delete mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/services/FmessageServiceSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy new file mode 100644 index 000000000..2cd894ed1 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy @@ -0,0 +1,18 @@ +package frontlinesms2 + +import grails.converters.JSON + +class AppInfoController { + def appInfoService + + def index() { + render request.JSON.collectEntries { key -> + [(key):appInfoService.provide(key, this)] + } as JSON + } + + private def listDetected() { + detectedDevices:deviceDetectionService.detected + } +} + diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy new file mode 100644 index 000000000..d11e2d3d7 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy @@ -0,0 +1,22 @@ +package frontlinesms2 + +class AppInfoService { + def grailsApplication + def providers = [:] + + synchronized void registerProvider(String key, Closure provider) { + if(providers.containsKey(key)) { + throw new RuntimeException("Provider already registered for key: $key") + } + providers[key] = provider + } + + def provide(String key, AppInfoController controller) { + def provider + synchronized(this) { + provider = providers[key] + } + return provider.call(controller) + } +} + diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy new file mode 100644 index 000000000..8e07b289d --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy @@ -0,0 +1,62 @@ +package frontlinesms2.controller + +import frontlinesms2.* +import spock.lang.* + +import grails.converters.JSON + +class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { + private static final String JSON_MIME_TYPE = 'application/json' + + def controller + def service + + def setup() { + controller = new AppInfoController() + service = Mock(AppInfoService) + controller.appInfoService = service + } + + def 'appInfoService should be called with request for relevant data (0 requested items)'() { + given: + def requestData = [] + controller.request.format = JSON_MIME_TYPE + controller.request.JSON = (requestData as JSON).toString() + when: + def response = controller.index() + println response + then: + 0 * _ + JSON.parse(controller.response.contentAsString).keySet().sort() == requestData + } + + def 'appInfoService should be called with request for relevant data (1 requested item)'() { + given: + def requestData = ['devices'] + controller.request.format = JSON_MIME_TYPE + controller.request.JSON = (requestData as JSON).toString() + when: + def response = controller.index() + println response + then: + 1 * service.provide('devices', controller) + 0 * _ + JSON.parse(controller.response.contentAsString).keySet().sort() == requestData + } + + def 'appInfoService should be called with request for relevant data (2 requested items)'() { + given: + def requestData = ['devices', 'gribbles'] + controller.request.format = JSON_MIME_TYPE + controller.request.JSON = (requestData as JSON).toString() + when: + def response = controller.index() + println response + then: + 1 * service.provide('devices', controller) + 1 * service.provide('gribbles', controller) + 0 * _ + JSON.parse(controller.response.contentAsString).keySet().sort() == requestData + } +} + diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy new file mode 100644 index 000000000..e81800806 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy @@ -0,0 +1,52 @@ +package frontlinesms2.services + +import frontlinesms2.* +import spock.lang.* + +@TestFor(AppInfoService) +class AppInfoServiceSpec extends Specification { + def mockController + + def setup() { + mockController = Mock(AppInfoController) + } + + def 'provide should throw exception if no provider registered'() { + when: + service.provide 'some key' + then: + thrown(RuntimeException) + } + + def 'registerProvider should throw exception if provider already registered'() { + given: + service.registerProvider 'a', newPointlessProvider() + when: + service.registerProvider 'a', newPointlessProvider() + then: + thrown(RuntimeException) + } + + def 'provide should call previously-registered provider'() { + given: + def a = Mock(Closure) + def b = Mock(Closure) + service.registerProvider 'a', a + service.registerProvider 'b', b + when: + service.provide('a', mockController) + then: + 1 * a.call(mockController) + 0 * _ + when: + service.provide('b', mockController) + then: + 1 * b.call(mockController) + 0 * _ + } + + private def newPointlessProvider() { + { controller -> } + } +} + diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index edf245355..0062a8a9a 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -1,7 +1,6 @@ package frontlinesms2.services import spock.lang.* -import grails.test.mixin.* import frontlinesms2.* diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FmessageServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FmessageServiceSpec.groovy deleted file mode 100644 index a74259a17..000000000 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FmessageServiceSpec.groovy +++ /dev/null @@ -1,28 +0,0 @@ -package frontlinesms2.services - -import frontlinesms2.* - -import static org.junit.Assert.* - -import grails.test.mixin.* -import grails.test.mixin.support.* -import org.junit.* - -/** - * See the API for {@link grails.test.mixin.support.GrailsUnitTestMixin} for usage instructions - */ -@TestMixin(GrailsUnitTestMixin) -class FmessageServiceSpec { - - void setUp() { - // Setup logic here - } - - void tearDown() { - // Tear down logic here - } - - void testSomething() { - fail "Implement me" - } -} From 0bb88fcead9bd2ff385d6a5035afd5306139e11f Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Wed, 13 Feb 2013 17:17:09 +0300 Subject: [PATCH 0806/2668] Renamed directory where helpfiles are stored and updated radio version --- .../frontlinesms2/HelpController.groovy | 21 ++- .../grails-app/views/help/_index.gsp | 128 +++++++++--------- .../frontlinesms-core/scripts/_Events.groovy | 10 +- .../1.getting_around_activities.txt | 0 .../activities/10.web_connection_api.txt | 0 .../activities/2.creating_an_activity.txt | 0 .../activities/3.creating_a_poll.txt | 0 .../activities/3a.manually_categorising.txt | 0 .../activities/4.creating_an_announcement.txt | 0 .../activities/5.creating_an_auto-reply.txt | 0 .../activities/6.renaming_an_activity.txt | 0 .../activities/7.exporting_an_activity.txt | 0 .../activities/8.creating_an_autoforward.txt | 0 .../activities/9.creating_a_subscription.txt | 0 .../9.creating_a_web_connection.txt | 0 .../1.getting_around_the_archive_tab.txt | 0 .../archive/1a.inbox_archive.txt | 0 .../archive/1b.sent_archive.txt | 0 .../archive/1c.activity_archive.txt | 0 .../archive/1d.folder_archive.txt | 0 .../archive/2.archiving_messages.txt | 0 .../3.archiving_activities_folders.txt | 0 .../archive/4.unarchive.txt | 0 .../1.getting_around_the_contacts_tab.txt | 0 .../contacts/2.add_contact.txt | 0 .../contacts/2a.editing_a_contact.txt | 0 .../contacts/3.add_remove_a_custom_field.txt | 0 .../contacts/4.creating_a_group.txt | 0 .../contacts/5.creating_a_smart_group.txt | 0 .../6.add_remove_contact_to_from_a_group.txt | 0 ...7.messages_sent_or_received_by_contact.txt | 0 .../contacts/8.searching_through_contacts.txt | 0 .../features/new.txt | 0 .../folders/1.getting_around_folders.txt | 0 .../folders/2.creating_a_folder.txt | 0 .../1.getting_around_the_messages_tab.txt | 0 .../messages/2.sss.txt | 0 .../messages/3.quick_message.txt | 0 .../messages/4.filtering_messages.txt | 0 .../messages/5.sent.txt | 0 .../messages/6.trash.txt | 0 .../messages/7.pending.txt | 0 .../messages/8.mrfd.txt | 0 .../messages/9.exporting.txt | 0 .../1.getting_around_the_search_tab.txt | 0 .../search/2.creating_a_search.txt | 0 .../search/2a.creating_an_advanced_search.txt | 0 .../1.getting_around_the_settings_menu.txt | 0 .../settings/2.changing_languages.txt | 0 .../settings/3.restoring_a_backup.txt | 0 .../settings/4.setting_up_a_device.txt | 0 .../settings/4a.intellisms.txt | 0 .../settings/4b.clickatell.txt | 0 .../settings/5.manually_adding_device.txt | 0 .../settings/6.edit_delete_connection.txt | 0 .../settings/7.translatingfrontlinesms.txt | 0 .../settings/8.basic_auth.txt | 0 .../1.getting_around_the_status_tab.txt | 0 .../status/2.using_the_traffic_graph.txt | 0 59 files changed, 85 insertions(+), 74 deletions(-) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/1.getting_around_activities.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/10.web_connection_api.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/2.creating_an_activity.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/3.creating_a_poll.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/3a.manually_categorising.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/4.creating_an_announcement.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/5.creating_an_auto-reply.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/6.renaming_an_activity.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/7.exporting_an_activity.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/8.creating_an_autoforward.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/9.creating_a_subscription.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/activities/9.creating_a_web_connection.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/1.getting_around_the_archive_tab.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/1a.inbox_archive.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/1b.sent_archive.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/1c.activity_archive.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/1d.folder_archive.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/2.archiving_messages.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/3.archiving_activities_folders.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/archive/4.unarchive.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/1.getting_around_the_contacts_tab.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/2.add_contact.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/2a.editing_a_contact.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/3.add_remove_a_custom_field.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/4.creating_a_group.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/5.creating_a_smart_group.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/6.add_remove_contact_to_from_a_group.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/7.messages_sent_or_received_by_contact.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/contacts/8.searching_through_contacts.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/features/new.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/folders/1.getting_around_folders.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/folders/2.creating_a_folder.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/1.getting_around_the_messages_tab.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/2.sss.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/3.quick_message.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/4.filtering_messages.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/5.sent.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/6.trash.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/7.pending.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/8.mrfd.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/messages/9.exporting.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/search/1.getting_around_the_search_tab.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/search/2.creating_a_search.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/search/2a.creating_an_advanced_search.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/1.getting_around_the_settings_menu.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/2.changing_languages.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/3.restoring_a_backup.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/4.setting_up_a_device.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/4a.intellisms.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/4b.clickatell.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/5.manually_adding_device.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/6.edit_delete_connection.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/7.translatingfrontlinesms.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/settings/8.basic_auth.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/status/1.getting_around_the_status_tab.txt (100%) rename plugins/frontlinesms-core/web-app/help/{core => frontlinesms-core}/status/2.using_the_traffic_graph.txt (100%) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index ee9d0e84d..a2e370d38 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -14,13 +14,24 @@ class HelpController extends ControllerUtils { def section() { def helpText if(params.helpSection) { - // FIXME this is open to injection attacks + def suppliedPluginName = params.helpSection.split('/')[0] + // make sure that this is restricted to configured plugins def pluginManager = PluginManagerHolder.pluginManager def plugin = pluginManager.allPlugins.find { plugin -> - plugin.name.startsWith("frontlinesmsCore") + println "checking::: $plugin ::: ${suppliedPluginName == 'frontlinesms-core' && plugin.name.startsWith('frontlinesmsCore')}" + suppliedPluginName == 'frontlinesms-core' && plugin.name.startsWith('frontlinesmsCore') || + plugin.name == suppliedPluginName + } + println "plugin::: ${plugin.descriptor}" + def pluginDir = plugin.descriptor?.file?.parentFile + // FIXME this is open to injection attacks + def markdownFile + if(pluginDir) { + markdownFile = new File(pluginDir, "web-app/help/${params.helpSection}.txt") + } else { + markdownFile = new File("web-app/help/${params.helpSection}.txt") } - def pluginDir = plugin.descriptor.file.parentFile - def markdownFile = new File("$pluginDir/web-app/help/" + params.helpSection + ".txt") + println "markdownFile::: $markdownFile" if (markdownFile.canRead()) { helpText = markdownFile.text } @@ -37,7 +48,7 @@ class HelpController extends ControllerUtils { def newfeatures() { appSettingsService['newfeatures.popup.show.immediately'] = false appSettingsService.persist() - params.helpSection = 'core/features/new' + params.helpSection = 'frontlinesms-core/features/new' section() } } diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index 50331b4cf..395fcb35a 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -82,68 +82,68 @@ * [How do I get FrontlineSMS to detect my device?][98] * [How do I translate the interface into my language?][99] -[1]: core/features/new -[2]: core/messages/1.getting_around_the_messages_tab -[5]: core/messages/2.sss -[6]: core/messages/3.quick_message -[7]: core/messages/8.mrfd -[9]: core/archive/2.archiving_messages -[12]: core/messages/5.sent -[13]: core/messages/6.trash -[14]: core/messages/7.pending -[16]: core/messages/2.sss -[18]: core/messages/4.filtering_messages -[19]: core/messages/7.pending -[20]: core/messages/2.sss -[22]: core/activities/1.getting_around_activities -[23]: core/activities/2.creating_an_activity -[24]: core/activities/1.getting_around_activities -[26]: core/activities/3.creating_a_poll -[30]: core/activities/3a.manually_categorising -[31]: core/activities/4.creating_an_announcement -[32]: core/activities/5.creating_an_auto-reply -[34]: core/archive/3.archiving_activities_folders -[35]: core/messages/9.exporting -[36]: core/activities/6.renaming_an_activity -[37]: core/messages/7.pending -[39]: core/folders/1.getting_around_folders -[40]: core/folders/2.creating_a_folder -[41]: core/messages/8.mrfd -[43]: core/archive/1.getting_around_the_archive_tab -[45]: core/archive/1a.inbox_archive -[46]: core/archive/1b.sent_archive -[47]: core/archive/1c.activity_archive -[48]: core/archive/1d.folder_archive -[50]: core/archive/2.archiving_messages -[51]: core/archive/3.archiving_activities_folders -[53]: core/messages/8.mrfd -[54]: core/archive/4.unarchive -[56]: core/contacts/1.getting_around_the_contacts_tab -[58]: core/contacts/2.add_contact -[59]: core/contacts/2a.editing_a_contact -[60]: core/contacts/4.creating_a_group -[62]: core/contacts/7.messages_sent_or_received_by_contact -[63]: core/messages/9.exporting -[64]: core/contacts/8.searching_through_contacts -[66]: core/contacts/3.add_remove_a_custom_field -[67]: core/contacts/6.add_remove_contact_to_from_a_group -[70]: core/search/1.getting_around_the_search_tab -[72]: core/search/2.creating_a_search -[74]: core/search/2a.creating_an_advanced_search -[80]: core/messages/9.exporting -[82]: core/status/1.getting_around_the_status_tab -[87]: core/status/2.using_the_traffic_graph -[90]: core/settings/1.getting_around_the_settings_menu -[91]: core/settings/2.changing_languages -[92]: core/settings/3.restoring_a_backup -[94]: core/settings/4.setting_up_a_device -[95]: core/settings/4a.intellisms -[96]: core/settings/4b.clickatell -[97]: core/settings/6.edit_delete_connection -[98]: core/settings/5.manually_adding_device -[99]: core/settings/7.translatingfrontlinesms -[100]: core/activities/8.creating_an_autoforward -[101]: core/activities/9.creating_a_subscription -[102]: core/activities/9.creating_a_web_connection -[103]: core/settings/8.basic_auth +[1]: frontlinesms-core/features/new +[2]: frontlinesms-core/messages/1.getting_around_the_messages_tab +[5]: frontlinesms-core/messages/2.sss +[6]: frontlinesms-core/messages/3.quick_message +[7]: frontlinesms-core/messages/8.mrfd +[9]: frontlinesms-core/archive/2.archiving_messages +[12]: frontlinesms-core/messages/5.sent +[13]: frontlinesms-core/messages/6.trash +[14]: frontlinesms-core/messages/7.pending +[16]: frontlinesms-core/messages/2.sss +[18]: frontlinesms-core/messages/4.filtering_messages +[19]: frontlinesms-core/messages/7.pending +[20]: frontlinesms-core/messages/2.sss +[22]: frontlinesms-core/activities/1.getting_around_activities +[23]: frontlinesms-core/activities/2.creating_an_activity +[24]: frontlinesms-core/activities/1.getting_around_activities +[26]: frontlinesms-core/activities/3.creating_a_poll +[30]: frontlinesms-core/activities/3a.manually_categorising +[31]: frontlinesms-core/activities/4.creating_an_announcement +[32]: frontlinesms-core/activities/5.creating_an_auto-reply +[34]: frontlinesms-core/archive/3.archiving_activities_folders +[35]: frontlinesms-core/messages/9.exporting +[36]: frontlinesms-core/activities/6.renaming_an_activity +[37]: frontlinesms-core/messages/7.pending +[39]: frontlinesms-core/folders/1.getting_around_folders +[40]: frontlinesms-core/folders/2.creating_a_folder +[41]: frontlinesms-core/messages/8.mrfd +[43]: frontlinesms-core/archive/1.getting_around_the_archive_tab +[45]: frontlinesms-core/archive/1a.inbox_archive +[46]: frontlinesms-core/archive/1b.sent_archive +[47]: frontlinesms-core/archive/1c.activity_archive +[48]: frontlinesms-core/archive/1d.folder_archive +[50]: frontlinesms-core/archive/2.archiving_messages +[51]: frontlinesms-core/archive/3.archiving_activities_folders +[53]: frontlinesms-core/messages/8.mrfd +[54]: frontlinesms-core/archive/4.unarchive +[56]: frontlinesms-core/contacts/1.getting_around_the_contacts_tab +[58]: frontlinesms-core/contacts/2.add_contact +[59]: frontlinesms-core/contacts/2a.editing_a_contact +[60]: frontlinesms-core/contacts/4.creating_a_group +[62]: frontlinesms-core/contacts/7.messages_sent_or_received_by_contact +[63]: frontlinesms-core/messages/9.exporting +[64]: frontlinesms-core/contacts/8.searching_through_contacts +[66]: frontlinesms-core/contacts/3.add_remove_a_custom_field +[67]: frontlinesms-core/contacts/6.add_remove_contact_to_from_a_group +[70]: frontlinesms-core/search/1.getting_around_the_search_tab +[72]: frontlinesms-core/search/2.creating_a_search +[74]: frontlinesms-core/search/2a.creating_an_advanced_search +[80]: frontlinesms-core/messages/9.exporting +[82]: frontlinesms-core/status/1.getting_around_the_status_tab +[87]: frontlinesms-core/status/2.using_the_traffic_graph +[90]: frontlinesms-core/settings/1.getting_around_the_settings_menu +[91]: frontlinesms-core/settings/2.changing_languages +[92]: frontlinesms-core/settings/3.restoring_a_backup +[94]: frontlinesms-core/settings/4.setting_up_a_device +[95]: frontlinesms-core/settings/4a.intellisms +[96]: frontlinesms-core/settings/4b.clickatell +[97]: frontlinesms-core/settings/6.edit_delete_connection +[98]: frontlinesms-core/settings/5.manually_adding_device +[99]: frontlinesms-core/settings/7.translatingfrontlinesms +[100]: frontlinesms-core/activities/8.creating_an_autoforward +[101]: frontlinesms-core/activities/9.creating_a_subscription +[102]: frontlinesms-core/activities/9.creating_a_web_connection +[103]: frontlinesms-core/settings/8.basic_auth diff --git a/plugins/frontlinesms-core/scripts/_Events.groovy b/plugins/frontlinesms-core/scripts/_Events.groovy index 5c54692e9..3ada8248b 100644 --- a/plugins/frontlinesms-core/scripts/_Events.groovy +++ b/plugins/frontlinesms-core/scripts/_Events.groovy @@ -103,11 +103,11 @@ eventCompileStart = { kind -> eventCompileEnd = { def inlinePlugins = grailsSettings.inlinePluginDirectories - inlinePlugins.each { pluginPath -> - ant.copy(toDir:'web-app/help') { - fileset dir:"$pluginPath/web-app/help" - } - } + // inlinePlugins.each { pluginPath -> + // ant.copy(toDir:'web-app/help') { + // fileset dir:"$pluginPath/web-app/help" + // } + // } // Copy i18n properties files to web-app so they are available for i18nService in dev mode def folderMap = [ "grails-app/i18n":"web-app/WEB-INF/grails-app/i18n" diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/1.getting_around_activities.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/1.getting_around_activities.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/1.getting_around_activities.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/1.getting_around_activities.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/10.web_connection_api.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/10.web_connection_api.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/10.web_connection_api.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/2.creating_an_activity.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/2.creating_an_activity.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/2.creating_an_activity.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/3.creating_a_poll.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/3.creating_a_poll.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/3.creating_a_poll.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/3a.manually_categorising.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/3a.manually_categorising.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/3a.manually_categorising.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/4.creating_an_announcement.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/4.creating_an_announcement.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/4.creating_an_announcement.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/4.creating_an_announcement.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/5.creating_an_auto-reply.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/5.creating_an_auto-reply.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/5.creating_an_auto-reply.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/5.creating_an_auto-reply.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/6.renaming_an_activity.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/6.renaming_an_activity.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/6.renaming_an_activity.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/6.renaming_an_activity.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/7.exporting_an_activity.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/7.exporting_an_activity.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/7.exporting_an_activity.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/7.exporting_an_activity.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/8.creating_an_autoforward.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/8.creating_an_autoforward.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/8.creating_an_autoforward.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/9.creating_a_subscription.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_subscription.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/9.creating_a_subscription.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/9.creating_a_web_connection.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/activities/9.creating_a_web_connection.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/activities/9.creating_a_web_connection.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/1.getting_around_the_archive_tab.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1.getting_around_the_archive_tab.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/1.getting_around_the_archive_tab.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1.getting_around_the_archive_tab.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/1a.inbox_archive.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1a.inbox_archive.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/1a.inbox_archive.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1a.inbox_archive.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/1b.sent_archive.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1b.sent_archive.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/1b.sent_archive.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1b.sent_archive.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/1c.activity_archive.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1c.activity_archive.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/1c.activity_archive.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1c.activity_archive.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/1d.folder_archive.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1d.folder_archive.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/1d.folder_archive.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/1d.folder_archive.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/2.archiving_messages.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/2.archiving_messages.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/2.archiving_messages.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/2.archiving_messages.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/3.archiving_activities_folders.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/3.archiving_activities_folders.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/3.archiving_activities_folders.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/3.archiving_activities_folders.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/archive/4.unarchive.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/4.unarchive.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/archive/4.unarchive.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/archive/4.unarchive.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/1.getting_around_the_contacts_tab.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/1.getting_around_the_contacts_tab.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/1.getting_around_the_contacts_tab.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/1.getting_around_the_contacts_tab.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/2.add_contact.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/2.add_contact.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/2.add_contact.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/2.add_contact.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/2a.editing_a_contact.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/2a.editing_a_contact.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/2a.editing_a_contact.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/2a.editing_a_contact.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/3.add_remove_a_custom_field.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/3.add_remove_a_custom_field.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/3.add_remove_a_custom_field.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/3.add_remove_a_custom_field.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/4.creating_a_group.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/4.creating_a_group.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/4.creating_a_group.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/4.creating_a_group.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/5.creating_a_smart_group.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/5.creating_a_smart_group.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/5.creating_a_smart_group.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/5.creating_a_smart_group.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/6.add_remove_contact_to_from_a_group.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/6.add_remove_contact_to_from_a_group.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/6.add_remove_contact_to_from_a_group.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/6.add_remove_contact_to_from_a_group.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/7.messages_sent_or_received_by_contact.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/7.messages_sent_or_received_by_contact.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/7.messages_sent_or_received_by_contact.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/7.messages_sent_or_received_by_contact.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/contacts/8.searching_through_contacts.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/8.searching_through_contacts.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/contacts/8.searching_through_contacts.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/contacts/8.searching_through_contacts.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/features/new.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/features/new.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/features/new.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/features/new.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/folders/1.getting_around_folders.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/folders/1.getting_around_folders.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/folders/1.getting_around_folders.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/folders/1.getting_around_folders.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/folders/2.creating_a_folder.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/folders/2.creating_a_folder.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/folders/2.creating_a_folder.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/folders/2.creating_a_folder.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/1.getting_around_the_messages_tab.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/1.getting_around_the_messages_tab.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/1.getting_around_the_messages_tab.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/1.getting_around_the_messages_tab.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/2.sss.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/2.sss.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/2.sss.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/2.sss.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/3.quick_message.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/3.quick_message.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/3.quick_message.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/3.quick_message.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/4.filtering_messages.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/4.filtering_messages.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/4.filtering_messages.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/4.filtering_messages.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/5.sent.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/5.sent.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/5.sent.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/5.sent.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/6.trash.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/6.trash.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/6.trash.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/6.trash.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/7.pending.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/7.pending.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/7.pending.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/7.pending.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/8.mrfd.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/8.mrfd.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/8.mrfd.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/8.mrfd.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/messages/9.exporting.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/9.exporting.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/messages/9.exporting.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/messages/9.exporting.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/search/1.getting_around_the_search_tab.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/search/1.getting_around_the_search_tab.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/search/1.getting_around_the_search_tab.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/search/1.getting_around_the_search_tab.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/search/2.creating_a_search.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/search/2.creating_a_search.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/search/2.creating_a_search.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/search/2.creating_a_search.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/search/2a.creating_an_advanced_search.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/search/2a.creating_an_advanced_search.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/search/2a.creating_an_advanced_search.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/search/2a.creating_an_advanced_search.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/1.getting_around_the_settings_menu.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/1.getting_around_the_settings_menu.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/1.getting_around_the_settings_menu.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/1.getting_around_the_settings_menu.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/2.changing_languages.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/2.changing_languages.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/2.changing_languages.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/2.changing_languages.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/3.restoring_a_backup.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/3.restoring_a_backup.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/3.restoring_a_backup.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/3.restoring_a_backup.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/4.setting_up_a_device.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/4.setting_up_a_device.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/4.setting_up_a_device.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/4.setting_up_a_device.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/4a.intellisms.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/4a.intellisms.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/4a.intellisms.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/4a.intellisms.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/4b.clickatell.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/4b.clickatell.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/4b.clickatell.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/4b.clickatell.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/5.manually_adding_device.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/5.manually_adding_device.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/5.manually_adding_device.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/5.manually_adding_device.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/6.edit_delete_connection.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/6.edit_delete_connection.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/6.edit_delete_connection.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/6.edit_delete_connection.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/7.translatingfrontlinesms.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/7.translatingfrontlinesms.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/7.translatingfrontlinesms.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/7.translatingfrontlinesms.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/settings/8.basic_auth.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/8.basic_auth.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/settings/8.basic_auth.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/settings/8.basic_auth.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/status/1.getting_around_the_status_tab.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/status/1.getting_around_the_status_tab.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/status/1.getting_around_the_status_tab.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/status/1.getting_around_the_status_tab.txt diff --git a/plugins/frontlinesms-core/web-app/help/core/status/2.using_the_traffic_graph.txt b/plugins/frontlinesms-core/web-app/help/frontlinesms-core/status/2.using_the_traffic_graph.txt similarity index 100% rename from plugins/frontlinesms-core/web-app/help/core/status/2.using_the_traffic_graph.txt rename to plugins/frontlinesms-core/web-app/help/frontlinesms-core/status/2.using_the_traffic_graph.txt From 3d031357392498459bcc3a2bf274b7b83469ac5e Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 13 Feb 2013 19:33:29 +0300 Subject: [PATCH 0807/2668] added nexmo functionality --- .../domain/frontlinesms2/Fconnection.groovy | 1 + .../frontlinesms2/NexmoFconnection.groovy | 69 ++++++++++++++++++ .../grails-app/i18n/messages.properties | 12 +++ .../frontlinesms2/NexmoService.groovy | 51 +++++++++++++ .../camel/nexmo/NexmoPostProcessor.groovy | 39 ++++++++++ .../camel/nexmo/NexmoPreProcessor.groovy | 41 +++++++++++ .../camel/nexmo/NexmoPostProcessorSpec.groovy | 55 ++++++++++++++ .../camel/nexmo/NexmoPreProcessorSpec.groovy | 73 +++++++++++++++++++ 8 files changed, 341 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/domain/frontlinesms2/NexmoFconnection.groovy create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/NexmoService.groovy create mode 100644 plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPostProcessor.groovy create mode 100644 plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPreProcessor.groovy create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPostProcessorSpec.groovy create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index dc25763d1..069b18c90 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -20,6 +20,7 @@ class Fconnection { static final def implementations = [SmslibFconnection, ClickatellFconnection, IntelliSmsFconnection, + NexmoFconnection, SmssyncFconnection] static getNonnullableConfigFields = { clazz -> diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/NexmoFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/NexmoFconnection.groovy new file mode 100644 index 000000000..1f9a2cd94 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/NexmoFconnection.groovy @@ -0,0 +1,69 @@ +package frontlinesms2 + +import frontlinesms2.camel.nexmo.* + +import org.apache.camel.Exchange +import org.apache.camel.builder.RouteBuilder +import org.apache.camel.model.RouteDefinition +import frontlinesms2.camel.exception.* +import frontlinesms2.api.* + +@FrontlineApiAnnotations(apiUrl="nexmo") +class NexmoFconnection extends Fconnection implements FrontlineApi { + private static final String NEXMO_URL = 'http://rest.nexmo.com/sms/json?' + static final configFields = [ name:null, api_key:null, api_secret:null, fromNumber:null, receiveEnabled:null, sendEnabled:null ] + static final defaultValues = [ receiveEnabled:true, sendEnabled:true ] + static String getShortName() { 'nexmo' } + + String api_key + String api_secret + String fromNumber + boolean receiveEnabled = true + boolean sendEnabled = true + + static passwords = [] + + static constraints = { + api_key blank:false + api_secret blank:false + fromNumber blank:false + } + + def nexmoService + + def apiProcess(controller) { + nexmoService.apiProcess(this, controller) + } + + String getSecret(){ return "" } // No Secret for Nexmo + + boolean isApiEnabled() { this.receivedEnabled } + + String getFullApiUrl() { + return apiEnabled? "http://[your-ip-address]:${appSettingsService.serverPort}/frontlinesms-core/api/1/$apiUrl/$id/" : "" + } + + List getRouteDefinitions() { + return new RouteBuilder() { + @Override void configure() {} + List getRouteDefinitions() { + return [from("seda:out-${NexmoFconnection.this.id}") + .onException(AuthenticationException, InvalidApiIdException, InsufficientCreditException) + .handled(true) + .beanRef('fconnectionService', 'handleDisconnection') + .end() + .setHeader(Fconnection.HEADER_FCONNECTION_ID, simple(NexmoFconnection.this.id.toString())) + .process(new NexmoPreProcessor()) + .setHeader(Exchange.HTTP_QUERY, + simple('api_key=${header.nexmo.api_key}&' + + 'api_secret=${header.nexmo.api_secret}&' + + 'from=${header.nexmo.fromNumber}&' + + 'to=${header.nexmo.dst}&' + + 'text=${body}')) + .to(NEXMO_URL) + .process(new NexmoPostProcessor()) + .routeId("out-internet-${NexmoFconnection.this.id}")] + } + }.routeDefinitions + } +} diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 796c08d47..70bc973bd 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -213,6 +213,18 @@ clickatell.description=Send and receive messages through a Clickatell account clickatell.global.info=You will need to configure an account with Clickatell (www.clickatell.com). clickatellFconnection.fromNumber.validator.invalid=A 'From Number' is required for sending messages to the United States +#Nexmo Fconnection +nexmo.label=Nexmo +nexmo.type.label=Nexmo Account +nexmo.name.label=Name +nexmo.api_key.label=Api Key +nexmo.api_secret.label=Api Secret +nexmo.fromNumber.label=From Number +nexmo.description=Send and receive messages through a Nexmo account +nexmo.receiveEnabled.label=Receiving Enabled +nexmo.sendEnabled.label=Sending Enabled + + # Smssync Fconnection smssync.label=SMSSync smssync.name.label=Name diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/NexmoService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/NexmoService.groovy new file mode 100644 index 000000000..607f919d4 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/NexmoService.groovy @@ -0,0 +1,51 @@ +package frontlinesms2 + +import grails.converters.JSON + +import frontlinesms2.api.* + +class NexmoService { + def apiProcess(connection, controller) { + controller.render(generateApiResponse(connection, controller) as JSON) + } + + def generateApiResponse(connection, controller) { + //if(connection.secret && controller.params.secret != connection.secret) return failure() + + try { + def payload = handleIncoming(connection, controller.params) + return [payload:payload] + } catch(FrontlineApiException ex) { + return failure(ex) + } + } + + private def handleIncoming(connection, params) { + if(!connection.receiveEnabled) throw new FrontlineApiException("Receive not enabled for this connection") + if(!params.msisdn || params.text==null) throw new FrontlineApiException('Missing one or both of `msisdn` and `text` parameters') + /* parse received JSON with the following params: + msisdn : sender of incoming message + text : incoming message + */ + sendMessageAndHeaders('seda:incoming-fmessages-to-store', + new Fmessage(inbound:true, src:params.msisdn, text:params.text), + ['fconnection-id':connection.id]) + + def response = success() + return response + } + + private def failure(FrontlineApiException ex=null) { + if(ex) { + return [payload:[success:'false', error:ex.message]] + } else { + return [payload:[success:'false']] + } + } + + private def success(additionalContent=null) { + def responseMap = [success:'true'] + if(additionalContent) responseMap += additionalContent + return responseMap + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPostProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPostProcessor.groovy new file mode 100644 index 000000000..41c0bb507 --- /dev/null +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPostProcessor.groovy @@ -0,0 +1,39 @@ +package frontlinesms2.camel.nexmo + +import frontlinesms2.* +import org.apache.camel.* +import frontlinesms2.camel.exception.* +import groovy.json.JsonSlurper + +class NexmoPostProcessor implements Processor { + public void process(Exchange exchange) throws Exception { + def log = { println "NexmoPostProcessor.process() : $it" } + log 'ENTRY' + log 'exchange:'+exchange + log "in.body:" + exchange.in.body + byte[] bytes = exchange.in.getBody(byte[].class); + log "in.body as byte[]:" + bytes + String text = new String(bytes, "UTF-8").trim(); + log "in.body as byte[] as String:" + text + def stringValue = """${text}""".replaceAll("-","_") + def slurper = new JsonSlurper() + def jsonValue = slurper.parseText(stringValue) + log "in.body as JSON:"+jsonValue + log "message count:"+jsonValue.message_count + log "message status:"+jsonValue.messages[0].status + if(jsonValue.messages.status[0] == '0'){ + log "message sent successfully" + } + else if(jsonValue.messages[0].status == '2' || jsonValue.messages[0].status == '3' || jsonValue.messages[0].status == '4') { + throw new AuthenticationException("Nexmo error: ${jsonValue.messages[0].error_text}") + } + else if(jsonValue.messages[0].status == '9') { + throw new InsufficientCreditException("Nexmo error: ${jsonValue.messages[0].error_text}") + } + else{ + throw new RuntimeException("Nexmo error: ${jsonValue.messages[0].error_text}") + } + log "in.body got as a string" + exchange.in.getBody(String.class) + log 'EXIT' + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPreProcessor.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPreProcessor.groovy new file mode 100644 index 000000000..c3f143b4d --- /dev/null +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/camel/nexmo/NexmoPreProcessor.groovy @@ -0,0 +1,41 @@ +package frontlinesms2.camel.nexmo + +import frontlinesms2.* +import org.apache.camel.* +import frontlinesms2.camel.exception.* + +class NexmoPreProcessor implements Processor { + public void process(Exchange x) throws Exception { + def log = { println "NexmoPreProcessor.process() : $it" } + log 'ENTRY' + + // URL-encode body + def d = x.in.body + x.out.headers['frontlinesms.dispatch.id'] = d.id + x.out.body = urlEncode(d.text) + + def destination = d.dst + if(destination && destination.charAt(0)=='+') destination = destination.substring(1) + set x, 'dst', destination + + // Add auth details to header + log "Calculating connection ID..." + def connectionId = x.fconnectionId + log "connectionId=$connectionId" + def connection = NexmoFconnection.get(connectionId) + log "connection=$connection" + ['api_key', 'api_secret', 'fromNumber'].each { set x, it, connection."$it" } + + log 'EXIT' + } + + private def set(Exchange x, String header, String value) { + println "PreProcessor.set() : header=$header; value=$value" + x.out.headers["nexmo.$header"] = urlEncode(value) + } + + private String urlEncode(String s) throws UnsupportedEncodingException { + println "PreProcessor.urlEncode : s=$s -> ${URLEncoder.encode(s, "UTF-8")}" + return URLEncoder.encode(s, "UTF-8"); + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPostProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPostProcessorSpec.groovy new file mode 100644 index 000000000..1952ccc41 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPostProcessorSpec.groovy @@ -0,0 +1,55 @@ +package frontlinesms2.camel.nexmo + +import spock.lang.* +import org.apache.camel.Exchange +import org.apache.camel.Message +import frontlinesms2.camel.exception.* + +class NexmoPostProcessorSpec extends Specification { + NexmoPostProcessor p = new NexmoPostProcessor() + + def 'Successful responses should do nothing exciting'() { + given: + def x = mockExchange(responseText) + when: + p.process(x) + then: + notThrown(RuntimeException) + where: + responseText << ["""{"message-count":"1","messages":[{"status":"0", "message-id":"00000123","to":"44123456789","remaining-balance":"1.10", "message-price":"0.05","network":"23410"}]}"""] + } + + def 'Error responses should trigger RuntimeException'() { + given: + def x = mockExchange(responseText) + when: + p.process(x) + then: + thrown(RuntimeException) + where: + responseText << ["""{"message-count":"1","messages":[{"error-text":"Bad Credentials","status":"4"}]}"""] + } + + @Unroll + def 'Relevant Exception should be thrown depending on the response from Nexmo Servers'() { + when: + def x = mockExchange(responseText) + p.process(x) + then: + thrown(ex) + where: + responseText | ex + """{"message-count":"1","messages":[{"status":"2","error-text":"Missing from param"}]}""" | AuthenticationException + """{"message-count":"1","messages":[{"status":"9","error-text":"Pesa hazitoshi"}]}""" | InsufficientCreditException + """{"message-count":"1","messages":[{"status":"16","error-text":"shida za muda kukimbia"}]}""" | RuntimeException + } + + private def mockExchange(httpResponseText) { + def x = Mock(Exchange) + def inMessage = Mock(Message) + inMessage.body >> httpResponseText + inMessage.getBody(byte[]) >> httpResponseText.getBytes('UTF-8') + x.in >> inMessage + return x + } +} diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy new file mode 100644 index 000000000..f6322d497 --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy @@ -0,0 +1,73 @@ +package frontlinesms2.camel.nexmo + +import spock.lang.* +import frontlinesms2.* +import frontlinesms2.camel.* + +import grails.buildtestdata.mixin.Build + +@Mock(NexmoFconnection) +@Build(NexmoFconnection) +class NexmoPreProcessorSpec extends CamelUnitSpecification { + NexmoPreProcessor p + + def setup() { + p = new NexmoPreProcessor() + } + + def 'out_body should be set to message text'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + 1 * x.out.setBody("simple") + } + + def 'out_body should be URL-encoded'() { + setup: + buildTestConnection() + def x = mockExchange("more complex") + when: + p.process(x) + then: + 1 * x.out.setBody("more+complex") + } + + def 'dispatch ID should be set in header'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + x.out.headers.'frontlinesms.dispatch.id' == '45678' + } + + def 'message destination should be set and stripped of leading plus'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + x.out.headers.'nexmo.dst' == '1234567890' + } + + def 'nexmo auth details should be set in header'() { + setup: + buildTestConnection() + def x = mockExchange("simple") + when: + p.process(x) + then: + println "x.out.headers :: ${x.out.headers}" + x.out.headers.'nexmo.api_key' == 'ufunguo' + x.out.headers.'nexmo.api_secret' == 'siri' + x.out.headers.'nexmo.fromNumber' == '123321' + } + private NexmoFconnection buildTestConnection(sendToUsa=false) { + NexmoFconnection.build(api_key:'ufunguo', api_secret:'siri',fromNumber: "123321") + } +} From cb228167167448d8e46c985515300828a2b90430 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 14 Feb 2013 10:15:27 +0300 Subject: [PATCH 0808/2668] Updated timer.js to proxy calls to setInterval, setTimeout --- plugins/frontlinesms-core/web-app/js/timer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/timer.js b/plugins/frontlinesms-core/web-app/js/timer.js index c79a1ae98..d5e2a6092 100644 --- a/plugins/frontlinesms-core/web-app/js/timer.js +++ b/plugins/frontlinesms-core/web-app/js/timer.js @@ -1,5 +1,5 @@ timer = { - setInterval:setInterval, - setTimeout:setTimeout + setInterval:function(a, b, c, d) { setInterval(a, b, c, d); }, + setTimeout:function(a, b, c, d) { setTimeout(a, b, c, d); } }; From 62445b30ee9d02cde36534708e09667a1435b534 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 14 Feb 2013 10:16:26 +0300 Subject: [PATCH 0809/2668] Added app_info.js to CoreResources --- plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index bddb8c151..81b344cae 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -24,6 +24,8 @@ modules = { resource url:[dir:'css', file:'help.css'] resource url:[dir:'js', file:'frontlinesms_core.js'], disposition:'head' + resource url:[dir:'js', file:'timer.js'], disposition:'head' + resource url:[dir:'js', file:'app_info.js'], disposition:'head' resource url:[dir:'js', file:'activity/popups.js'], disposition:'head' resource url:[dir:'js', file:'activity/poll/poll.js'], disposition:'head' resource url:[dir:'js', file:'activity/webconnection/webconnection.js'], disposition:'head' @@ -43,7 +45,6 @@ modules = { resource url:[dir:'js', file:'smallPopup.js'], disposition:'head' resource url:[dir:'js', file:'status_indicator.js'], disposition:'head' resource url:[dir:'js', file:'system_notification.js'], disposition:'head' - resource url:[dir:'js', file:'timer.js'], disposition:'head' resource url:[dir:'js', file:'magicwand.js'], disposition:'head' resource url:[dir:'js', file:'selectmenuTools.js'], disposition:'head' resource url:[dir:'js', file:'activity/popupCustomValidation.js'], disposition:'head' From 92e5ad20c5155aa1375c196d9208f35af375fde7 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 14 Feb 2013 10:24:04 +0300 Subject: [PATCH 0810/2668] save incoming message with the timestamp as the current date --- .../services/frontlinesms2/SmppTranslationService.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy index c2e3b2937..c7d4d3aa0 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy @@ -23,11 +23,13 @@ class SmppTranslationService implements Processor { def messageBody = i.body log "###### If the Source and Date are not available ## Fake ones will be set +999999999 and 1306142323 ######" def messageSource = i.headers['CamelSmppSourceAddr']?:'+999999999' - def messageDate = i.headers['CamelSmppDoneDate']?:'1306142323' + log "###### message-timestamp ${i.headers['CamelSmppDoneDate']}" + def messageDate = i.headers['CamelSmppDoneDate']?:'0000000000' message.src = messageSource message.text = messageBody - message.date = Date.parse("YYMMDDhhmm",messageDate) + //TODO pick the value from Exchange + message.date = new Date()//Date.parse("YYMMDDhhmm",messageDate) log "message source is ${message.src}" log "message body is ${message.text}" From 35633ad58ec74b3f88b3f892c9ff5bbeb28bf4c2 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 14 Feb 2013 10:31:19 +0300 Subject: [PATCH 0811/2668] Modified app_info.js to wrap submit data in an object. --- plugins/frontlinesms-core/test/js/app_info_tests.js | 8 ++++---- plugins/frontlinesms-core/web-app/js/app_info.js | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/test/js/app_info_tests.js b/plugins/frontlinesms-core/test/js/app_info_tests.js index 3992115fa..e7e839402 100644 --- a/plugins/frontlinesms-core/test/js/app_info_tests.js +++ b/plugins/frontlinesms-core/test/js/app_info_tests.js @@ -68,7 +68,7 @@ test("Interested data with implicit frequency should be requested on every call" equal(ajax_spy.requestCount(), 3); for(i=2; i>=0; --i) { - notEqual(ajax_spy.getRequest(i).data.indexOf("asdf"), -1); + notEqual(ajax_spy.getRequest(i).data.interest.indexOf("asdf"), -1); } }); @@ -83,9 +83,9 @@ test("Interested data with explicit frequency should only be requested when nece // then equal(ajax_spy.requestCount(), 3); - equal(ajax_spy.getRequest(0).data.indexOf("asdf"), -1); - notEqual(ajax_spy.getRequest(1).data.indexOf("asdf"), -1); - equal(ajax_spy.getRequest(2).data.indexOf("asdf"), -1); + equal(ajax_spy.getRequest(0).data.interest.indexOf("asdf"), -1); + notEqual(ajax_spy.getRequest(1).data.interest.indexOf("asdf"), -1); + equal(ajax_spy.getRequest(2).data.interest.indexOf("asdf"), -1); }); test("Multiple requests for the same data should throw an exception", function() { diff --git a/plugins/frontlinesms-core/web-app/js/app_info.js b/plugins/frontlinesms-core/web-app/js/app_info.js index 12cae3e52..ef39b2e8b 100644 --- a/plugins/frontlinesms-core/web-app/js/app_info.js +++ b/plugins/frontlinesms-core/web-app/js/app_info.js @@ -25,7 +25,7 @@ app_info = (function() { requestData.push(c.interest); } } - $.getJSON(url_root + "appInfo", requestData, callbackProcessor); + $.getJSON(url_root + "appInfo", { interest:requestData }, callbackProcessor); }, listen = function(interestedIn, fCallback, callback) { if(!callback) { @@ -39,6 +39,7 @@ app_info = (function() { } callbacks.push({ interest:interestedIn, frequency:fCallback, callback:callback }); }; + return { init:init, listen:listen }; }()); From 9fe5c7dc59a1ffc4803c2ec630fd7f721316681a Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 14 Feb 2013 10:38:12 +0300 Subject: [PATCH 0812/2668] Updated the version of core that radio depends on and updated help controller --- .../grails-app/controllers/frontlinesms2/HelpController.groovy | 2 -- plugins/radio/RadioGrailsPlugin.groovy | 2 +- plugins/radio/application.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index a2e370d38..df3e14b29 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -18,11 +18,9 @@ class HelpController extends ControllerUtils { // make sure that this is restricted to configured plugins def pluginManager = PluginManagerHolder.pluginManager def plugin = pluginManager.allPlugins.find { plugin -> - println "checking::: $plugin ::: ${suppliedPluginName == 'frontlinesms-core' && plugin.name.startsWith('frontlinesmsCore')}" suppliedPluginName == 'frontlinesms-core' && plugin.name.startsWith('frontlinesmsCore') || plugin.name == suppliedPluginName } - println "plugin::: ${plugin.descriptor}" def pluginDir = plugin.descriptor?.file?.parentFile // FIXME this is open to injection attacks def markdownFile diff --git a/plugins/radio/RadioGrailsPlugin.groovy b/plugins/radio/RadioGrailsPlugin.groovy index 391dbb034..f3efd65a6 100644 --- a/plugins/radio/RadioGrailsPlugin.groovy +++ b/plugins/radio/RadioGrailsPlugin.groovy @@ -7,7 +7,7 @@ class RadioGrailsPlugin { // the version or versions of Grails the plugin is designed for def grailsVersion = "2.0.3 > *" // the other plugins this plugin depends on - def dependsOn = [core:"0.4-SNAPSHOT > *"] + def dependsOn = [core:"3.0-SNAPSHOT > *"] // resources that are excluded from plugin packaging // def pluginExcludes = ["grails-app/views/error.gsp"] diff --git a/plugins/radio/application.properties b/plugins/radio/application.properties index 0aba6116d..82d2fbb42 100644 --- a/plugins/radio/application.properties +++ b/plugins/radio/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Thu Jul 26 14:37:07 EAT 2012 +#Wed Feb 13 17:58:33 EAT 2013 app.grails.version=2.0.3 app.name=radio app.servlet.version=2.5 From 36834f50e742ec4d2b8198c72ebf9a14d5817422 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 14 Feb 2013 10:46:42 +0300 Subject: [PATCH 0813/2668] Udpated AppInfo service and controller in line with changes to data submission format. --- .../frontlinesms2/AppInfoController.groovy | 13 ++++++++++--- .../frontlinesms2/AppInfoService.groovy | 2 +- .../controller/AppInfoControllerISpec.groovy | 18 +++++------------- .../services/AppInfoServiceSpec.groovy | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy index 2cd894ed1..02f9b2363 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy @@ -6,13 +6,20 @@ class AppInfoController { def appInfoService def index() { - render request.JSON.collectEntries { key -> + render getInterest().collectEntries { key -> [(key):appInfoService.provide(key, this)] } as JSON } - private def listDetected() { - detectedDevices:deviceDetectionService.detected + private def getInterest() { + def interest = params.'interest[]' + if(!interest) { + return [] + } + if(interest instanceof String) { + return [interest] + } + return interest } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy index d11e2d3d7..ddef64607 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy @@ -16,7 +16,7 @@ class AppInfoService { synchronized(this) { provider = providers[key] } - return provider.call(controller) + return provider.call(grailsApplication, controller) } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy index 8e07b289d..e18f4f046 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy @@ -1,14 +1,13 @@ package frontlinesms2.controller import frontlinesms2.* -import spock.lang.* - import grails.converters.JSON +import org.codehaus.groovy.grails.commons.DefaultGrailsApplication +import spock.lang.* class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { - private static final String JSON_MIME_TYPE = 'application/json' - def controller + def mockApp def service def setup() { @@ -20,11 +19,8 @@ class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { def 'appInfoService should be called with request for relevant data (0 requested items)'() { given: def requestData = [] - controller.request.format = JSON_MIME_TYPE - controller.request.JSON = (requestData as JSON).toString() when: def response = controller.index() - println response then: 0 * _ JSON.parse(controller.response.contentAsString).keySet().sort() == requestData @@ -33,11 +29,9 @@ class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { def 'appInfoService should be called with request for relevant data (1 requested item)'() { given: def requestData = ['devices'] - controller.request.format = JSON_MIME_TYPE - controller.request.JSON = (requestData as JSON).toString() + controller.params['interest[]'] = 'devices' when: def response = controller.index() - println response then: 1 * service.provide('devices', controller) 0 * _ @@ -47,11 +41,9 @@ class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { def 'appInfoService should be called with request for relevant data (2 requested items)'() { given: def requestData = ['devices', 'gribbles'] - controller.request.format = JSON_MIME_TYPE - controller.request.JSON = (requestData as JSON).toString() + controller.params['interest[]'] = requestData when: def response = controller.index() - println response then: 1 * service.provide('devices', controller) 1 * service.provide('gribbles', controller) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy index e81800806..8279dc906 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AppInfoServiceSpec.groovy @@ -36,12 +36,12 @@ class AppInfoServiceSpec extends Specification { when: service.provide('a', mockController) then: - 1 * a.call(mockController) + 1 * a.call(service.grailsApplication, mockController) 0 * _ when: service.provide('b', mockController) then: - 1 * b.call(mockController) + 1 * b.call(service.grailsApplication, mockController) 0 * _ } From c7cf9f8ff7b248fd0d0f34900d31aeac51267d11 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 14 Feb 2013 11:15:47 +0300 Subject: [PATCH 0814/2668] Converted device detection list to use app_info. --- .../grails-app/conf/CoreBootStrap.groovy | 13 +++++----- .../frontlinesms2/StatusController.groovy | 4 ---- .../grails-app/views/_includes.gsp | 1 + .../views/status/_device_detection.gsp | 24 +++++++++++++++++++ .../grails-app/views/status/show.gsp | 11 ++------- .../frontlinesms2/CoreAppInfoProviders.groovy | 10 ++++++++ 6 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 3c0067a61..4b4615148 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -20,6 +20,7 @@ import org.codehaus.groovy.grails.commons.ApplicationHolder class CoreBootStrap { def applicationContext + def appInfoService def appSettingsService def grailsApplication def deviceDetectionService @@ -92,6 +93,7 @@ class CoreBootStrap { ensureResourceDirExists() deviceDetectionService.init() failPendingMessagesService.init() + CoreAppInfoProviders.registerAll(appInfoService) activateActivities() println '\\o/ FrontlineSMS started.' } @@ -627,14 +629,13 @@ YOU HAVE A COMPATIBLE SERIAL LIBRARY INSTALLED.''' private def setCustomJSONRenderers() { JSON.registerObjectMarshaller(Announcement) { - def returnArray = [:] - returnArray['id'] = it.id - returnArray['dateCreated'] = it.dateCreated - returnArray['name'] = it.name - returnArray['sentMessageText'] = it.sentMessageText - return returnArray + [id:it.id, dateCreated:it.dateCreated, name:it.name, sentMessageText:it.sentMessageText] + } + JSON.registerObjectMarshaller(DetectedDevice) { + [port:it.port, description:it.description, lockType:it.lockType] } } + private setDefaultMessageRoutingPreferences(){ if(!appSettingsService.get('routing.preferences.edited') || (appSettingsService.get('routing.preferences.edited') == false)){ println "### Changing Routing preferences ###" diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy index 04b2be7ed..493a6a190 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy @@ -25,10 +25,6 @@ class StatusController extends ControllerUtils { redirect action:'show' } - def listDetected() { - fsms.render template:'device_detection', model:[detectedDevices:deviceDetectionService.detected] - } - def resetDetection() { deviceDetectionService.reset() redirect action:'index' diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 19c26fcd9..af1deb723 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -29,6 +29,7 @@ return translated; } + app_info.init(); var systemNotification = new SystemNotification(); var statusIndicator = new StatusIndicator(); // declare vars that are populated in JS files diff --git a/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp b/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp index 453512700..9e27ddfd9 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp @@ -15,6 +15,7 @@ + <%-- TODO once functionality is merged, include the following as a template --%> @@ -25,3 +26,26 @@
              ${d.port} ${d.description}
            + +<%-- TODO once functionality is merged, include the following as a template with type=sanchez --%> + + + + app_info.listen("device_detection", function(data) { + var table; + if(!data.device_detection) return; + + table = $("#detected-devices tbody"); + table.empty(); + $.each(data.device_detection, function(i, d) { + sanchez.append(table, "detected-device-detail", d); + }); + }); + + diff --git a/plugins/frontlinesms-core/grails-app/views/status/show.gsp b/plugins/frontlinesms-core/grails-app/views/status/show.gsp index 5fae79c49..5bb944bb7 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/show.gsp @@ -14,15 +14,8 @@
          - setInterval(refreshDevices, 10000); - - function refreshDevices() { - $.get(url_root + 'status/listDetected', function(data) { - $('#device-detection').replaceWith($(data)); - }); - } - - $("#time-filters").delegate("select", "change", function(){ + // TODO should this be bind()/on() instead of delegate? + $("#time-filters").delegate("select", "change", function() { $('input[name="rangeOption"]').prop('checked', true); }); diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy new file mode 100644 index 000000000..c483f0e17 --- /dev/null +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -0,0 +1,10 @@ +package frontlinesms2 + +class CoreAppInfoProviders { + static void registerAll(AppInfoService s) { + s.registerProvider('device_detection') { app, controller -> + app.mainContext.deviceDetectionService.detected + } + } +} + From 28d38b128b059de9dbef453099ac5bf1419dd673 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 14 Feb 2013 11:03:15 +0300 Subject: [PATCH 0815/2668] helpText image links are now updated depending on the plugin specified --- .../grails-app/controllers/frontlinesms2/HelpController.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index df3e14b29..3df71d686 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -29,7 +29,6 @@ class HelpController extends ControllerUtils { } else { markdownFile = new File("web-app/help/${params.helpSection}.txt") } - println "markdownFile::: $markdownFile" if (markdownFile.canRead()) { helpText = markdownFile.text } From 66346328f546dc568f239f4ad9cd099021a6b79b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 7 Feb 2013 21:51:38 +0300 Subject: [PATCH 0816/2668] Added FIXMEs and TODOs; removed unnecessary `transactional=true` from service. --- .../frontlinesms2/CustomActivityService.groovy | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index 319323ee8..06da343f9 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -4,9 +4,12 @@ import org.codehaus.groovy.grails.web.json.JSONArray import org.codehaus.groovy.grails.web.json.JSONObject class CustomActivityService { - static transactional = true - - + /* TODO if you do insist on committing printlns, please make sure they are neat and make sense when + reading them on the console. E.g. include the class and method name at the start, make them precise. + Things like the following are not helpful: + println "<<<>>>" + println "$it" + */ def saveInstance(customActivity, params) { println "customActivity Params ::${params}" def steps = new JSONArray(params.jsonToSubmit) @@ -21,6 +24,7 @@ class CustomActivityService { } println "##Just about to save" + // FIXME why are there multiple saves here? customActivity.save(flush:true, failOnError:true) println "##Just saved round 1" @@ -37,7 +41,8 @@ class CustomActivityService { } println "# 2 ######### Saving Round 2 # $customActivity.errors.allErrors" - customActivity.save(failOnError:true,flush:true) + // FIXME why are there multiple saves here? + customActivity.save(failOnError:true, flush:true) } private getSteps(steps) { From f69df99f2688e2883fbd932bfadab8cb23856783 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 8 Feb 2013 15:38:45 +0300 Subject: [PATCH 0817/2668] Add magic wand functionality to custom activity wizard --- .../grails-app/views/customactivity/_config.gsp | 2 +- .../grails-app/views/customactivity/steps/_reply.gsp | 3 ++- .../web-app/js/activity/custom_activity.js | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp index 0b57ad33e..86d4bc673 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_config.gsp @@ -5,7 +5,7 @@
          - +
          diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp index 3dd6acc0e..613399eb5 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp @@ -1,4 +1,5 @@ - + + diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index cae03ad70..d9407f2f1 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -1,8 +1,9 @@ var custom_activity = (function() { var CONFIG_CONTAINER = "#custom-activity-config-container", + random = function() { return Math.floor(Math.random() * 9007199254740992) }, addStep = function(stepName) { - sanchez.append(CONFIG_CONTAINER, "step-" + stepName, { stepId:'', groupId:'', autoreplyText:'' }); + sanchez.append(CONFIG_CONTAINER, "step-" + stepName, { stepId:'', groupId:'', autoreplyText:'', random:random() }); initSteps(); }, removeStep = function() { @@ -13,6 +14,7 @@ var custom_activity = (function() { var titles, widths, maxWidth; $(CONFIG_CONTAINER + " .step .remove-command").click(removeStep); selectmenuTools.initAll(CONFIG_CONTAINER + " select"); + magicwand.init($(CONFIG_CONTAINER + " select[id^='magicwand-select']")); // calculate the length of the longest title here // and force other steps to conform to that... @@ -134,19 +136,18 @@ var customActivityDialog = (function(){ groupValue = $(element).find('select[name=group]').val(); groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text(); output = i18n("customactivity.join.description", groupName); - output = "

          "+output+"

          "; } if(stepType === "leave") { groupValue = $(element).find('select[name=group]').val(); groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text(); output = i18n("customactivity.leave.description", groupName); - output = "

          "+output+"

          "; } if(stepType === "reply") { messageText = $(element).find('textarea[name=autoreplyText]').val(); + console.log(messageText); output = i18n("customactivity.reply.description", messageText); - output = "

          "+output+"

          "; } + output = "

          "+output+"

          "; container.append(output); }); From 5e42e5c01234727958eede10b48db1c01091b061 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 11 Feb 2013 13:17:23 +0300 Subject: [PATCH 0818/2668] Refactored custom activity JS to make collecting forms data simpler. --- .../grails-app/views/customactivity/_step.gsp | 4 +- .../views/customactivity/steps/_join.gsp | 2 +- .../views/customactivity/steps/_leave.gsp | 2 +- .../views/customactivity/steps/_reply.gsp | 2 +- .../web-app/js/activity/custom_activity.js | 120 +++++++----------- 5 files changed, 53 insertions(+), 77 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/_step.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/_step.gsp index 7abb019b2..6ce67b52f 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/_step.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/_step.gsp @@ -1,8 +1,8 @@

        • - - + + ${body()}
          • diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp index ea2ef4d1f..99c9e6f85 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_join.gsp @@ -5,6 +5,6 @@ from="${Group.getAll()}" value="${groupId}" optionKey="id" optionValue="name" - class="notnull"/> + class="customactivity-field notnull"/> diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp index 74c070d45..14fa4ea6e 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_leave.gsp @@ -5,6 +5,6 @@ from="${Group.getAll()}" value="${groupId}" optionKey="id" optionValue="name" - class="notnull"/> + class="customactivity-field notnull"/> diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp index 613399eb5..fef607fa3 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp @@ -1,5 +1,5 @@ - + diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index d9407f2f1..60439b3b7 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -1,9 +1,9 @@ var custom_activity = (function() { var CONFIG_CONTAINER = "#custom-activity-config-container", - random = function() { return Math.floor(Math.random() * 9007199254740992) }, + random = function() { return Math.floor(Math.random() * 9007199254740992); }, addStep = function(stepName) { - sanchez.append(CONFIG_CONTAINER, "step-" + stepName, { stepId:'', groupId:'', autoreplyText:'', random:random() }); + sanchez.append(CONFIG_CONTAINER, "step-" + stepName, { stepId:'', groupId:"", autoreplyText:"", random:random() }); initSteps(); }, removeStep = function() { @@ -18,7 +18,7 @@ var custom_activity = (function() { // calculate the length of the longest title here // and force other steps to conform to that... - titles = $(CONFIG_CONTAINER + " .step:not(.reply) h4") + titles = $(CONFIG_CONTAINER + " .step:not(.reply) h4"); widths = titles.map(function() { return $(this).width(); }); maxWidth = Math.max.apply(null, widths.get()); titles.map(function() { $(this).width(maxWidth); }); @@ -39,9 +39,10 @@ var custom_activity = (function() { }; }()); +// TODO this can probably be combined with custom_activity var customActivityDialog = (function(){ var - _addValidationRules = function() { + addValidationRules = function() { var validator = $("#create_customactivity").validate({ errorContainer: ".error-panel", @@ -55,7 +56,7 @@ var customActivityDialog = (function(){ }), keyWordTabValidation = function() { if(!isGroupChecked("blankKeyword")){ - return validator.element('#keywords'); + return validator.element("#keywords"); } return true; }, @@ -74,101 +75,76 @@ var customActivityDialog = (function(){ return valid; }, confirmTabValidation = function() { - customActivityDialog.setJsonToSend(); - return validator.element('input[name=name]'); + setJsonToSend(); + return validator.element("input[name=name]"); }; customValidationForGroups(); - mediumPopup.addValidation('activity-generic-sorting', keyWordTabValidation); - mediumPopup.addValidation('customactivity-config', stepActionsValidation); - mediumPopup.addValidation('customactivity-confirm', confirmTabValidation); + mediumPopup.addValidation("activity-generic-sorting", keyWordTabValidation); + mediumPopup.addValidation("customactivity-config", stepActionsValidation); + mediumPopup.addValidation("customactivity-confirm", confirmTabValidation); }, - _setJsonToSend = function() { - var jsonToSend = "", data = []; - $.each($("li.step"), function(index, element){ - var dataToSend = {}, - stepDiv = $(element); - dataToSend.stepId = stepDiv.attr("index"); - dataToSend.stepType = stepDiv.find("#stepType").val(); - if(stepDiv.find("input").size() > 0) { - dataToSend.stepProperties = getStepProperties("input", stepDiv); - } - - if(stepDiv.find("textarea").size() > 0) { - dataToSend.stepProperties = getStepProperties("textarea", stepDiv); - } - - if(stepDiv.find("select").size() > 0) { - dataToSend.stepProperties = getStepProperties("select", stepDiv); - } - - data.push(dataToSend); - }); + setJsonToSend = function() { + var data = $("li.step").map(function(index, element) { + return getStepProperties("select.customactivity-field,input.customactivity-field,textarea.customactivity-field", + $(element)); + }).get(); $("#jsonToSubmit").val(JSON.stringify(data)); }, - getStepProperties = function(inputType, container) { - var stepProperties = []; - - $.each(container.find(inputType), function(index, element) { - var inputField = $(element), - key = inputField.attr("name"), - value = inputField.val(), - property = {}; - property.key = key; - property.value = value; - stepProperties.push(property); + getStepProperties = function(fieldSelecter, container) { + var data = {}; + container.find(fieldSelecter).each(function(index, field) { + field = $(field); + data[field.attr("name")] = field.val(); }); - - return stepProperties; + return data; }, updateConfirmationMessage = function() { var container, keywords; - container = $('#customactivity-confirm-action-steps'); + container = $("#customactivity-confirm-action-steps"); container.html(""); - $.each($(".step"), function(index, element) { - var groupName, groupValue, messageText, output, stepType; - output = ""; - stepType = $(element).find('input#stepType').val(); - if(stepType === 'join') { - groupValue = $(element).find('select[name=group]').val(); - groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text(); - output = i18n("customactivity.join.description", groupName); - } - if(stepType === "leave") { - groupValue = $(element).find('select[name=group]').val(); - groupName = $(element).find('select[name=group]').find("option[value="+groupValue+"]").text(); - output = i18n("customactivity.leave.description", groupName); + $.each($("#custom-activity-config-container .step"), function(index, element) { + var groupValue, output, stepType; + element = $(element); + stepType = element.find("input[name=stepType]").val(); + if(stepType === "join" || stepType === "leave") { + detail = element.find("select[name=group] option:selected").text(); + } else if(stepType === "reply") { + detail = element.find("textarea[name=autoreplyText]").val(); } - if(stepType === "reply") { - messageText = $(element).find('textarea[name=autoreplyText]').val(); - console.log(messageText); - output = i18n("customactivity.reply.description", messageText); - } - output = "

          "+output+"

          "; + alert("Step type: " + stepType); + output = "

          " + + i18n("customactivity." + stepType + ".description", detail) + + "

          "; container.append(output); }); - if(!(isGroupChecked("blankKeyword"))){ - keywords = $('#keywords').val().toUpperCase(); - $("#keyword-confirm").html('

          ' + keywords + '

          '); + sortingType = $("input[name=sorting]:checked").val(); + if(sortingType === "enabled") { + keywords = $("#keywords").val().toUpperCase(); + } else if (sortingType === "global") { + keywords = i18n("autoreply.blank.keyword"); } else { - $("#keyword-confirm").html('

          ' + i18n("autoreply.blank.keyword") + '

          '); + alert("please define i18n message for this sorting option"); } + $("#keyword-confirm").html("

          " + keywords + "

          "); }; return { - addValidationRules:_addValidationRules, - setJsonToSend:_setJsonToSend + addValidationRules:addValidationRules }; }()); +// FIXME this function should NOT be global function refreshPageWithStepMessages(c) { - if($(c).val() === 'na') { + var val = $(c).val(); + if(val === "na") { window.location = url_root + "message/activity/" + more_actions.getOwnerId(); } else { - window.location = url_root + "message/activity/" + more_actions.getOwnerId() +"/step/"+$(c).val(); + window.location = url_root + "message/activity/" + more_actions.getOwnerId() + "/step/" + val; } } + From 8ea7a127c616dce19f98b6db30d0bb2245f29b2a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 11 Feb 2013 13:18:36 +0300 Subject: [PATCH 0819/2668] Removed alert from JS. --- .../frontlinesms-core/web-app/js/activity/custom_activity.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index 60439b3b7..b1160a746 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -115,7 +115,6 @@ var customActivityDialog = (function(){ } else if(stepType === "reply") { detail = element.find("textarea[name=autoreplyText]").val(); } - alert("Step type: " + stepType); output = "

          " + i18n("customactivity." + stepType + ".description", detail) + "

          "; @@ -128,7 +127,7 @@ var customActivityDialog = (function(){ } else if (sortingType === "global") { keywords = i18n("autoreply.blank.keyword"); } else { - alert("please define i18n message for this sorting option"); + alert("please define i18n message for this sorting option"); // FIXME } $("#keyword-confirm").html("

          " + keywords + "

          "); }; From 16bad2b31e1a5a1598bde9606bc62ebdd6288b97 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Tue, 12 Feb 2013 16:02:49 +0300 Subject: [PATCH 0820/2668] Set styling for magic wand in custom activity wizard Conflicts: plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp --- .../views/customactivity/steps/_reply.gsp | 33 +++++++++++++++++-- .../web-app/css/activity/customactivity.css | 5 ++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp index fef607fa3..571f68795 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp @@ -1,5 +1,32 @@ - - - +<%-- + + $("textarea[id^=autoreplyText]").live("keyup", updateSmsCharacterCount); + $("textarea[id^=autoreplyText]").live("focus", function() { + $(this).siblings(".controls").show(300); + magicwand.reset($(this).siblings(".controls").find("select")); + }); + $("textarea[id^=autoreplyText]").live('blur', function() { + console.log($(this)); + $(this).siblings('.controls').hide(300); + }); + +--%> diff --git a/plugins/frontlinesms-core/web-app/css/activity/customactivity.css b/plugins/frontlinesms-core/web-app/css/activity/customactivity.css index d219693ad..5fe3ed969 100644 --- a/plugins/frontlinesms-core/web-app/css/activity/customactivity.css +++ b/plugins/frontlinesms-core/web-app/css/activity/customactivity.css @@ -6,4 +6,7 @@ #custom-activity-config-container .step textarea { display:block; width:98%; } #custom-activity-config-container .step h4 { display:inline-block; padding-left:2px; } #custom-activity-config-container .step.reply h4 { display:block; } - +#custom-activity-config-container .step.reply .controls .magicwand-container a { text-align:right; } +#custom-activity-config-container .step.reply .controls .magicwand-container { visibility:visible; } +#custom-activity-config-container .step.reply .controls.hidden { display:none; } +#custom-activity-config-container .step.reply div.input { margin: 0; padding: 0; } From 1babfa4dac9ee669f071646081f63f6e5918efcc Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Tue, 12 Feb 2013 16:03:26 +0300 Subject: [PATCH 0821/2668] Add messageComposer to taglib --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index fe13d07c6..293a85702 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -443,6 +443,16 @@ class FsmsTagLib { out << g.select(att, body) } + def messageComposer = { att, body -> + out << '
          ' + // + def placeholder = g.message(code:att.placeholder) + out << g.textArea(name:att.name, value:att.value, placeholder:placeholder, rows:att.rows?:"3") + def magicWandAttributes = [controller:att.controller, target:att.target, fields:att.fields, hidden:false] + out << magicWand(magicWandAttributes) + out << '
          ' + } + def step = { att, body -> out << render(template:'/customactivity/step', model:[stepId:att.stepId, type:att.type, body:body]) } From 0c597fb497361abd06f155a025395a74c2d720d5 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 13 Feb 2013 10:36:57 +0300 Subject: [PATCH 0822/2668] Use messageComposer in custom activity wizard. --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 16 ++++++++-- .../views/customactivity/steps/_reply.gsp | 14 +++++++- .../web-app/css/controls.css | 32 +++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 293a85702..4aa25d756 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -447,9 +447,19 @@ class FsmsTagLib { out << '
          ' // def placeholder = g.message(code:att.placeholder) - out << g.textArea(name:att.name, value:att.value, placeholder:placeholder, rows:att.rows?:"3") - def magicWandAttributes = [controller:att.controller, target:att.target, fields:att.fields, hidden:false] - out << magicWand(magicWandAttributes) + out << g.textArea( + name:att.name, + value:att.value, + placeholder:placeholder, + rows:att.rows?:"3", + id:att.textAreaId) + + out << '
          ' + def magicWandAttributes = [controller:att.controller, target:att.target, fields:att.fields, hidden:false] + out << magicWand(magicWandAttributes) + out << '
          ' + out << '
          ' + out << '
          ' } diff --git a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp index 571f68795..1c541d01f 100644 --- a/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp +++ b/plugins/frontlinesms-core/grails-app/views/customactivity/steps/_reply.gsp @@ -1,6 +1,6 @@
          - + <%--
          @@ -17,6 +17,18 @@ --%>
          + + + $(function() { + $('.message-composer').live('focus', function() { + $(this).addClass('focus'); + }); + + $('.message-composer').live('blur', function() { + $(this).removeClass('focus'); + }); + }); + <%-- $("textarea[id^=autoreplyText]").live("keyup", updateSmsCharacterCount); diff --git a/plugins/frontlinesms-core/web-app/css/controls.css b/plugins/frontlinesms-core/web-app/css/controls.css index 8ee7ce8a7..8ac19876b 100644 --- a/plugins/frontlinesms-core/web-app/css/controls.css +++ b/plugins/frontlinesms-core/web-app/css/controls.css @@ -97,3 +97,35 @@ input[type="text"].search{ background-image:url('../images/icons/search.png'); .remove-command:hover { background-image:url('../images/icons/remove_hover.png'); } .remove-command.hidden { display:none; } +.message-composer { + border: 1px solid rgb(187, 187, 187); + padding: 0; + margin: 10px 0; +} +.message-composer.focus { + outline-color: rgb(60, 59, 55); + outline-style: auto; + outline-width: 5px; +} +.message-composer textarea { + resize: none; + border: none; + outline: none; + display:inline-block !important; + margin: 0; + max-width: 90%; +} + +.message-composer .controls { + display:inline-block !important; + max-width: 10%; + float: right; +} + +div.message-composer .controls .magicwand-container a{ + margin: 0 !important; +} + +.message-composer .clearfix { + clear: both; +} From 1cc6162965c693ab1fd334574f5332ff11b98b73 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 13 Feb 2013 10:50:26 +0300 Subject: [PATCH 0823/2668] Fix positioning of controls in the message composer --- plugins/frontlinesms-core/web-app/css/controls.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/css/controls.css b/plugins/frontlinesms-core/web-app/css/controls.css index 8ac19876b..c6c09e471 100644 --- a/plugins/frontlinesms-core/web-app/css/controls.css +++ b/plugins/frontlinesms-core/web-app/css/controls.css @@ -99,7 +99,7 @@ input[type="text"].search{ background-image:url('../images/icons/search.png'); .message-composer { border: 1px solid rgb(187, 187, 187); - padding: 0; + padding: 5px; margin: 10px 0; } .message-composer.focus { @@ -120,6 +120,8 @@ input[type="text"].search{ background-image:url('../images/icons/search.png'); display:inline-block !important; max-width: 10%; float: right; + margin: 0 !important; + padding: 0 !important; } div.message-composer .controls .magicwand-container a{ From d28454fa32b702affd73f2060a51be1d1fa9a788 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 13 Feb 2013 11:37:43 +0300 Subject: [PATCH 0824/2668] Add autosize plugin and message_composer javascript library to resources. --- .../grails-app/conf/CoreResources.groovy | 2 ++ .../web-app/js/jquery.autosize-min.js | 7 +++++++ .../frontlinesms-core/web-app/js/message_composer.js | 11 +++++++++++ 3 files changed, 20 insertions(+) create mode 100644 plugins/frontlinesms-core/web-app/js/jquery.autosize-min.js create mode 100644 plugins/frontlinesms-core/web-app/js/message_composer.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 6d1efd294..ce9f565e8 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -49,6 +49,8 @@ modules = { resource url:[dir:'js', file:'selectmenuTools.js'], disposition:'head' resource url:[dir:'js', file:"activity/popupCustomValidation.js"], disposition:'head' resource url:[dir:'js', file:'/settings/connectionTooltips.js'] + resource url:[dir:'js', file:'jquery.autosize-min.js'] + resource url:[dir:'js', file:'message_composer.js'] resource url:[dir:'js', file:"guiders-1.2.8.js"], disposition:'head' resource url:[dir:'css', file:"guiders-1.2.8.css"], disposition:'head' diff --git a/plugins/frontlinesms-core/web-app/js/jquery.autosize-min.js b/plugins/frontlinesms-core/web-app/js/jquery.autosize-min.js new file mode 100644 index 000000000..37a900a4a --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/jquery.autosize-min.js @@ -0,0 +1,7 @@ +/* + jQuery Autosize v1.16.5 + (c) 2013 Jack Moore - jacklmoore.com + updated: 2013-02-11 + license: http://www.opensource.org/licenses/mit-license.php +*/ +(function(e){var t,o={className:"autosizejs",append:"",callback:!1},i="hidden",n="border-box",s="lineHeight",a=' +
          +
          0
          +
          +
          +
          +
          +
          + + From b9a7b32a169abf97922be72682c2f64d07a713da Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 14:57:55 +0300 Subject: [PATCH 0855/2668] Move message composer test files to comply with convention --- .../{message_composer_tests.html => standard.html} | 0 .../test/js/{message_composer => }/message_composer_tests.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename plugins/frontlinesms-core/test/js/message_composer/{message_composer_tests.html => standard.html} (100%) rename plugins/frontlinesms-core/test/js/{message_composer => }/message_composer_tests.js (100%) diff --git a/plugins/frontlinesms-core/test/js/message_composer/message_composer_tests.html b/plugins/frontlinesms-core/test/js/message_composer/standard.html similarity index 100% rename from plugins/frontlinesms-core/test/js/message_composer/message_composer_tests.html rename to plugins/frontlinesms-core/test/js/message_composer/standard.html diff --git a/plugins/frontlinesms-core/test/js/message_composer/message_composer_tests.js b/plugins/frontlinesms-core/test/js/message_composer_tests.js similarity index 100% rename from plugins/frontlinesms-core/test/js/message_composer/message_composer_tests.js rename to plugins/frontlinesms-core/test/js/message_composer_tests.js From 530621e9a77162edf6181136efd6719b6d62d6be Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 15:43:59 +0300 Subject: [PATCH 0856/2668] Fix message composer test JS --- plugins/frontlinesms-core/test/js/message_composer_tests.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/js/message_composer_tests.js b/plugins/frontlinesms-core/test/js/message_composer_tests.js index 06f9aa7a6..1df442b86 100644 --- a/plugins/frontlinesms-core/test/js/message_composer_tests.js +++ b/plugins/frontlinesms-core/test/js/message_composer_tests.js @@ -1,11 +1,12 @@ QUnit.module("message_composer"); -function setUp() { - dom_trix.initDomFromFile("test/js/message_composer/message_composer_test.html"); +function setup() { + dom_trix.initDomFromFile("test/js/message_composer/standard.html"); window.messageComposerUtils = messageComposerUtils; } test("messageComposerUtils.getCharacterCount should return the number of characters in the textarea of a messageComposer", function() { + setup(); var messageComposerInstance = $('.message-composer')[0], charCount = messageComposerUtils.getCharacterCount($(messageComposerInstance)); equal(charCount, 17); From 52fad147fc2397ca5f1ada2935351583b4f2b446 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 15 Feb 2013 15:49:24 +0300 Subject: [PATCH 0857/2668] fixed bug where the Fmessage.getOWnerDetail failed to get the detail --- .../domain/frontlinesms2/Fmessage.groovy | 16 +++++++++----- .../frontlinesms2/AutoreplyService.groovy | 1 + .../ExpressionProcessorService.groovy | 5 ++++- .../frontlinesms2/domain/FmessageISpec.groovy | 8 +++++++ .../domain/ReplyActionStepISpec.groovy | 22 +++++++++++++++++++ 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index a8e82cf92..e5761ad72 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -328,12 +328,17 @@ class Fmessage { } def getMessageDetailValue(owner) { + println "# Fmessage.getMessageDetailValue # ${owner}" def ownerType = getOwnerType(owner) - if(owner instanceof CustomActivity) { + if(Activity.get(owner?.id) instanceof CustomActivity) { + println "Fmessage.getMessageDetailValue # for CustomActivity # " def stepId = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id }?.value - return this.details.find { (it.ownerType == MessageDetail.OwnerType.STEP) && (it.ownerId == stepId as Long) }?.value + def t = this.details.find { (it.ownerType == MessageDetail.OwnerType.STEP) && (it.ownerId == stepId as Long) }?.value + println "Fmessage.getMessageDetailValue # for CustomActivity # and ownerDetail is # ${t}" + return t } else { - return this.details.find { it.ownerType == ownerType && it.ownerId == owner.id }?.value + println "Fmessage.getMessageDetailValue # for Other Activities # " + return this.details?.find { it.ownerType == ownerType && it.ownerId == owner.id }?.value?:'' } } @@ -343,6 +348,7 @@ class Fmessage { } def setMessageDetail(activityOrStep, val) { + println "# Fmessage.setMessageDetail # ${activityOrStep} # ${val}" if (activityOrStep instanceof Activity) { this.setMessageDetailValue(activityOrStep, val) } else { @@ -352,7 +358,7 @@ class Fmessage { } private def setMessageDetailValue(owner, value) { - println "# Setting the Detail for ${owner} #" + println "# Fmessage.setMessageDetailValue # ${owner} # ${value} #" def ownerType = getOwnerType(owner) def messageDetailInstance = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id } if(!messageDetailInstance) { @@ -365,7 +371,7 @@ class Fmessage { } private def getOwnerType(owner) { - owner instanceof Activity ? MessageDetail.OwnerType.ACTIVITY: MessageDetail.OwnerType.STEP + owner instanceof Step ? MessageDetail.OwnerType.STEP : MessageDetail.OwnerType.ACTIVITY } def clearAllDetails() { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy index 1f60a97a1..7942035cb 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy @@ -39,6 +39,7 @@ class AutoreplyService { message.messageOwner.addToMessages(outgoingMessage) message.messageOwner.save(failOnError:true) outgoingMessage.setMessageDetail(activityOrStep, message.id) + outgoingMessage.save(failOnError:true) messageSendService.send(outgoingMessage) activityOrStep.save() diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy index 747206aa7..8a5c85987 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ExpressionProcessorService.groovy @@ -42,7 +42,10 @@ class ExpressionProcessorService { private getReplacement(expression, dispatch) { try { // TODO could replace this manual mapping wth...a Map! e.g. [sender_number:{incomingMessage.src}] - def incomingMessage = Fmessage.get(dispatch.message.ownerDetail) + def ownerD = dispatch.message.ownerDetail + println "### Owner Detail for ${dispatch} ## ${ownerD}" + def incomingMessage = Fmessage.get(ownerD) + println "### Triggering incoming message # ${incomingMessage} # ${incomingMessage?.text}" def getKeyword = { incomingMessage.messageOwner?.keywords?.find { incomingMessage.text.toUpperCase().startsWith(it.value) }?.value } if (expression == '${message_text}') { def keyword = getKeyword() diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index 4a83077f1..571182089 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -418,6 +418,14 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { then: Fmessage.findBySrc('111', [sort: 'dateCreated', order:'desc']).text == 'youngest' } + + def 'calling the Fmessage.getOwnerType should return proper value'(){ + when: + def customActivity = CustomActivity.build() + def message = Fmessage.build() + then: + message.getOwnerType(customActivity) == MessageDetail.OwnerType.ACTIVITY + } private Folder getTestFolder(params=[]) { new Folder(name:params.name?:'test', diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy new file mode 100644 index 000000000..4ac6f4ce6 --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ReplyActionStepISpec.groovy @@ -0,0 +1,22 @@ +package frontlinesms2.domain + +import spock.lang.* +import grails.plugin.spock.* +import frontlinesms2.* + +class ReplyActionStepISpec extends IntegrationSpec{ + def "calling ReplyActionStep.process should set the proper ownerDetail for the outgoing message"() { + when: + def replyStep = new ReplyActionStep().addToStepProperties(new StepProperty(key:"autoreplyText", value:"i will send this")) + + def customActivity = new CustomActivity(name:'Do it all') + .addToSteps(replyStep) + .addToKeywords(value:"CUSTOM") + .save(failOnError:true, flush:true) + + def incomingMessage = Fmessage.build(text:"incoming message", messageOwner: customActivity) + replyStep.process(incomingMessage) + then: + Fmessage.findByText("i will send this").ownerDetail == incomingMessage.id.toString() + } +} \ No newline at end of file From e9d83a95c7df228a1e0fbbd444fbe7156d706051 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 16:27:57 +0300 Subject: [PATCH 0858/2668] Remove document ready checks in message composer and testing artifacts + comments --- .../web-app/js/message_composer.js | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/message_composer.js b/plugins/frontlinesms-core/web-app/js/message_composer.js index ec32cf5b7..8710f279c 100644 --- a/plugins/frontlinesms-core/web-app/js/message_composer.js +++ b/plugins/frontlinesms-core/web-app/js/message_composer.js @@ -10,9 +10,7 @@ messageComposerUtils = { updateCharacterCount: function(messageComposerInstance) { var charCount, charCountDisplay, textArea, text; textArea = $(messageComposerInstance).children('textarea') - // charCountDisplay = $($(messageComposerInstance) charCountDisplay = $($(messageComposerInstance).children('.controls')[0]).children('.character-count-display'); - console.log($(charCountDisplay)); charCount = this.getCharacterCount($(messageComposerInstance)) text = this.getText($(messageComposerInstance)) $(charCountDisplay).html(charCount); @@ -24,18 +22,15 @@ messageComposerUtils = { } } -$(function() { - $('.message-composer').live('focus', function() { - $(this).addClass('focus'); - $(this).children('textarea').autosize(); - }); - - $('.message-composer').live('blur', function() { - $(this).removeClass('focus'); - }); +$('.message-composer').live('focus', function() { + $(this).addClass('focus'); + $(this).children('textarea').autosize(); +}); - $('.message-composer textarea').live('keyup', function() { - messageComposerUtils.updateCharacterCount($($(this).parent()[0])); - }); +$('.message-composer').live('blur', function() { + $(this).removeClass('focus'); }); +$('.message-composer textarea').live('keyup', function() { + messageComposerUtils.updateCharacterCount($($(this).parent()[0])); +}); From 75335ae66ac9b347a885c4ca43ae9cef76aba479 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 15 Feb 2013 16:39:00 +0300 Subject: [PATCH 0859/2668] [TOOLS-206] Updated CoreUrlMappings to fix cloud bug for sorting messages by column leads --- .../frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy index d170aaad9..573055753 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy @@ -13,7 +13,9 @@ class CoreUrlMappings { "/search/result/show/"(controller:'search', action:'result') {} "/search/result/show/$messageId"(controller:'search', action:'result') {} + "/message/inbox/"(controller:'message', action:'inbox') {} "/message/inbox/show/$messageId"(controller:'message', action:'inbox') {} + "/message/sent/show/$messageId"(controller:'message', action:'sent') {} "/message/pending/show/$messageId"(controller:'message', action: 'pending') {} "/message/trash/show/$id"(controller:'message', action: 'trash') {} From ef4c81139b44cf10ee42220ddfb12185910529fc Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 15 Feb 2013 16:47:44 +0300 Subject: [PATCH 0860/2668] Added script for resetting core after buildingmultitenant plugin --- plugins/frontlinesms-core/do/reset_core_plugin | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 plugins/frontlinesms-core/do/reset_core_plugin diff --git a/plugins/frontlinesms-core/do/reset_core_plugin b/plugins/frontlinesms-core/do/reset_core_plugin new file mode 100755 index 000000000..5dc481eca --- /dev/null +++ b/plugins/frontlinesms-core/do/reset_core_plugin @@ -0,0 +1,3 @@ +git reset --hard +rm FrontlinesmsCoreMultitenantGrailsPlugin.groovy +rm -r web-app/css/frontlinesms-core/ From 7e9e6edd8d45b1dafec7d700b35030737198c6ee Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 16:51:47 +0300 Subject: [PATCH 0861/2668] Refactor messageComposerUtils into an anonymous function --- .../web-app/js/message_composer.js | 59 +++++++++++-------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/message_composer.js b/plugins/frontlinesms-core/web-app/js/message_composer.js index 8710f279c..aefda924c 100644 --- a/plugins/frontlinesms-core/web-app/js/message_composer.js +++ b/plugins/frontlinesms-core/web-app/js/message_composer.js @@ -1,36 +1,47 @@ -messageComposerUtils = { - getCharacterCount: function(messageComposerInstance) { +messageComposerUtils = (function() { + var init, getCharacterCount, getText, updateCharacterCount; + + init = function() { + $('.message-composer').live('focus', function() { + $(this).addClass('focus'); + $(this).children('textarea').autosize(); + }); + + $('.message-composer').live('blur', function() { + $(this).removeClass('focus'); + }); + + $('.message-composer textarea').live('keyup', function() { + messageComposerUtils.updateCharacterCount($($(this).parent()[0])); + }); + }; + + getCharacterCount = function(messageComposerInstance) { return $($(messageComposerInstance).children('textarea')[0]).val().length; - }, + }; - getText: function(messageComposerInstance) { - return $($(messageComposerInstance).children('textarea')[0]).val() - }, + getText = function(messageComposerInstance) { + return $($(messageComposerInstance).children('textarea')[0]).val(); + }; - updateCharacterCount: function(messageComposerInstance) { + updateCharacterCount = function(messageComposerInstance) { var charCount, charCountDisplay, textArea, text; - textArea = $(messageComposerInstance).children('textarea') + textArea = $(messageComposerInstance).children('textarea'); charCountDisplay = $($(messageComposerInstance).children('.controls')[0]).children('.character-count-display'); - charCount = this.getCharacterCount($(messageComposerInstance)) - text = this.getText($(messageComposerInstance)) + charCount = this.getCharacterCount($(messageComposerInstance)); + text = this.getText($(messageComposerInstance)); $(charCountDisplay).html(charCount); if (text.indexOf('${') !== -1) { $(charCountDisplay).addClass('warning').attr('title', 'May be longer after substitution'); } else { $(charCountDisplay).removeClass('warning').attr('title', 'OK'); } - } -} - -$('.message-composer').live('focus', function() { - $(this).addClass('focus'); - $(this).children('textarea').autosize(); -}); - -$('.message-composer').live('blur', function() { - $(this).removeClass('focus'); -}); + }; -$('.message-composer textarea').live('keyup', function() { - messageComposerUtils.updateCharacterCount($($(this).parent()[0])); -}); + return { + init: init, + getCharacterCount: getCharacterCount, + getText: getText, + updateCharacterCount: updateCharacterCount + }; +})(); From 8cca61057b77e07b245a304d04895702cc36ede9 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 16:52:14 +0300 Subject: [PATCH 0862/2668] Call messageComposerUtils.init at page load --- plugins/frontlinesms-core/grails-app/views/_includes.gsp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 19c26fcd9..7e629ee44 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -58,5 +58,6 @@ newFeatures.showPopup(); }); + messageComposerUtils.init(); From a69ede4887fbde01503255a2831806d5f4a9f854 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 16:52:42 +0300 Subject: [PATCH 0863/2668] Add test for messageComposerUtils.getText --- .../test/js/message_composer_tests.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/js/message_composer_tests.js b/plugins/frontlinesms-core/test/js/message_composer_tests.js index 1df442b86..0e1da7211 100644 --- a/plugins/frontlinesms-core/test/js/message_composer_tests.js +++ b/plugins/frontlinesms-core/test/js/message_composer_tests.js @@ -5,9 +5,17 @@ function setup() { window.messageComposerUtils = messageComposerUtils; } -test("messageComposerUtils.getCharacterCount should return the number of characters in the textarea of a messageComposer", function() { +test("messageComposerUtils.getCharacterCount should return the number of characters in the textarea of a message composer", function() { setup(); var messageComposerInstance = $('.message-composer')[0], charCount = messageComposerUtils.getCharacterCount($(messageComposerInstance)); equal(charCount, 17); }); + +test("messageComposerUtils.getText should return the text contained in the textarea of a message composer", function() { + setup(); + var messageComposerInstance = $('.message-composer')[0], + messageText = messageComposerUtils.getText($(messageComposerInstance)); + equal(messageText, "This is a message"); + +}); From 2cbc80f666fb5009ed0967c98771a85ce96960ab Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 16:58:42 +0300 Subject: [PATCH 0864/2668] Add test for messageComposerUtils.updateCharacter --- .../frontlinesms-core/test/js/message_composer_tests.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/frontlinesms-core/test/js/message_composer_tests.js b/plugins/frontlinesms-core/test/js/message_composer_tests.js index 0e1da7211..b53eadcdd 100644 --- a/plugins/frontlinesms-core/test/js/message_composer_tests.js +++ b/plugins/frontlinesms-core/test/js/message_composer_tests.js @@ -19,3 +19,12 @@ test("messageComposerUtils.getText should return the text contained in the texta equal(messageText, "This is a message"); }); + +test("messageComposerUtils.updateCharacterCount should update character counter to reflect change in associated textarea", function() { + setup(); + var messageComposerTextarea= $($('.message-composer')[0]).children('textarea')[0]; + messageComposerInstance = $('.message-composer')[0], + $(messageComposerTextarea).val("This is a message, edited."); + charCount = messageComposerUtils.getCharacterCount($(messageComposerInstance)); + equal(charCount, 26); +}); From 0aec19edc6bb721191b6a0afa4c5fd127e49135d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 15 Feb 2013 17:12:42 +0300 Subject: [PATCH 0865/2668] TOOLS-134 : fixed bug where check for existing contact before save did not trim whitespace --- .../controllers/frontlinesms2/ContactController.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy index 107642b1e..c54687699 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ContactController.groovy @@ -191,7 +191,9 @@ class ContactController extends ControllerUtils { //> PRIVATE HELPER METHODS private def attemptSave(contactInstance) { - def existingContact = params.mobile ? Contact.findByMobileLike(params.mobile) : null + def mobile = params.mobile?.replaceAll(/\D/, '') + if(params.mobile && params.mobile[0] == '+') mobile = '+' + mobile + def existingContact = mobile ? Contact.findByMobileLike(mobile) : null if (existingContact && existingContact != contactInstance) { flash.message = "${message(code: 'contact.exists.warn')} " + g.link(action:'show', params:[contactId:Contact.findByMobileLike(params.mobile)?.id], g.message(code: 'contact.view.duplicate')) return false From c24a19e4fc0348ea1a7ef9c95cbf92f57d5164d4 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Feb 2013 17:30:52 +0300 Subject: [PATCH 0866/2668] Call messageComposer.init on parent element to avoid repeated calls when a new instance is created --- .../grails-app/views/_includes.gsp | 1 - .../web-app/js/activity/custom_activity.js | 1 + .../web-app/js/message_composer.js | 27 ++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 7e629ee44..19c26fcd9 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -58,6 +58,5 @@ newFeatures.showPopup(); }); - messageComposerUtils.init(); diff --git a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js index 083a45d8c..4173fa8d7 100644 --- a/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js +++ b/plugins/frontlinesms-core/web-app/js/activity/custom_activity.js @@ -28,6 +28,7 @@ var custom_activity = (function() { }, init = function() { $(CONFIG_CONTAINER).sortable(); + messageComposerUtils.init($(CONFIG_CONTAINER)); // Defer creation of selectmenus and magic wand widgets until // they're actually visible... $("#tabs").bind("tabsshow", function(event, ui) { diff --git a/plugins/frontlinesms-core/web-app/js/message_composer.js b/plugins/frontlinesms-core/web-app/js/message_composer.js index aefda924c..edb7564f6 100644 --- a/plugins/frontlinesms-core/web-app/js/message_composer.js +++ b/plugins/frontlinesms-core/web-app/js/message_composer.js @@ -1,35 +1,36 @@ messageComposerUtils = (function() { var init, getCharacterCount, getText, updateCharacterCount; - init = function() { - $('.message-composer').live('focus', function() { + init = function(messageComposerParent) { + $(messageComposerParent).on('focus', '.message-composer', function(event) { $(this).addClass('focus'); $(this).children('textarea').autosize(); }); - $('.message-composer').live('blur', function() { + $(messageComposerParent).on('blur', '.message-composer', function(event) { $(this).removeClass('focus'); }); - $('.message-composer textarea').live('keyup', function() { + $(messageComposerParent).on('keyup', '.message-composer textarea', function() { + console.log($(this)); messageComposerUtils.updateCharacterCount($($(this).parent()[0])); }); }; - getCharacterCount = function(messageComposerInstance) { - return $($(messageComposerInstance).children('textarea')[0]).val().length; + getCharacterCount = function(messageComposer) { + return $($(messageComposer).children('textarea')[0]).val().length; }; - getText = function(messageComposerInstance) { - return $($(messageComposerInstance).children('textarea')[0]).val(); + getText = function(messageComposer) { + return $($(messageComposer).children('textarea')[0]).val(); }; - updateCharacterCount = function(messageComposerInstance) { + updateCharacterCount = function(messageComposer) { var charCount, charCountDisplay, textArea, text; - textArea = $(messageComposerInstance).children('textarea'); - charCountDisplay = $($(messageComposerInstance).children('.controls')[0]).children('.character-count-display'); - charCount = this.getCharacterCount($(messageComposerInstance)); - text = this.getText($(messageComposerInstance)); + textArea = $(messageComposer).children('textarea'); + charCountDisplay = $($(messageComposer).children('.controls')[0]).children('.character-count-display'); + charCount = this.getCharacterCount($(messageComposer)); + text = this.getText($(messageComposer)); $(charCountDisplay).html(charCount); if (text.indexOf('${') !== -1) { $(charCountDisplay).addClass('warning').attr('title', 'May be longer after substitution'); From 7ed70fafdee4919c0031984ec0be302919042ffd Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 15 Feb 2013 18:13:48 +0300 Subject: [PATCH 0867/2668] fixed CustomactivityControllerISpec --- .../grails-app/conf/CoreBootStrap.groovy | 2 ++ .../frontlinesms2/CustomActivity.groovy | 4 +++ .../domain/frontlinesms2/Step.groovy | 3 +- .../CustomActivityService.groovy | 32 ++++++++++++++++--- .../CustomactivityControllerISpec.groovy | 31 ++++++++++++++++-- 5 files changed, 64 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index ab63daad9..f0525151d 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -447,10 +447,12 @@ class CoreBootStrap { def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")) def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")) + def replyStep = new ReplyActionStep().addToStepProperties(new StepProperty(key:"autoreplyText", value:"I will send you forever")) new CustomActivity(name:'Do it all') .addToSteps(joinStep) .addToSteps(leaveStep) + .addToSteps(replyStep) .addToKeywords(value:"CUSTOM") .save(failOnError:true, flush:true) } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy index 921c5243d..32677172a 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/CustomActivity.groovy @@ -6,6 +6,10 @@ class CustomActivity extends Activity { static String getShortName() { 'customactivity' } static hasMany = [steps: Step] + static mapping = { + steps cascade: "all-delete-orphan" + } + def getActivityMessages(getOnlyStarred=false, getSent=null, stepId=null, params=null) { if(stepId) { def outgoingMessagesByStep = [] diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy index 96a66083c..6ff210f82 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Step.groovy @@ -25,7 +25,8 @@ abstract class Step { } def setPropertyValue(key, value){ - stepProperties?.find { it.key == key }?.value = value + def prop = stepProperties?.find { it.key == key } + prop? (prop.value = value) : this.addToStepProperties(key:key, value:value) } // helper method to retrieve list of entities saved as StepProperties diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index 6838567b6..7ed7d11d0 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -16,12 +16,36 @@ class CustomActivityService { customActivity.name = params.name //TODO DRY the functionality of creating and editing keywords customActivity.keywords?.clear() - println "removing existing steps if any" - customActivity.steps?.clear() + println "# Removing existing steps if any" + + //Removing Steps + def storedSteps = customActivity.steps + println "# StepsIds in # ${steps*.stepId.collect { (it != "")?(it as Long):null }}" + def stepsToDelete = storedSteps*.id?:[] - steps*.stepId.collect { (it != "")?(it as Long):null } + println "# Steps saved already ${customActivity.steps*.id}" + println "# Steps to delete ${stepsToDelete}" - getSteps(steps).each { - customActivity.addToSteps(it) + stepsToDelete.each { it-> + customActivity.removeFromSteps(Step.get(it)) } + customActivity.save(failOnError:true, flush:true) + + //Adding Steps + println "# Adding the steps" + steps.each { step-> + def stepToEdit = storedSteps.find { it.id == step.stepId } ?: Step.implementations.find {it.shortName == step.stepType}.newInstance(step) + println "# Adding step of type # ${stepToEdit.shortName}" + step.each { k,v-> + if(!(k in ["stepType", "stepId"])) { + stepToEdit.setPropertyValue(k,v) + println "# Setting $k $v for ${step.stepType}" + } + } + if(!step.stepId) + customActivity.addToSteps(stepToEdit) + } + + println "# The steps to save are ${customActivity.steps*.shortName}" println "##Just about to save" // FIXME why are there multiple saves here? diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy index 73e579a9e..7e1b2cbad 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy @@ -5,7 +5,7 @@ import frontlinesms2.* class CustomactivityControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller = new CustomactivityController() - def "can create a new custom activity"(){grails.plugin.spock.IntegrationSpec + def "can create a new custom activity"(){ given: controller.params.jsonToSubmit = """[{"stepId":"","stepType":"join", "group":"5"}, {"stepId":"","stepType":"leave", "group":"5" }]""" controller.params.name = "test save" @@ -22,7 +22,7 @@ class CustomactivityControllerISpec extends grails.plugin.spock.IntegrationSpec def "can edit an existing custom activity"() { given: def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")) - def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")) + def leaveStep = new LeaveActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")) def a = new CustomActivity(name:'Do it all') .addToSteps(joinStep) @@ -48,7 +48,7 @@ class CustomactivityControllerISpec extends grails.plugin.spock.IntegrationSpec controller = new MessageController() def group = Group.build() def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"${group.id}")) - def leaveStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"${group.id}")) + def leaveStep = new LeaveActionStep().addToStepProperties(new StepProperty(key:"group", value:"${group.id}")) def replyStep = new ReplyActionStep().addToStepProperties(new StepProperty(key:"autoreplyText", value:"sending this message")) def a = new CustomActivity(name:'Do it all') @@ -73,4 +73,29 @@ class CustomactivityControllerISpec extends grails.plugin.spock.IntegrationSpec then: controller.modelAndView.model.messageInstanceList.size() == 2 } +@spock.lang.IgnoreRest + def "steps should be edited when editing a custom activity not removed"() { + given: + def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")) + def leaveStep = new LeaveActionStep().addToStepProperties(new StepProperty(key:"group", value:"2")) + + def a = new CustomActivity(name:'Do it all') + .addToSteps(joinStep) + .addToSteps(leaveStep) + .addToKeywords(value:"CUSTOM") + .save(failOnError:true, flush:true) + + controller.params.name = "just edited" + controller.params.keywords = "new, just, yeah" + controller.params.sorting = "enabled" + controller.params.ownerId = a.id + controller.params.jsonToSubmit = """[{"stepId":"${joinStep.id}","stepType":"join", "group":"2"}, {"stepId":"","stepType":"reply", "autoreplyText":"where is the help controller" }]""" + when: + controller.save() + then: + def activity = CustomActivity.findByName("just edited") + activity.keywords*.value.containsAll(["NEW", "JUST", "YEAH"]) + activity.steps*.id.contains(joinStep.id) + activity.steps.size() == 2 + } } From 350f484d8fe35f783a5e06c08a4da36b3c3eed6d Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 15 Feb 2013 19:24:36 +0300 Subject: [PATCH 0868/2668] incomplete changes on routing rules drag-and-drop functionality --- .../grails-app/views/settings/general.gsp | 4 ++++ plugins/frontlinesms-core/web-app/css/settings.css | 8 ++++++++ .../web-app/js/settings/general_settings.js | 13 ++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index a192acd21..037d92c14 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -74,6 +74,10 @@ +
          +

            +
            + Date: Mon, 18 Feb 2013 10:30:53 +0300 Subject: [PATCH 0869/2668] removed IgnoreRest --- .../controller/CustomactivityControllerISpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy index 7e1b2cbad..9da725769 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/CustomactivityControllerISpec.groovy @@ -73,7 +73,7 @@ class CustomactivityControllerISpec extends grails.plugin.spock.IntegrationSpec then: controller.modelAndView.model.messageInstanceList.size() == 2 } -@spock.lang.IgnoreRest + def "steps should be edited when editing a custom activity not removed"() { given: def joinStep = new JoinActionStep().addToStepProperties(new StepProperty(key:"group", value:"1")) From d1e20c92dbdbda220466188f3979d1fb809174cf Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 18 Feb 2013 10:41:03 +0300 Subject: [PATCH 0870/2668] CustomactivityControllerISpec fixes --- .../services/frontlinesms2/CustomActivityService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index 7ed7d11d0..98c001fc5 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -21,7 +21,7 @@ class CustomActivityService { //Removing Steps def storedSteps = customActivity.steps println "# StepsIds in # ${steps*.stepId.collect { (it != "")?(it as Long):null }}" - def stepsToDelete = storedSteps*.id?:[] - steps*.stepId.collect { (it != "")?(it as Long):null } + def stepsToDelete = (storedSteps*.id?:[]) - steps*.stepId.collect { (it != "")?(it as Long):null } println "# Steps saved already ${customActivity.steps*.id}" println "# Steps to delete ${stepsToDelete}" From a0fdd46d8617c5a79dfe876a8851a8c84d66dd0c Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 18 Feb 2013 10:49:21 +0300 Subject: [PATCH 0871/2668] minor modification to reply step text in CustomActivity header dropdown --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 6769d8af6..0707fbda3 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -1100,7 +1100,7 @@ validation.group.notnull=Please select a group customactivity.join.description=Joining "{0}" group customactivity.leave.description=Leaving "{0}" group -customactivity.reply.description=Reply with "{0}" to recipient +customactivity.reply.description=Reply with "{0}" customactivity.step.join.add=Add sender to group customactivity.step.join.title=Add sender to group customactivity.step.leave.add=Remove sender from group From 98d405a5c3832f9a5432dc7d7fbc3d67083a02a8 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Feb 2013 11:03:42 +0300 Subject: [PATCH 0872/2668] Moved status_indicator and system_notification to use app_info --- .../frontlinesms2/StatusController.groovy | 6 -- .../SystemNotificationController.groovy | 6 -- .../grails-app/views/_includes.gsp | 4 +- .../frontlinesms2/CoreAppInfoProviders.groovy | 10 +++ .../frontlinesms-core/web-app/js/app_info.js | 20 ++++- .../web-app/js/status_indicator.js | 20 ++--- .../web-app/js/system_notification.js | 89 ++++++++++--------- 7 files changed, 87 insertions(+), 68 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy index 493a6a190..25a27e5a9 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/StatusController.groovy @@ -6,12 +6,6 @@ class StatusController extends ControllerUtils { def index() { redirect action:'show', params:params } - - def trafficLightIndicator() { - def connections = Fconnection.list() - def color = (connections && connections.status.any {(it == ConnectionStatus.CONNECTED)}) ? 'green' : 'red' - render text:color, contentType:'text/plain' - } def show() { [connectionInstanceList: Fconnection.list(), diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SystemNotificationController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SystemNotificationController.groovy index a19974276..b4245d1d1 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SystemNotificationController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SystemNotificationController.groovy @@ -11,12 +11,6 @@ class SystemNotificationController extends ControllerUtils { render text: message(code: 'system.notification.ok') } } - - def list() { - def notifications = SystemNotification.findAllByRead(false) - def data = notifications.collectEntries { [it.id, it.text] } - render data as JSON - } private def withNotification = withDomainObject SystemNotification } diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index af1deb723..f08bd7a47 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -49,8 +49,8 @@ fsmsButton.findAndApply("input[type='submit'], input[type='button']"); // Enable system notification refresh - setInterval(systemNotification.refresh, 10000); - setInterval(statusIndicator.refresh, 10000); + systemNotification.init(); + statusIndicator.init(); }); diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index 8edf75b55..9384ffb63 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -18,6 +18,16 @@ class CoreAppInfoProviders { outbound:c.outboundMessagesCount] } } + + s.registerProvider('system_notification') { app, controller, data -> + SystemNotification.findAllByRead(false).collectEntries { [it.id, it.text] } + } + + s.registerProvider('status_indicator') { app, controller, data -> + def connections = Fconnection.list() + def color = (connections && connections.status.any {(it == ConnectionStatus.CONNECTED)}) ? 'green' : 'red' + return color + } } } diff --git a/plugins/frontlinesms-core/web-app/js/app_info.js b/plugins/frontlinesms-core/web-app/js/app_info.js index 4e90c43f7..fa3eeee49 100644 --- a/plugins/frontlinesms-core/web-app/js/app_info.js +++ b/plugins/frontlinesms-core/web-app/js/app_info.js @@ -2,6 +2,7 @@ app_info = (function() { var callbacks, counter, + failCallback, init = function() { counter = 0; callbacks = {}; @@ -18,6 +19,11 @@ app_info = (function() { } } }, + failureProcessor = function(data) { + if(typeof failureProcessor !== "undefined") { + failureProcessor.call(); + } + }, requester = function() { var requestData = {}, interest, c, data; ++counter; @@ -41,7 +47,8 @@ app_info = (function() { contentType:"application/json", data:JSON.stringify(requestData), processData:false, - success:callbackProcessor }); + success:callbackProcessor, + fail:failureProcessor }); } }, listen = function(interest, f, data, callback) { @@ -65,10 +72,19 @@ app_info = (function() { } callbacks[interest] = { frequency:f, callback:callback, data:data }; }, + listenForFailures = function(listener) { + if(typeof listener !== "function") { + throw "Failure listener must be a function."; + } + if(typeof failCallback !== "undefined") { + throw "Cannot override old failure listener."; + } + failCallback = listener; + }, stopListening = function(disinterest) { delete callbacks[disinterest]; }; - return { init:init, listen:listen, stopListening:stopListening }; + return { init:init, listen:listen, listenForFailures:listenForFailures, stopListening:stopListening }; }()); diff --git a/plugins/frontlinesms-core/web-app/js/status_indicator.js b/plugins/frontlinesms-core/web-app/js/status_indicator.js index e117119b9..23ce98b23 100644 --- a/plugins/frontlinesms-core/web-app/js/status_indicator.js +++ b/plugins/frontlinesms-core/web-app/js/status_indicator.js @@ -14,7 +14,6 @@ var StatusIndicator = function() { if(_failureCount === 0) { ++_failureCount; } else if(!_getConnectionLostNotification().length) { - var notification = '

            ' + i18n('server.connection.fail.title') + '

            ' @@ -25,22 +24,23 @@ var StatusIndicator = function() { _updateLight('red'); }, _successHandler = function(data) { - var connectionLostNotification = _getConnectionLostNotification(); + var connectionLostNotification; + if(!data.status_indicator) { + return; + } + data = data.status_indicator; + connectionLostNotification = _getConnectionLostNotification(); _failureCount = 0; if(connectionLostNotification) { connectionLostNotification.remove(); } _updateLight(data); }, - _refresh = function() { - $.ajax({ - url: url_root + 'status/trafficLightIndicator', - cache: false, - success: _successHandler, - error: _errorHandler - }); + init = function() { + app_info.listen("status_indicator", _successHandler); + app_info.listenForFailures(_errorHandler); }; - return { refresh:_refresh }; + return { init:init }; }; diff --git a/plugins/frontlinesms-core/web-app/js/system_notification.js b/plugins/frontlinesms-core/web-app/js/system_notification.js index 52e7f37ae..772b19c9c 100644 --- a/plugins/frontlinesms-core/web-app/js/system_notification.js +++ b/plugins/frontlinesms-core/web-app/js/system_notification.js @@ -1,48 +1,53 @@ var SystemNotification = function() { - var _LIST_ACTION = url_root + "systemNotification/list", - _MARK_READ_ACTION = url_root + "systemNotification/markRead/", - _getId = function(e) { - return e.attr("id").substring(13); - }, - _create = function(id, text) { - var elementId = "notification-" + id; - return '

            ' - + text - + 'x
            '; - }, - _hide = function(id) { - $.get(_MARK_READ_ACTION + id); - $("#notification-" + id).slideUp(500); - }, - _refresh = function() { - $.get(_LIST_ACTION, function(data) { - // remove any notifications no longer in the list - var _key, value, found; - found = []; - $(".system-notification").each(function(i, e) { - e = $(e); - var notificationId = _getId(e); - if(!data[notificationId]) { - // remove dead notification - e.slideUp(500); - } else { - // prevent the notification being re-added - data[notificationId] = null; - } - }); + var + _MARK_READ_ACTION = url_root + "systemNotification/markRead/", + _getId = function(e) { + return e.attr("id").substring(13); + }, + _create = function(id, text) { + var elementId = "notification-" + id; + return '
            ' + + text + + 'x
            '; + }, + hide = function(id) { + $.get(_MARK_READ_ACTION + id); + $("#notification-" + id).slideUp(500); + }, + _refresh = function(data) { + // remove any notifications no longer in the list + var _key, value, found; + if(!data.system_notification) { + return; + } + data = data.system_notification; + found = []; + $(".system-notification").each(function(i, e) { + e = $(e); + var notificationId = _getId(e); + if(!data[notificationId]) { + // remove dead notification + e.slideUp(200); + } else { + // prevent the notification being re-added + data[notificationId] = null; + } + }); - // add any new notifications to the bottom of the list - for(_key in data) { - value = data[_key]; - if(value) { - $("#notifications").append(_create(_key, value)); - } - } - }); - }; + // add any new notifications to the bottom of the list + for(_key in data) { + value = data[_key]; + if(value) { + $("#notifications").append(_create(_key, value)); + } + } + }, + init = function() { + app_info.listen("system_notification", _refresh); + }; return { - refresh: _refresh, - hide: _hide + hide:hide, + init:init }; }; From 70e81af72354de00a19c020df54fd0f924156cf5 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Feb 2013 11:12:22 +0300 Subject: [PATCH 0873/2668] Removed unused javascript methods from frontlinesms_core --- .../web-app/js/frontlinesms_core.js | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js index a39436482..c21822beb 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js @@ -57,14 +57,6 @@ function refreshMessageCount() { }); } -function isEmpty(val) { - return val.trim().length === 0; -} - -function isElementEmpty(selector) { - return isEmpty($(selector).val()); -} - function getSelectedGroupElements(groupName) { return $('input[name=' + groupName + ']:checked'); } @@ -73,24 +65,11 @@ function isGroupChecked(groupName) { return getSelectedGroupElements(groupName).length > 0; } -function isDropDownSelected(id) { - var selectedOptions = $("#" + id + " option:selected"); - return selectedOptions.length > 0 && (!isEmpty(selectedOptions[0].value)); -} - $('.check-bound-text-area').live('focus', function() { var checkBoxId = $(this).attr('checkbox_id'); $('#' + checkBoxId).attr('checked', true); }); -function findInputWithValue(value) { - return $('input[value=' + "'" + value + "'" + ']'); -} - -function isCheckboxSelected(value) { - return findInputWithValue(value).is(':checked'); -} - $.fn.renderDefaultText = function() { return this.focus(function() { $(this).toggleClass('default-text-input', false); @@ -169,26 +148,3 @@ $(function() { }); }); -$(function(){ - return; - // TODO this should be done in the GSP, and events should not be bound in web-app/js files - $.ajax({ - url: url_root + 'help/newfeatures', - cache: false, - success: function(data) { - if(data != "last version already displayed"){ - mediumPopup.launchNewFeaturePopup(i18n("new.features"), data, i18n("action.close"), function(){ - $.ajax({ - url: url_root + 'help/updateShowNewFeatures', - data:{enableNewFeaturesPopup:$('#enableNewFeaturesPopup').is(":checked")}, - cache: false, - success: function(data) { - $('#modalBox').parent().remove(); - } - }); - }); - $('#modalBox').addClass('help'); - } - } - }); -}); From 083aea6ad02ae10408ab58c554d631f5b6321a9a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 18 Feb 2013 11:38:57 +0300 Subject: [PATCH 0874/2668] fixed bug where the stepsproperties changes were not persisted when editing a customactivity --- .../CustomActivityService.groovy | 37 +++---------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index 98c001fc5..4c525be10 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -33,7 +33,8 @@ class CustomActivityService { //Adding Steps println "# Adding the steps" steps.each { step-> - def stepToEdit = storedSteps.find { it.id == step.stepId } ?: Step.implementations.find {it.shortName == step.stepType}.newInstance(step) + def stepToEdit = customActivity.steps.find { it.id == (step.stepId as Long) } ?: Step.implementations.find {it.shortName == step.stepType}.newInstance(step) + println "# StepToEdit_ID # ${stepToEdit.id}" println "# Adding step of type # ${stepToEdit.shortName}" step.each { k,v-> if(!(k in ["stepType", "stepId"])) { @@ -41,8 +42,10 @@ class CustomActivityService { println "# Setting $k $v for ${step.stepType}" } } - if(!step.stepId) + if(!stepToEdit.id) customActivity.addToSteps(stepToEdit) + else + stepToEdit.save() } println "# The steps to save are ${customActivity.steps*.shortName}" @@ -69,36 +72,6 @@ class CustomActivityService { customActivity.save(failOnError:true, flush:true) } - private getSteps(steps) { - def stepInstanceList = [] - println "steps::::: $steps" - - steps.each { step -> - println "step:::: $step" - - def stepInstance = Step.implementations.find {it.shortName == step.stepType}.newInstance(step) - stepInstance.save() - step.each { k,v -> - def stepProp - if(!(k in ["stepType", "stepId"])) { - stepProp = new StepProperty(key:k, value:v) - println "$stepProp::: ${stepProp.key}: ${stepProp.value}" - stepInstance.addToStepProperties(stepProp) - println "$stepInstance::: ${stepInstance.stepProperties}" - } - - } - stepInstanceList << stepInstance - } - stepInstanceList.each { - println "<<<>>>" - println "$it" - println "${it.stepProperties*.key}" - println "<<<>>>" - } - stepInstanceList - } - def triggerSteps(c, message) { println "c::: ${c}, message::: $message" println "c steps::: ${c.steps}" From ceb64223692e1ec273aee4c9280d4190d8772457 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Feb 2013 11:55:40 +0300 Subject: [PATCH 0875/2668] Refactored check_for_new_messages to use app_info. --- .../frontlinesms2/MessageController.groovy | 21 ----- .../grails-app/views/connection/show.gsp | 10 +-- .../views/contact/_single_contact_view.gsp | 2 +- .../views/status/_device_detection.gsp | 5 +- .../frontlinesms2/CoreAppInfoProviders.groovy | 21 +++++ .../frontlinesms-core/web-app/js/app_info.js | 4 + .../js/message/check_for_new_messages.js | 87 ++++++++++--------- .../web-app/js/status_indicator.js | 4 +- .../web-app/js/system_notification.js | 4 +- 9 files changed, 81 insertions(+), 77 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index 3b5d327dd..dfab2f3ab 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -30,27 +30,6 @@ class MessageController extends ControllerUtils { redirect action:'inbox', params:params } - def newMessageCount() { - def section = params.messageSection - def messageCount - if(!params.ownerId && section != 'trash') { - if(section == 'pending') { - messageCount = Fmessage.countPending(params.failed) - } else { - messageCount = Fmessage."$section"(params.starred).count() - } - } else if(section == 'activity') { - def getSent = null - if(params.inbound) getSent = Boolean.parseBoolean(params.inbound) - messageCount = Activity.get(params.ownerId)?.getActivityMessages(params.starred, getSent)?.count() - } else if(section == 'folder') { - def getSent = null - if(params.inbound) getSent = Boolean.parseBoolean(params.inbound) - messageCount = Folder.get(params.ownerId)?.getFolderMessages(params.starred, getSent)?.count() - } else messageCount = 0 - render messageCount - } - def show() { def messageInstance = Fmessage.get(params.messageId) def ownerInstance = MessageOwner.get(params?.ownerId) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp index a211ddf5b..a8115c59d 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp @@ -4,17 +4,17 @@ <g:message code="connection.header"/> ${connectionInstance?.name} + <%-- Could just replace params.createRoute with a check for connectionInstance.status --%> $(function() { app_info.listen("connection_show", { id:${params.id} }, function(data) { console.log("connection_show.callback :: data=" + JSON.stringify(data)); - var c; - if(!data.connection_show) return; - c = data.connection_show; - if(c.status !== "CONNECTING") { + data = data.connection_show; + if(!data) { return; } + if(data.status !== "CONNECTING") { app_info.stopListening("connection_show"); $("div.flash").hide(); - fconnection_show.update(c.status, c.id); + fconnection_show.update(data.status, data.id); } }); }); diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp index d3eb51823..16b47e7b3 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact_view.gsp @@ -126,8 +126,8 @@ $(function() { app_info.listen("contact_message_stats", { id: "${contactInstance?.id}" }, function(data) { - if(!data.contact_message_stats) return; data = data.contact_message_stats; + if(!data) { return; } $("#message-stats .sent").text(i18n("contact.messages.sent", data.outbound)); $("#message-stats .recieved").text(i18n("contact.messages.received", data.inbound)); }); diff --git a/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp b/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp index 9e27ddfd9..af4ae15eb 100644 --- a/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/status/_device_detection.gsp @@ -39,11 +39,12 @@ app_info.listen("device_detection", function(data) { var table; - if(!data.device_detection) return; + data = data.device_detection; + if(!data) { return; } table = $("#detected-devices tbody"); table.empty(); - $.each(data.device_detection, function(i, d) { + $.each(data, function(i, d) { sanchez.append(table, "detected-device-detail", d); }); }); diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index 9384ffb63..eb5c796e1 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -28,6 +28,27 @@ class CoreAppInfoProviders { def color = (connections && connections.status.any {(it == ConnectionStatus.CONNECTED)}) ? 'green' : 'red' return color } + + s.registerProvider('new_messages') { app, controller, data -> + def section = data.messageSection + def messageCount + if(!data.ownerId && section != 'trash') { + if(section == 'pending') { + messageCount = Fmessage.countPending(data.failed) + } else { + messageCount = Fmessage."$section"(data.starred).count() + } + } else if(section == 'activity') { + def getSent = null + if(data.inbound) getSent = Boolean.parseBoolean(data.inbound) + messageCount = Activity.get(data.ownerId)?.getActivityMessages(data.starred, getSent)?.count() + } else if(section == 'folder') { + def getSent = null + if(data.inbound) getSent = Boolean.parseBoolean(data.inbound) + messageCount = Folder.get(data.ownerId)?.getFolderMessages(data.starred, getSent)?.count() + } else messageCount = 0 + return messageCount + } } } diff --git a/plugins/frontlinesms-core/web-app/js/app_info.js b/plugins/frontlinesms-core/web-app/js/app_info.js index fa3eeee49..ec2f4963d 100644 --- a/plugins/frontlinesms-core/web-app/js/app_info.js +++ b/plugins/frontlinesms-core/web-app/js/app_info.js @@ -14,6 +14,9 @@ app_info = (function() { if(callbacks.hasOwnProperty(c)) { c = callbacks[c]; if((counter % c.frequency) === 0) { + // TODO should check that requested data is present and only + // do callback if that is the case. N.B. difference between + // null and undefined is v important in this case c.callback(data); } } @@ -44,6 +47,7 @@ app_info = (function() { console.log("requester() :: requestData=" + JSON.stringify(requestData)); jQuery.ajax({ type:"POST", url:url_root + "appInfo", + cache:false, contentType:"application/json", data:JSON.stringify(requestData), processData:false, diff --git a/plugins/frontlinesms-core/web-app/js/message/check_for_new_messages.js b/plugins/frontlinesms-core/web-app/js/message/check_for_new_messages.js index 2e9083dc5..4fdf62ed0 100644 --- a/plugins/frontlinesms-core/web-app/js/message/check_for_new_messages.js +++ b/plugins/frontlinesms-core/web-app/js/message/check_for_new_messages.js @@ -1,22 +1,23 @@ -$(function() { - setInterval(checkForNew, 10000); - $("#refreshMessageList").live('click', refreshList); -}); - -function checkForNew() { - var params, currentTotal, newTotal, newMessageCount, notificationContents; - params = { +// TODO probably want to rename this something more descriptive such as message_list +check_for_new_messages = (function() { + var + flashNewMessages = function(mostRecentOldMessage) { + $("#main-list tbody tr").each(function() { + if($(this).find("#message-created-date").val() > mostRecentOldMessage) { + $(this).addClass("message-added-to-list"); + } + }); + }, + newMessageParamBuilder = function() { + return { messageSection: $("#messageSection").val(), ownerId: $('input:hidden[name=ownerId]').val(), starred: $('input:hidden[name=starred]').val(), inbound: $('input:hidden[name=inbound]').val(), failed: $('input:hidden[name=failed]').val() }; - - $.ajax({url:url_root + 'message/newMessageCount', - dataType:"json", - data:params, - cache:false, - success:function(data) { + }, + newMessageResponseHandler = function(data) { + data = data.new_messages; if(!data) { return; } currentTotal = parseInt($("#messageTotal").val(), 10); newTotal = data; @@ -29,35 +30,37 @@ function checkForNew() { $("#new-message-notification a").replaceWith(notificationContents); $("#new-message-notification a").show(); } + $("#refreshMessageList").click(refreshList); } - }}); -} + }, + refreshList = function() { + var section, ownerId, messageId, sortField, sortOrder, mostRecentOldMessage; + section = $('input:hidden[name=messageSection]').val(); + ownerId = $('input:hidden[name=ownerId]').val(); + messageId = $('input:hidden[name=messageId]').val(); + sortField = $('input:hidden[name=sortField]').val(); + sortOrder = $('input:hidden[name=sortOrder]').val(); + $("#main-list tbody tr").each(function() { + mostRecentOldMessage = Math.max(mostRecentOldMessage, $(this).find("#message-created-date").val()); + }); -function refreshList() { - var section, ownerId, messageId, sortField, sortOrder, mostRecentOldMessage; - section = $('input:hidden[name=messageSection]').val(); - ownerId = $('input:hidden[name=ownerId]').val(); - messageId = $('input:hidden[name=messageId]').val(); - sortField = $('input:hidden[name=sortField]').val(); - sortOrder = $('input:hidden[name=sortOrder]').val(); - $("#main-list tbody tr").each(function() { - mostRecentOldMessage = Math.max(mostRecentOldMessage, $(this).find("#message-created-date").val()); - }); - - $.get(url_root + 'message/' + section, { messageId: messageId, ownerId: ownerId, sort: sortField, order: sortOrder}, function(data) { - $('#messageTotal').replaceWith($(data).find('#messageTotal')); - $("#new-message-notification").slideUp(500); - $("#new-message-notification").remove(); - $('#main-list').replaceWith($(data).find('#main-list')); - flashNewMessages(mostRecentOldMessage); - }); -} + $.get(url_root + 'message/' + section, { messageId:messageId, ownerId:ownerId, sort:sortField, order:sortOrder }, function(data) { + $('#messageTotal').replaceWith($(data).find('#messageTotal')); + $("#new-message-notification").slideUp(500); + $("#new-message-notification").remove(); + $('#main-list').replaceWith($(data).find('#main-list')); + flashNewMessages(mostRecentOldMessage); + }); + }, + init = function() { + app_info.listen("new_messages", newMessageParamBuilder, newMessageResponseHandler); + }; + + return { init:init }; +}()); + +$(function() { + check_for_new_messages.init(); +}); -function flashNewMessages(mostRecentOldMessage) { - $("#main-list tbody tr").each(function() { - if($(this).find("#message-created-date").val() > mostRecentOldMessage) { - $(this).addClass("message-added-to-list"); - } - }); -} diff --git a/plugins/frontlinesms-core/web-app/js/status_indicator.js b/plugins/frontlinesms-core/web-app/js/status_indicator.js index 23ce98b23..6b7518df8 100644 --- a/plugins/frontlinesms-core/web-app/js/status_indicator.js +++ b/plugins/frontlinesms-core/web-app/js/status_indicator.js @@ -25,10 +25,8 @@ var StatusIndicator = function() { }, _successHandler = function(data) { var connectionLostNotification; - if(!data.status_indicator) { - return; - } data = data.status_indicator; + if(!data) { return; } connectionLostNotification = _getConnectionLostNotification(); _failureCount = 0; if(connectionLostNotification) { diff --git a/plugins/frontlinesms-core/web-app/js/system_notification.js b/plugins/frontlinesms-core/web-app/js/system_notification.js index 772b19c9c..d1d65ac9e 100644 --- a/plugins/frontlinesms-core/web-app/js/system_notification.js +++ b/plugins/frontlinesms-core/web-app/js/system_notification.js @@ -17,10 +17,8 @@ var SystemNotification = function() { _refresh = function(data) { // remove any notifications no longer in the list var _key, value, found; - if(!data.system_notification) { - return; - } data = data.system_notification; + if(!data) { return; } found = []; $(".system-notification").each(function(i, e) { e = $(e); From 4038e1487a633029dc74d539e019a4aae650fde8 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Feb 2013 12:07:42 +0300 Subject: [PATCH 0876/2668] Moved inbox new message tab count to use app_info.listen. --- .../controllers/frontlinesms2/MessageController.groovy | 4 ---- .../frontlinesms-core/grails-app/views/_includes.gsp | 6 ++++++ .../groovy/frontlinesms2/CoreAppInfoProviders.groovy | 4 ++++ plugins/frontlinesms-core/web-app/js/check_list.js | 3 ++- .../frontlinesms-core/web-app/js/frontlinesms_core.js | 10 ---------- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index dfab2f3ab..c5592892f 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -255,10 +255,6 @@ class MessageController extends ControllerUtils { trashService.emptyTrash() redirect action:'inbox' } - - def unreadMessageCount() { - render text:Fmessage.countUnreadMessages(), contentType:'text/plain' - } def sendMessageCount() { render fmessageInfoService.getMessageInfos(params.message) as JSON diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index f08bd7a47..3045b3554 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -35,6 +35,12 @@ // declare vars that are populated in JS files var check_list, fconnection; + app_info.listen("inbox_unread", function(data) { + data = data.inbox_unread; + if(!data) { return; } + $('#inbox-indicator').html(data); + }); + // declare our own, non-functioning select menu and button methods so that standard HTML elements are used in tests $.fn.selectmenu = function() {}; diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index eb5c796e1..cd2397e86 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -29,6 +29,10 @@ class CoreAppInfoProviders { return color } + s.registerProvider('inbox_unread') { app, controller, data -> + Fmessage.countUnreadMessages() + } + s.registerProvider('new_messages') { app, controller, data -> def section = data.messageSection def messageCount diff --git a/plugins/frontlinesms-core/web-app/js/check_list.js b/plugins/frontlinesms-core/web-app/js/check_list.js index 26220ba75..ef2ce63d6 100644 --- a/plugins/frontlinesms-core/web-app/js/check_list.js +++ b/plugins/frontlinesms-core/web-app/js/check_list.js @@ -79,7 +79,8 @@ check_list = (function() { if (itemTypeString === 'contact') { applyContactPaneJavascriptEnhancements(newPane); } else if (itemTypeString === 'message') { - refreshMessageCount(); + // TODO if message was unread and we're in the inbox, please decrement unread messages count + // on the tab (e.g. MESSAGES (123) -> MESSAGES (122) } }); }; diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js index c21822beb..8c9715dbf 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js @@ -49,14 +49,6 @@ if(jQuery.browser.msie) { $(function() { }; }(jQuery)); -function refreshMessageCount() { - $.ajax({ - url: url_root + 'message/unreadMessageCount', - cache: false, - success: function(data) { $('#inbox-indicator').html(data); } - }); -} - function getSelectedGroupElements(groupName) { return $('input[name=' + groupName + ']:checked'); } @@ -125,8 +117,6 @@ function insertAtCaret(areaId, text) { } $(function() { - // FIXME no binding to events should take place in this file - setInterval(refreshMessageCount, 30000); $.extend($.validator.messages, { required: i18n("jquery.validation.required"), remote: i18n("jquery.validation.remote"), From 97e905de85013d8784e3ab0f8071c6809bc0e769 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Feb 2013 12:08:59 +0300 Subject: [PATCH 0877/2668] Fixed false bad-template-render warning. --- .../grails-app/views/connection/_selected_connection.gsp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp index 102b2da75..ff1c63d11 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp @@ -1,5 +1,4 @@ -<%-- TODO when sanchez template rendering taglib is included, refactor here to use that instead of explicit sanchez templates --%> - +<%-- TODO when sanchez template rndering taglib is included, refactor here to use that instead of explicit sanchez templates --%>
            \n" } + if(i18nUtilService.allTranslations.containsKey(localeSuffix - '_')) { + def link = g.resource plugin:bundle, dir:'i18n', file:"messages${localeSuffix}.js" + out << "\n" + } + } } } From 46f8b604474c88fe2b3f2184c26bdbb76c688821 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 27 Feb 2013 09:23:11 +0300 Subject: [PATCH 1021/2668] Minor whitespace cleanup. --- .../customactivity/CustomActivityCedSpec.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy index c5e3c6678..2c3fd5a2b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy @@ -10,7 +10,7 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { to PageMessageInbox bodyMenu.newActivity.click() then: - waitFor { at CreateActivityDialog} + waitFor { at CreateActivityDialog } when: customactivity.click() then: @@ -22,7 +22,7 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { to PageMessageInbox bodyMenu.newActivity.click() then: - waitFor { at CreateActivityDialog} + waitFor { at CreateActivityDialog } when: customactivity.click() then: @@ -42,7 +42,7 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { to PageMessageInbox bodyMenu.newActivity.click() then: - waitFor { at CreateActivityDialog} + waitFor { at CreateActivityDialog } when: customactivity.click() then: @@ -67,7 +67,7 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { to PageMessageInbox bodyMenu.newActivity.click() then: - waitFor { at CreateActivityDialog} + waitFor { at CreateActivityDialog } when: customactivity.click() then: @@ -119,3 +119,4 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { } } + From 011e1974ded8f2daf79aa697cfbc76255af497b6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 27 Feb 2013 09:24:35 +0300 Subject: [PATCH 1022/2668] Fixed empty test. --- .../frontlinesms2/customactivity/CustomActivityCedSpec.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy index 2c3fd5a2b..eb7d930c1 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy @@ -34,7 +34,9 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { } def 'validation in configure tab works'() { - //TODO ensure that group has to be selected + expect: + //TODO ensure that group has to be selected + false } def 'can add and remove steps in the confiure tab'(){ From f3ce55c0233ff609135d04b2bfdeb6484817f240 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 27 Feb 2013 11:45:55 +0300 Subject: [PATCH 1023/2668] Refactored checks for message count in func tests. --- .../autoforward/AutoforwardViewSpec.groovy | 8 +++--- .../autoreply/AutoreplyViewSpec.groovy | 8 +++--- .../contact/ContactListSpec.groovy | 4 +-- .../folder/FolderListSpec.groovy | 10 +++---- .../message/MessageActionSpec.groovy | 4 +-- .../message/MessageInboxSpec.groovy | 6 ++--- .../message/MessagePaginationSpec.groovy | 27 +++++++++---------- .../message/MessageTrashSpec.groovy | 6 ++--- .../message/MessagesRecievedSpec.groovy | 14 +++++----- .../frontlinesms2/message/PageMessage.groovy | 1 + .../message/QuickMessageFSpec.groovy | 2 +- .../frontlinesms2/poll/PollListSpec.groovy | 12 ++++----- .../search/SearchViewSpec.groovy | 16 +++++------ 13 files changed, 58 insertions(+), 60 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy index e01cfe67c..4e0b36d37 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy @@ -227,11 +227,11 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { when: to PageMessageAutoforward, a then: - messageList.messages.size() == 5 + messageList.messageCount() == 5 when: footer.showOutgoing.click() then: - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } } def "clicking on the received message filter should display incoming messages only"() { @@ -240,11 +240,11 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { when: to PageMessageAutoforward, a then: - messageList.messages.size() == 5 + messageList.messageCount() == 5 when: footer.showIncoming.click() then: - waitFor { messageList.messages.size() == 3 } + waitFor { messageList.messageCount() == 3 } } private Autoforward createInAndOutTestMessages() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy index 2005d45f8..6b2da5a8b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy @@ -226,11 +226,11 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { when: to PageMessageAutoreply, a then: - messageList.messages.size() == 5 + messageList.messageCount() == 5 when: footer.showOutgoing.click() then: - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } } def "clicking on the received message filter should display incoming messages only"() { @@ -239,11 +239,11 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { when: to PageMessageAutoreply, a then: - messageList.messages.size() == 5 + messageList.messageCount() == 5 when: footer.showIncoming.click() then: - waitFor { messageList.messages.size() == 3 } + waitFor { messageList.messageCount() == 3 } } private Autoreply createInAndOutTestMessages() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy index 9627d968f..736b4338a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactListSpec.groovy @@ -152,7 +152,7 @@ class ContactListSpec extends ContactBaseSpec { singleContactDetails.searchForMessages.click() then: waitFor { at PageSearchResult } - messageList.messages.size() == 21 + messageList.messageCount() == 21 } def 'can search for all messages from an unnamed contact'() { @@ -171,7 +171,7 @@ class ContactListSpec extends ContactBaseSpec { singleContactDetails.searchForMessages.click() then: waitFor { at PageSearchResult } - messageList.messages.size() == 21 + messageList.messageCount() == 21 } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy index 18ecf0bb3..0c8344ec2 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy @@ -73,16 +73,16 @@ class FolderListSpec extends FolderBaseSpec { when: to PageMessageFolder, Folder.findByName('Work'), Fmessage.findBySrc('Max') then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: footer.showStarred.jquery.trigger("click") then: - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } messageList.messages[1].source == 'Max' when: footer.showAll.jquery.trigger("click") then: - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } messageList.sources.containsAll(['Jane', 'Max']) } @@ -231,11 +231,11 @@ class FolderListSpec extends FolderBaseSpec { when: to PageMessageFolder, Folder.findByName('Projects'), Fmessage.findBySrc('Patrick') then: - messageList.messages.size() == 3 + messageList.messageCount() == 3 when: footer.showIncoming.click() then: - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } when: sleep 11000 then: diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy index a9c5596b0..748dde613 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy @@ -38,7 +38,7 @@ class MessageActionSpec extends frontlinesms2.poll.PollBaseSpec { when: to PageMessageInbox then: - messageList.messages.size() == 1 + messageList.messageCount() == 1 } def "can categorize poll messages using dropdown"() { @@ -119,7 +119,7 @@ class MessageActionSpec extends frontlinesms2.poll.PollBaseSpec { bodyMenu.messageSection("Inbox").click() then: waitFor { title == "Inbox" } - messageList.messages.size() == 2 + messageList.messageCount() == 2 } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy index 5be5ec3f2..0ee5384fe 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy @@ -110,15 +110,15 @@ class MessageInboxSpec extends MessageBaseSpec { when: to PageMessageInbox, Fmessage.list()[0].id then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: footer.showStarred.click() - waitFor { messageList.messages.size() == 1 } + waitFor { messageList.messageCount() == 1 } then: messageList.messages[0].source == 'Alice' when: footer.showAll.click() - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } then: messageList.sources.containsAll(['Alice', 'Bob']) } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagePaginationSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagePaginationSpec.groovy index cafc0e5ea..2173b0682 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagePaginationSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagePaginationSpec.groovy @@ -7,20 +7,18 @@ import frontlinesms2.poll.* import frontlinesms2.folder.* class MessagePaginationSpec extends grails.plugin.geb.GebSpec { - def "should paginate inbox messages"() { setup: setupInboxMessages() when: to PageMessageInbox then: - messageList.messages.size() == 50 + messageList.messageCount() == 50 when: footer.nextPage.click() waitFor {footer.nextPage.hasClass("disabled")} then: - messageList.messages.size() == 1 - + messageList.messageCount() == 1 } def "should paginate pending messages"() { @@ -29,15 +27,14 @@ class MessagePaginationSpec extends grails.plugin.geb.GebSpec { when: to PageMessagePending then: - messageList.messages.size() == 50 + messageList.messageCount() == 50 footer.prevPage.hasClass("disabled") when: footer.nextPage.click() waitFor {!footer.prevPage.hasClass("disabled")} then: - messageList.messages.size() == 1 + messageList.messageCount() == 1 footer.nextPage.hasClass("disabled") - } def "should paginate deleted messages"() { @@ -46,13 +43,13 @@ class MessagePaginationSpec extends grails.plugin.geb.GebSpec { when: to PageMessageTrash then: - messageList.messages.size() == 50 + messageList.messageCount() == 50 footer.prevPage.hasClass("disabled") when: footer.nextPage.click() waitFor {!footer.prevPage.hasClass("disabled")} then: - messageList.messages.size() == 1 + messageList.messageCount() == 1 footer.nextPage.hasClass("disabled") } @@ -62,13 +59,13 @@ class MessagePaginationSpec extends grails.plugin.geb.GebSpec { when: to PageMessageSent then: - messageList.messages.size() == 50 + messageList.messageCount() == 50 footer.prevPage.hasClass("disabled") when: footer.nextPage.click() waitFor {!footer.prevPage.hasClass("disabled")} then: - messageList.messages.size() == 1 + messageList.messageCount() == 1 footer.nextPage.hasClass("disabled") } @@ -79,13 +76,13 @@ class MessagePaginationSpec extends grails.plugin.geb.GebSpec { when: to PageMessageFolder, folderId then: - messageList.messages.size() == 50 + messageList.messageCount() == 50 footer.prevPage.hasClass("disabled") when: footer.nextPage.click() waitFor {!footer.prevPage.hasClass("disabled")} then: - messageList.messages.size() == 1 + messageList.messageCount() == 1 footer.nextPage.hasClass("disabled") } @@ -96,13 +93,13 @@ class MessagePaginationSpec extends grails.plugin.geb.GebSpec { when: to PageMessagePoll, pollId then: - messageList.messages.size() == 50 + messageList.messageCount() == 50 footer.prevPage.hasClass("disabled") when: footer.nextPage.click() waitFor {!footer.prevPage.hasClass("disabled")} then: - messageList.messages.size() == 1 + messageList.messageCount() == 1 footer.nextPage.hasClass("disabled") } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy index a73addb5b..e41ffa50b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy @@ -15,15 +15,15 @@ class MessageTrashSpec extends grails.plugin.geb.GebSpec { when: to PageMessageTrash then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: footer.showStarred.click() - waitFor { messageList.messages.size() == 1 } + waitFor { messageList.messageCount() == 1 } then: messageList.messages[0].source == "src1" when: footer.showAll.click() - waitFor { messageList.messages.size() == 2 } + waitFor { messageList.messageCount() == 2 } then: messageList.messages[0].source == "src1" messageList.messages[1].source == "src2" diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy index dc80e90ef..76dc33c74 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy @@ -10,17 +10,17 @@ class MessagesRecievedSpec extends MessageBaseSpec { createInboxTestMessages() to PageMessageInbox then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: sleep 11000 then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 !messageList.newMessageNotification.displayed when: createTestMessages() sleep 5000 then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 !messageList.newMessageNotification.displayed when: sleep 5000 @@ -33,17 +33,17 @@ class MessagesRecievedSpec extends MessageBaseSpec { createInboxTestMessages() to PageMessageInbox then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: createTestMessages() sleep 11000 then: waitFor { messageList.newMessageNotification.displayed } - messageList.messages.size() == 3 + messageList.messageCount() == 3 when: messageList.newMessageNotification.find("a").click() then: - waitFor { messageList.messages.size() == 5 } + waitFor { messageList.messageCount() == 5 } !messageList.newMessageNotification.displayed } @@ -52,7 +52,7 @@ class MessagesRecievedSpec extends MessageBaseSpec { createInboxTestMessages() to PageMessageInbox, Fmessage.findBySrc('Bob').id then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: createTestMessages() sleep 11000 diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index c816471d9..ec39d708f 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -75,6 +75,7 @@ class MessageList extends geb.Module { sources { $('td.message-sender-cell')*.text() } messages { moduleList MessageListRow, $('tbody tr') } message { index -> ++index; $("tbody tr:nth-child($index)") } + messageCount { js.exec('return jQuery("#main-list tbody tr").size()') as Integer } toggleSelect { index -> message(index).find('input[type=checkbox]').click(); true } hasClass { index, cssClass -> message(index).hasClass(cssClass) } selectedMessages { moduleList MessageListRow, $('tr.selected') } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/QuickMessageFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/QuickMessageFSpec.groovy index 23f0f3a66..35cb871e8 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/QuickMessageFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/QuickMessageFSpec.groovy @@ -103,7 +103,7 @@ class QuickMessageFSpec extends grails.plugin.geb.GebSpec { when: to PageMessagePending then: - waitFor { messageList.messages.size() == 1 } + waitFor { messageList.messageCount() == 1 } } def "should select members belonging to the selected group"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy index 9bef67239..ed9f529d7 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy @@ -63,15 +63,15 @@ class PollListSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams' then: - messageList.messages.size() == 2 + messageList.messageCount() == 2 when: footer.showStarred.click() - waitFor { messageList.messages.size() == 1 } + waitFor { messageList.messageCount() == 1 } then: messageList.sources == ['Bob'] when: footer.showAll.click() - waitFor {messageList.messages.size() == 2} + waitFor {messageList.messageCount() == 2} then: messageList.sources == ['Alice', 'Bob'] } @@ -132,17 +132,17 @@ class PollListSpec extends PollBaseSpec { createTestMessages() to PageMessagePoll, 'Football Teams' then: - messageList.messages.size == 2 + messageList.messageCount == 2 when: sleep 11000 then: - messageList.messages.size == 2 + messageList.messageCount == 2 !messageList.newMessageNotification.displayed when: createMoreTestMessages() sleep 5000 then: - messageList.messages.size == 2 + messageList.messageCount == 2 !messageList.newMessageNotification.displayed when: sleep 7000 diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy index 3ab67ee0b..4f0ad09d0 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy @@ -16,7 +16,7 @@ class SearchViewSpec extends SearchBaseSpec { waitFor("veryslow") { searchsidebar.searchBtn.displayed } searchsidebar.searchBtn.click() then: - waitFor("veryslow") { messageList.messages.size() == 3 } + waitFor("veryslow") { messageList.messageCount() == 3 } } def "can toggle between viewing all results and viewing only starred"() { @@ -25,15 +25,15 @@ class SearchViewSpec extends SearchBaseSpec { waitFor("veryslow") { searchsidebar.searchBtn.displayed } searchsidebar.searchBtn.click() then: - waitFor("veryslow") { messageList.messages.size() == 3 } + waitFor("veryslow") { messageList.messageCount() == 3 } when: footer.showStarred.click() then: - waitFor("veryslow") { messageList.messages.size() == 1 } + waitFor("veryslow") { messageList.messageCount() == 1 } when: footer.showAll.click() then: - waitFor("veryslow") { messageList.messages.size() == 3 } + waitFor("veryslow") { messageList.messageCount() == 3 } } def "group list and activity lists are displayed when they exist"() { @@ -129,7 +129,7 @@ class SearchViewSpec extends SearchBaseSpec { then: waitFor{ searchsidebar.searchBtn.displayed } searchsidebar.messageStatus == 'outbound' - messageList.messages.size() == 3 + messageList.messageCount() == 3 } def "should clear search results" () { @@ -155,12 +155,12 @@ class SearchViewSpec extends SearchBaseSpec { searchsidebar.searchBtn.displayed searchsidebar.searchBtn.click() then: - waitFor { messageList.messages.size() == 6 } + waitFor { messageList.messageCount() == 6 } messageList.toggleSelect(0) waitFor("veryslow") { singleMessageDetails.text == "received1" } singleMessageDetails.delete.click() then: - waitFor("veryslow") { messageList.messages.size() == 5 } + waitFor("veryslow") { messageList.messageCount() == 5 } notifications.flashMessage.text()?.contains("Message moved to trash") } @@ -326,7 +326,7 @@ class SearchViewSpec extends SearchBaseSpec { searchsidebar.searchBtn.click() then: waitFor{ searchsidebar.searchBtn.displayed } - messageList.messages.size() == 2 + messageList.messageCount() == 2 messageList.messages[0].text == 'experiment' messageList.messages[0].source == 'To: 3 recipients' } From 90343b318080c98440398613aeac2095b01f2b71 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 27 Feb 2013 12:09:34 +0300 Subject: [PATCH 1024/2668] Fixed typo in test name. --- ...{MessagesRecievedSpec.groovy => MessagesReceivedSpec.groovy} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename plugins/frontlinesms-core/test/functional/frontlinesms2/message/{MessagesRecievedSpec.groovy => MessagesReceivedSpec.groovy} (97%) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy similarity index 97% rename from plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy rename to plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy index 76dc33c74..fef87c456 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesRecievedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy @@ -3,7 +3,7 @@ package frontlinesms2.message import frontlinesms2.* import frontlinesms2.utils.* -class MessagesRecievedSpec extends MessageBaseSpec { +class MessagesReceivedSpec extends MessageBaseSpec { def 'new messages in the current section are checked for in the backround every ten seconds and causes a notification to appear if there are new messages'() { when: From 9e00c491fb284962d31b69f6db805fab89f73515 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 27 Feb 2013 12:11:39 +0300 Subject: [PATCH 1025/2668] Removed sleeps from MessagesReceivedSpec --- .../message/MessagesReceivedSpec.groovy | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy index fef87c456..d9248092b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessagesReceivedSpec.groovy @@ -4,30 +4,21 @@ import frontlinesms2.* import frontlinesms2.utils.* class MessagesReceivedSpec extends MessageBaseSpec { - def 'new messages in the current section are checked for in the backround every ten seconds and causes a notification to appear if there are new messages'() { when: createInboxTestMessages() to PageMessageInbox - then: - messageList.messageCount() == 2 - when: - sleep 11000 then: messageList.messageCount() == 2 !messageList.newMessageNotification.displayed when: createTestMessages() - sleep 5000 then: messageList.messageCount() == 2 !messageList.newMessageNotification.displayed - when: - sleep 5000 - then: waitFor { messageList.newMessageNotification.displayed } } - + def 'clicking the new message notification refreshes the list and removes the notification'() { when: createInboxTestMessages() @@ -36,7 +27,6 @@ class MessagesReceivedSpec extends MessageBaseSpec { messageList.messageCount() == 2 when: createTestMessages() - sleep 11000 then: waitFor { messageList.newMessageNotification.displayed } messageList.messageCount() == 3 @@ -55,7 +45,6 @@ class MessagesReceivedSpec extends MessageBaseSpec { messageList.messageCount() == 2 when: createTestMessages() - sleep 11000 then: waitFor { messageList.newMessageNotification.displayed } when: From 8a01ad534fe01e6be88ad1bb582f15d471ae5215 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 27 Feb 2013 16:36:53 +0300 Subject: [PATCH 1026/2668] Cleaned up functional tests to remove message moduleList references. --- .../folder/FolderListSpec.groovy | 23 ++++----- .../message/MessageActionSpec.groovy | 3 +- .../message/MessageAddContactSpec.groovy | 2 +- .../message/MessageArchiveSpec.groovy | 8 ++-- .../message/MessageCheckSpec.groovy | 8 ++-- .../message/MessageInboxSpec.groovy | 24 +++++----- .../message/MessageNavigationSpec.groovy | 8 ++-- .../message/MessageTrashSpec.groovy | 6 +-- .../message/MessageViewSpec.groovy | 4 +- .../frontlinesms2/message/PageMessage.groovy | 41 +++++++--------- .../frontlinesms2/poll/PollCedSpec.groovy | 14 +++--- .../frontlinesms2/poll/PollListSpec.groovy | 29 +++++------- .../frontlinesms2/poll/PollViewSpec.groovy | 15 +++--- .../search/SearchCheckSpec.groovy | 10 ++-- .../search/SearchViewSpec.groovy | 9 ++-- .../subscription/SubscriptionViewSpec.groovy | 47 ++++++++----------- 16 files changed, 120 insertions(+), 131 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy index 0c8344ec2..baa72cde3 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy @@ -17,7 +17,9 @@ class FolderListSpec extends FolderBaseSpec { when: to PageMessageFolder, Folder.findByName('Work') then: - messageList.sources.containsAll(['Jane', 'Max']) + messageList.messageCount() == 2 + messageList.messageSource(0) == 'Jane' + messageList.messageSource(1) == 'Max' } def 'no message is selected when a folder is first loaded'() { @@ -38,9 +40,9 @@ class FolderListSpec extends FolderBaseSpec { when: to PageMessageFolder, folder then: - messageList.messages[1].source == 'Max' - messageList.messages[1].text == 'I will be late' - DATE_FORMAT.format(messageList.messages[1].date) ==~ /[0-9]{2} [A-Za-z]{3,9}, [0-9]{4} [0-9]{2}:[0-9]{2} [A-Z]{2}/ + messageList.messageSource(1) == 'Max' + messageList.messageText(1) == 'I will be late' + messageList.messageDate(1) } def 'selected folder is highlighted'() { @@ -78,12 +80,13 @@ class FolderListSpec extends FolderBaseSpec { footer.showStarred.jquery.trigger("click") then: waitFor { messageList.messageCount() == 2 } - messageList.messages[1].source == 'Max' + messageList.messageSource(1) == 'Max' when: footer.showAll.jquery.trigger("click") then: waitFor { messageList.messageCount() == 2 } - messageList.sources.containsAll(['Jane', 'Max']) + messageList.messageSource(0) == 'Jane' + messageList.messageSource(1) == 'Max' } def "should autopopulate the message body when 'forward' is clicked"() { @@ -198,9 +201,9 @@ class FolderListSpec extends FolderBaseSpec { at PageMessageFolder to PageMessageTrash, Trash.findByObjectId(folderId).id then: - messageList.messages[0].source == 'Work' - messageList.messages[0].text == '2 message(s)' - DATE_FORMAT.format(messageList.messages[0].date) == DATE_FORMAT.format(Trash.findByObjectId(folderId).dateCreated) + messageList.messageSource(0) == 'Work' + messageList.messageText(0) == '2 message(s)' + DATE_FORMAT.format(messageList.messageDate(0)) == DATE_FORMAT.format(Trash.findByObjectId(folderId).dateCreated) senderDetails == 'Work folder' DATE_FORMAT.format(date) == DATE_FORMAT.format(Trash.findByObjectId(folderId).dateCreated) } @@ -236,8 +239,6 @@ class FolderListSpec extends FolderBaseSpec { footer.showIncoming.click() then: waitFor { messageList.messageCount() == 2 } - when: - sleep 11000 then: !messageList.newMessageNotification.displayed } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy index 748dde613..072aea16d 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy @@ -108,7 +108,7 @@ class MessageActionSpec extends frontlinesms2.poll.PollBaseSpec { then: waitFor { messageList.displayed } when: - messageList.messages.checkbox[0].click() + messageList.toggleSelect(0) then: waitFor { singleMessageDetails.displayed } when: @@ -123,4 +123,3 @@ class MessageActionSpec extends frontlinesms2.poll.PollBaseSpec { } } - diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageAddContactSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageAddContactSpec.groovy index e214ff03c..5b0d6b3fe 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageAddContactSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageAddContactSpec.groovy @@ -14,7 +14,7 @@ class MessageAddContactSpec extends MessageBaseSpec { when: to PageMessageInbox, contactlessMessage.id then: - waitFor { messageList.messages[0].source == '+254778899' } + waitFor { messageList.messageSource(0) == '+254778899' } } def 'add contact button is displayed and redirects to create contacts page with number field prepopulated'() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageArchiveSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageArchiveSpec.groovy index dcee75cf6..a425a7149 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageArchiveSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageArchiveSpec.groovy @@ -17,15 +17,15 @@ class MessageArchiveSpec extends MessageBaseSpec { when: to PageMessageInbox messageList.toggleSelect(0) - waitFor { singleMessageDetails.text == "test2" } + waitFor { singleMessageDetails.text == 'test2' } singleMessageDetails.archive.click() to PageArchiveInbox then: - messageList.messages[0].text == "test2" + messageList.messageText(0) == 'test2' when: to PageMessageInbox then: - !messageList.messages.text.contains("test2") + messageList.messageText(0) != 'test2' } def 'archived messages do not show up in sent view'() { @@ -43,7 +43,7 @@ class MessageArchiveSpec extends MessageBaseSpec { singleMessageDetails.archive.click() to PageArchiveSent then: - waitFor { messageList.messages[0].text == "hi Mary" } + waitFor { messageList.messageText(0) == "hi Mary" } when: to PageMessageSent then: diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageCheckSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageCheckSpec.groovy index 54a0ef63d..6c87f39ba 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageCheckSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageCheckSpec.groovy @@ -113,7 +113,7 @@ class MessageCheckSpec extends MessageBaseSpec { to PageMessageInbox, Fmessage.findBySrc('Alice').id messageList.selectAll.click() then: - waitFor { messageList.selectedMessages.size() == 2 } + waitFor { messageList.selectedMessageCount() == 2 } when: messageList.selectAll.click() then: @@ -134,13 +134,13 @@ class MessageCheckSpec extends MessageBaseSpec { to PageMessageInbox messageList.toggleSelect(0) then: - messageList.messages[0].checkbox.checked + messageList.isChecked(0) when: - messageList.messages[1].textLink.click() + messageList.clickLink(1) then: waitFor('veryslow') { at PageMessageInbox } waitFor('verslow') { messageList.displayed } - !messageList.messages[0].checkbox.checked + !messageList.isChecked(0) } def "select all should update the total message count when messages are checked"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy index 0ee5384fe..d1bfc3bc0 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy @@ -14,7 +14,8 @@ class MessageInboxSpec extends MessageBaseSpec { when: to PageMessageInbox then: - messageList.sources.containsAll(['Alice', 'Bob']) + messageList.messageSource(0) == 'Alice' + messageList.messageSource(1) == 'Bob' } def 'message details are shown in row'() { @@ -23,9 +24,9 @@ class MessageInboxSpec extends MessageBaseSpec { when: to PageMessageInbox then: - messageList.messages[1].source == 'Bob' - messageList.messages[1].text == 'hi Bob' - messageList.messages[1].date != null // ie is a valid date object + messageList.messageSource(1) == 'Bob' + messageList.messageText(1) == 'hi Bob' + messageList.messageDate(1) // ie is a valid date object } def 'no message is selected when inbox is first loaded'() { @@ -60,11 +61,11 @@ class MessageInboxSpec extends MessageBaseSpec { when: to PageMessageInbox, aliceMessage.id then: - messageList.selectedMessages[0].linkUrl == "/message/inbox/show/${aliceMessage.id}" + messageList.selectedMessageLinkUrl == "/message/inbox/show/${aliceMessage.id}" when: to PageMessageInbox, bobMessage.id then: - messageList.selectedMessages[0].linkUrl == "/message/inbox/show/${bobMessage.id}" + messageList.selectedMessageLinkUrl == "/message/inbox/show/${bobMessage.id}" } def 'CSS classes READ and UNREAD are set on corresponding messages'() { @@ -76,8 +77,8 @@ class MessageInboxSpec extends MessageBaseSpec { when: to PageMessageInbox, m2.id then: - messageList.messages[0].isRead - !messageList.messages[1].isRead + messageList.isRead(0) + !messageList.isRead(1) } def 'contact name is displayed if message src is an existing contact'() { @@ -87,7 +88,7 @@ class MessageInboxSpec extends MessageBaseSpec { when: to PageMessageInbox then: - messageList.sources.contains('June') + messageList.messageSource(0) == 'June' } def "should autopopulate the recipients name on click of reply even if the recipient is not in contact list"() { @@ -115,12 +116,13 @@ class MessageInboxSpec extends MessageBaseSpec { footer.showStarred.click() waitFor { messageList.messageCount() == 1 } then: - messageList.messages[0].source == 'Alice' + messageList.messageSource(0) == 'Alice' when: footer.showAll.click() waitFor { messageList.messageCount() == 2 } then: - messageList.sources.containsAll(['Alice', 'Bob']) + messageList.messageSource(0) == 'Alice' + messageList.messageSource(1) == 'Bob' } def "should autopopulate the message body when 'forward' is clicked"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageNavigationSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageNavigationSpec.groovy index b5a9b371b..03603ba59 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageNavigationSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageNavigationSpec.groovy @@ -16,7 +16,7 @@ class MessageNavigationSpec extends MessageBaseSpec { messageList << Keys.chord(Keys.ARROW_DOWN) then: waitFor { messageList.hasClass(1, "selected") } - waitFor { messageList.messages[1].text == singleMessageDetails.text } + waitFor { messageList.messageText(1) == singleMessageDetails.text } !messageList.hasClass(0, "selected") } @@ -32,7 +32,7 @@ class MessageNavigationSpec extends MessageBaseSpec { messageList << Keys.chord(Keys.ARROW_UP) then: waitFor { messageList.hasClass(0, "selected") } - waitFor { messageList.messages[0].text == singleMessageDetails.text } + waitFor { messageList.messageText(0) == singleMessageDetails.text } !messageList.hasClass(1, "selected") } @@ -82,12 +82,12 @@ class MessageNavigationSpec extends MessageBaseSpec { messageList << Keys.chord(Keys.ARROW_DOWN) def currrentText = singleMessageDetails.text then: - waitFor { messageList.messages[0].text != currrentText } + waitFor { messageList.messageText(0) != currrentText } waitFor { singleMessageDetails.text == currrentText } when: messageList << Keys.chord(Keys.ARROW_DOWN) then: - waitFor { messageList.messages[0].text != currrentText } + waitFor { messageList.messageText(0) != currrentText } waitFor { singleMessageDetails.text == currrentText } } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy index e41ffa50b..001e141a5 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageTrashSpec.groovy @@ -20,13 +20,13 @@ class MessageTrashSpec extends grails.plugin.geb.GebSpec { footer.showStarred.click() waitFor { messageList.messageCount() == 1 } then: - messageList.messages[0].source == "src1" + messageList.messageSource(0) == "src1" when: footer.showAll.click() waitFor { messageList.messageCount() == 2 } then: - messageList.messages[0].source == "src1" - messageList.messages[1].source == "src2" + messageList.messageSource(0) == 'src1' + messageList.messageSource(1) == 'src2' } def "should not contain export button" () { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageViewSpec.groovy index efa7be6a9..22fd172a6 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageViewSpec.groovy @@ -11,8 +11,8 @@ class MessageViewSpec extends grails.plugin.geb.GebSpec { when: 'Inbox is open' to PageMessageInbox then: 'message column should display the appropriate text' - messageList.messages[0].source == 'Bob' - messageList.messages[0].text == '' + messageList.messageSource(0) == 'Bob' + messageList.messageText(0) == '' } def "message with special html characters should display in confirm tab"(){ diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index ec39d708f..6a5dd95dd 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -72,13 +72,23 @@ class MessageList extends geb.Module { static base = { $('#main-list') } static content = { selectAll { $("input#message-select-all") } - sources { $('td.message-sender-cell')*.text() } - messages { moduleList MessageListRow, $('tbody tr') } - message { index -> ++index; $("tbody tr:nth-child($index)") } + messageSource { i=0 -> message(i).find('td.message-sender-cell').text() } + message { i=0, onlySelected=false -> onlySelected? $('tbody tr.selected', i): $("tbody tr:nth-of-type(${i+1})") } messageCount { js.exec('return jQuery("#main-list tbody tr").size()') as Integer } - toggleSelect { index -> message(index).find('input[type=checkbox]').click(); true } - hasClass { index, cssClass -> message(index).hasClass(cssClass) } - selectedMessages { moduleList MessageListRow, $('tr.selected') } + selectedMessageCount { js.exec('return jQuery("#main-list tbody tr.selected").size()') as Integer } + clickLink { i -> message(i).find('td.message-text-cell a').click(); true } + selectedMessageLinkUrl { i=0 -> message(i, true).find('td.message-text-cell a').@href } + getCheckbox { i -> message(i).find('input[type=checkbox]') } + isChecked { i -> getCheckbox(i).checked } + isRead { i -> hasClass(i, 'read') } + toggleSelect { i -> getCheckbox(i).click(); true } + hasClass { i, cssClass -> message(i).hasClass(cssClass) } + getDateCell { i -> message(i).find('td.message-date-cell') } + messageDate { i=0 -> + new SimpleDateFormat("dd MMMM, yyyy hh:mm a", Locale.US).parse(getDateCell(i).text()) + } + messageText { i=0, onlySelected=false -> message(i, onlySelected).find('td.message-text-cell').text() } + selectedMessageText { i=0 -> messageText(i, true) } noContent { $('tr.no-content') } starFor { message -> if (message instanceof Fmessage) { @@ -98,24 +108,6 @@ class MessageList extends geb.Module { } } -class MessageListRow extends geb.Module { - static content = { - checkbox { $('td.message-select-cell input[type="checkbox"]') } - star { $('a.starred, a.unstarred') } - isStarred { $('a.starred').count() == 1 } - isRead { $(':first-child').parent().hasClass('read') } //TODO: replace with a more sensible selector for base - source { $('td.message-sender-cell').text() } - text { $('td.message-text-cell').text() } - textLink { $('td.message-text-cell a')} - dateCell {$('td.message-date-cell').text()} - date { - new SimpleDateFormat("dd MMMM, yyyy hh:mm a", Locale.US).parse($('td.message-date-cell').text()) - } - linkUrl { $('td.message-text-cell a').@href } - hasStatus { status -> $(':first-child').parent().hasClass(status) } - } -} - class SingleMessageDetails extends geb.Module { static base = { $('#single-message') } static content = { @@ -160,3 +152,4 @@ class MultipleMessageDetails extends geb.Module { moveActions { $('select#move-actions option')*.text() } } } + diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollCedSpec.groovy index 37c84adbc..a8dd46485 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollCedSpec.groovy @@ -342,8 +342,9 @@ class PollCedSpec extends PollBaseSpec { when: to PageMessageTrash, Trash.findByObjectId(poll.id).id then: - messageList.sources.join() == 'Who is badder?' - messageList.messages.text.join() == "0 message(s)" + messageList.messageCount == 1 + messageList.messageSource == 'Who is badder?' + messageList.messageText == '0 message(s)' } def "selected poll and its details are displayed"() { @@ -352,9 +353,10 @@ class PollCedSpec extends PollBaseSpec { when: to PageMessageTrash, Trash.findByObjectId(poll.id).id then: - messageList.sources.join() == "${poll.name}" - messageList.messages.text.join() == "${poll.getLiveMessageCount()} message(s)" - messageList.messages.dateCell.join() ==~ /[0-9]{2} [A-Za-z]{3,9}, [0-9]{4} [0-9]{2}:[0-9]{2} [A-Z]{2}/ + messageList.messageCount == 1 + messageList.messageSource == poll.name + messageList.messageText == "${poll.getLiveMessageCount()} message(s)" + messageList.messageDate } def "clicking on empty trash permanently deletes a poll"() { @@ -511,4 +513,4 @@ class PollCedSpec extends PollBaseSpec { } } } -} \ No newline at end of file +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy index ed9f529d7..cd7d91f2a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy @@ -14,7 +14,8 @@ class PollListSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams' then: - messageList.sources.containsAll('Alice', 'Bob') + messageList.messageSource(0) == 'Alice' + messageList.messageSource(1) == 'Bob' } def "message's poll details are shown in list"() { @@ -24,9 +25,9 @@ class PollListSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams', Fmessage.findBySrc('Bob').id then: - messageList.messages[1].source == 'Bob' - messageList.messages[1].text == 'manchester ("I like manchester")' - messageList.messages[1].dateCell ==~ /[0-9]{2} [A-Za-z]{3,9}, [0-9]{4} [0-9]{2}:[0-9]{2} [A-Z]{2}/ + messageList.messageSource(1) == 'Bob' + messageList.messageText(1) == 'manchester ("I like manchester")' + messageList.messageDate(1) } def "poll details are shown in header and graph is displayed"() { @@ -68,12 +69,13 @@ class PollListSpec extends PollBaseSpec { footer.showStarred.click() waitFor { messageList.messageCount() == 1 } then: - messageList.sources == ['Bob'] + messageList.messageSource(0) == 'Bob' when: footer.showAll.click() - waitFor {messageList.messageCount() == 2} + waitFor { messageList.messageCount() == 2 } then: - messageList.sources == ['Alice', 'Bob'] + messageList.messageSource(0) == 'Alice' + messageList.messageSource(1) == 'Bob' } def "should display message details when message is checked"() { @@ -131,22 +133,13 @@ class PollListSpec extends PollBaseSpec { createTestPolls() createTestMessages() to PageMessagePoll, 'Football Teams' - then: - messageList.messageCount == 2 - when: - sleep 11000 then: messageList.messageCount == 2 !messageList.newMessageNotification.displayed when: createMoreTestMessages() - sleep 5000 - then: - messageList.messageCount == 2 - !messageList.newMessageNotification.displayed - when: - sleep 7000 then: - waitFor { messageList.newMessageNotification.displayed } + waitFor('very slow') { messageList.newMessageNotification.displayed } } } + diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollViewSpec.groovy index 5e79bc193..c81443a41 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollViewSpec.groovy @@ -31,7 +31,7 @@ class PollViewSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams', message.id then: - messageList.messages[1].source == 'Bob' + messageList.messageSource(1) == 'Bob' } def 'selected message and its details are displayed'() { @@ -42,9 +42,9 @@ class PollViewSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams', message.id then: - messageList.messages[0].source == message.src - messageList.messages[0].dateCell ==~ /[0-9]{2} [A-Za-z]{3,9}, [0-9]{4} [0-9]{2}:[0-9]{2} [A-Z]{2}/ - messageList.messages[0].text == 'manchester ("go manchester")' + messageList.messageSource(0) == message.src + messageList.messageDate(0) + messageList.messageText(0) == 'manchester ("go manchester")' } def 'selected message is highlighted'() { @@ -57,10 +57,13 @@ class PollViewSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams', aliceMessage.id then: - messageList.selectedMessages.text == ['manchester ("go manchester")'] + messageList.selectedMessageCount == 1 + messageList.selectedMessageText == 'manchester ("go manchester")' when: to PageMessagePoll, 'Football Teams', bobMessage.id then: - messageList.selectedMessages.text == ['manchester ("I like manchester")'] + messageList.selectedMessageCount == 1 + messageList.selectedMessageText == 'manchester ("I like manchester")' } } + diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchCheckSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchCheckSpec.groovy index 12a94f8bd..1154d7e14 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchCheckSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchCheckSpec.groovy @@ -27,7 +27,7 @@ class SearchCheckSpec extends SearchBaseSpec { messageList.toggleSelect(0) messageList.toggleSelect(1) then: - waitFor { messageList.selectedMessages.size() == 2} + waitFor { messageList.selectedMessageCount() == 2} } def "checked message details are displayed when message is checked"() { @@ -72,7 +72,7 @@ class SearchCheckSpec extends SearchBaseSpec { messageList.toggleSelect(0) messageList.toggleSelect(1) then: - waitFor { messageList.selectedMessages.size() == 2 } + waitFor { messageList.selectedMessageCount() == 2 } when: messageList.toggleSelect(0) messageList.toggleSelect(1) @@ -105,14 +105,14 @@ class SearchCheckSpec extends SearchBaseSpec { to PageSearchResult, "hi" messageList.selectAll.click() then: - waitFor { messageList.selectedMessages.size() == 3 } + waitFor { messageList.selectedMessageCount() == 3 } when: messageList.toggleSelect(1) then: - waitFor { messageList.selectedMessages.size() == 2 } + waitFor { messageList.selectedMessageCount() == 2 } when: messageList.toggleSelect(2) then: - waitFor { messageList.selectedMessages.size() == 1 } + waitFor { messageList.selectedMessageCount() == 1 } } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy index 4f0ad09d0..4f3b2f911 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy @@ -103,7 +103,10 @@ class SearchViewSpec extends SearchBaseSpec { then: waitFor { searchsidebar.searchBtn.displayed } searchsidebar.messageStatus == 'inbound' - messageList.messages.text.containsAll(['hi alex', 'meeting at 11.00']) + messageList.messageCount() == 3 + messageList.messageText(0) == 'chicken ("eat more cow")' + messageList.messageText(1) == 'hi alex' + messageList.messageText(2) == 'meeting at 11.00' } def "should fetch all sent messages alone"() { @@ -327,7 +330,7 @@ class SearchViewSpec extends SearchBaseSpec { then: waitFor{ searchsidebar.searchBtn.displayed } messageList.messageCount() == 2 - messageList.messages[0].text == 'experiment' - messageList.messages[0].source == 'To: 3 recipients' + messageList.messageText(0) == 'experiment' + messageList.messageSource(0) == 'To: 3 recipients' } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/subscription/SubscriptionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/subscription/SubscriptionViewSpec.groovy index ff62bc008..07a92fcef 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/subscription/SubscriptionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/subscription/SubscriptionViewSpec.groovy @@ -157,12 +157,9 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { to PageMessageSubscription, Subscription.findByName('Camping Subscription') then: waitFor { at PageMessageSubscription } - messageList.messages*.source.containsAll(["prudence", "wilburforce"]) - messageList.messages.each { messageRow -> - if (messageRow.source == "prudence") { - assert messageRow.text()?.contains("join") - } - } + messageList.messageSource(0) == 'wilburforce' + messageList.messageSource(1) == 'prudence' + messageList.messageText(1).startsWith('join ') when: header.groupLink.click() then: @@ -204,12 +201,9 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { to PageMessageSubscription, Subscription.findByName('Camping Subscription') then: waitFor { at PageMessageSubscription } - messageList.messages*.source.containsAll(["prudence", "wilburforce"]) - messageList.messages.each { messageRow -> - if (messageRow.source == "prudence") { - assert messageRow.text()?.contains("leave") - } - } + messageList.messageSource(0) == 'wilburforce' + messageList.messageSource(1) == 'prudence' + messageList.messageText(1).startsWith('leave ') when: header.groupLink.click() then: @@ -252,12 +246,9 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { to PageMessageSubscription, Subscription.findByName('Camping Subscription') then: waitFor { at PageMessageSubscription } - messageList.messages*.source.containsAll(["prudence", "wilburforce"]) - messageList.messages.each { messageRow -> - if (messageRow.source == "prudence") { - assert messageRow.text()?.contains("toggle") - } - } + messageList.messageSource(0) == 'wilburforce' + messageList.messageSource(1) == 'prudence' + messageList.messageText(1).startsWith('toggle ') // TODO should these really say TOGGLE? or rather 'join' or 'leave' depending on what the toggle caused? when: header.groupLink.click() then: @@ -292,7 +283,7 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { then: waitFor { at PageMessageSubscription } ["join", "prudence", "wilburforce"].each { - messageList.messages[0].text()?.contains(it) + messageList.messageText(0)?.contains(it) } when: header.groupLink.click() @@ -375,7 +366,7 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { singleMessageDetails.text == "Test message 3" } - def "delete single message action works "() { + def "delete single message action works"() { when: to PageMessageSubscription, Subscription.findByName("Camping Subscription") then: @@ -388,10 +379,10 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' } - def "delete multiple message action works for multiple select"(){ + def "delete multiple message action works for multiple select"() { when: to PageMessageSubscription, Subscription.findByName("Camping Subscription") then: @@ -406,7 +397,7 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) } def "move single message action works"() { @@ -424,12 +415,12 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { then: waitFor("veryslow") { at PageMessageSubscription } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) == 'Test message 0' } def "move multiple message action works"() { @@ -447,12 +438,14 @@ class SubscriptionViewSpec extends SubscriptionBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Test message 0", "Test message 1") + messageList.messageText(0) == 'Test message 0' + messageList.messageText(1) == 'Test message 1' } def "moving a message from another activity to a subscription opens the categorise popup for the chosen subscription"() { From 92a96f0082f4ff48835c655b893d788c6d458a96 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 28 Feb 2013 10:39:16 +0300 Subject: [PATCH 1027/2668] Url mappings no longer excluded in plugin build --- plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy index ed1cc4ac6..8b93e3347 100644 --- a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy +++ b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy @@ -2,8 +2,7 @@ class FrontlinesmsCoreGrailsPlugin { def version = "3.0-SNAPSHOT" def grailsVersion = "2.0.3" def pluginExcludes = ["grails-app/views/error.gsp", - "grails-app/conf/CoreBootStrap.groovy", - "grails-app/conf/CoreUrlMappings.groovy"] + "grails-app/conf/CoreBootStrap.groovy"] def author = "FrontlineSMS team" def authorEmail = "dev@frontlinesms.com" def title = "FrontlineSMS Core" From 7003038ff2b72998d84ad3c9de0e9dea2d065976 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 10:58:54 +0300 Subject: [PATCH 1028/2668] Added linebreak to end of file. --- plugins/frontlinesms-core/web-app/css/help.css | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/web-app/css/help.css b/plugins/frontlinesms-core/web-app/css/help.css index 3934d288a..c7077690d 100644 --- a/plugins/frontlinesms-core/web-app/css/help.css +++ b/plugins/frontlinesms-core/web-app/css/help.css @@ -43,3 +43,4 @@ #modalBox.help .help-content ul, #modalBox.help .help-content ol { margin:6px 0; } #modalBox.help .help-content li { padding-left:1.5em; margin-top:3px; text-indent:-1em; } #modalBox.help .help-content li:before { content:"\00BB \0020" } + From 82f92ac01586d1bd54b57dc09b2641e82a853e45 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 11:00:54 +0300 Subject: [PATCH 1029/2668] Fixed bug in chosen.js causing dropdown to position underneath neighbouring elements. --- .../web-app/js/chosen.jquery.js | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/chosen.jquery.js b/plugins/frontlinesms-core/web-app/js/chosen.jquery.js index 6b9cc6cef..8c2e3831a 100644 --- a/plugins/frontlinesms-core/web-app/js/chosen.jquery.js +++ b/plugins/frontlinesms-core/web-app/js/chosen.jquery.js @@ -327,6 +327,21 @@ Copyright (c) 2011 by Harvest return Chosen.__super__.constructor.apply(this, arguments); } + function calculateDropTop(container, offset) { + var dd_top, scrollTop; + offset = offset || container.offset(); + dd_top = container.height(); + scrollTop = Math.max(parseInt($(window).scrollTop(), 10), 0); + return offset.top + dd_top - scrollTop; + } + + function calculateDropLeft(container, offset) { + var scrollLeft; + offset = offset || container.offset(); + scrollLeft = Math.max(parseInt($(window).scrollLeft(), 10), 0); + return offset.left - scrollLeft; + } + Chosen.prototype.setup = function() { this.form_field_jq = $(this.form_field); this.current_value = this.form_field_jq.val(); @@ -605,6 +620,14 @@ Copyright (c) 2011 by Harvest }; Chosen.prototype.results_show = function() { + var self = this; + + // picked from robmcguinness on https://github.com/harvesthq/chosen/issues/86: + // hide .chzn-drop when the window resizes else it will stay fixed with previous top and left coordinates + $(window).resize(function() { + self.results_hide(); + }); + var dd_top; if (!this.is_multiple) { this.selected_item.addClass("chzn-single-with-drop"); @@ -621,10 +644,14 @@ Copyright (c) 2011 by Harvest this.form_field_jq.trigger("liszt:showing_dropdown", { chosen: this }); + + var offset = this.container.offset(); this.dropdown.css({ - "top": dd_top + "px", - "left": 0 + "top": calculateDropTop(this.container, offset) + "px", + "left": calculateDropLeft(this.container, offset) + "px", + position:"fixed" }); + this.results_showing = true; this.search_field.focus(); this.search_field.val(this.search_field.val()); @@ -1052,9 +1079,8 @@ Copyright (c) 2011 by Harvest this.search_field.css({ 'width': w + 'px' }); - dd_top = this.container.height(); return this.dropdown.css({ - "top": dd_top + "px" + "top": calculateDropTop(this.container) + "px" }); } }; From 19a36427c300c8a033ff0eb935653dc1ef8ab278 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 11:41:26 +0300 Subject: [PATCH 1030/2668] Minor cleanup to chosen.js modifications. --- .../frontlinesms-core/web-app/js/chosen.jquery.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/chosen.jquery.js b/plugins/frontlinesms-core/web-app/js/chosen.jquery.js index 8c2e3831a..767599adc 100644 --- a/plugins/frontlinesms-core/web-app/js/chosen.jquery.js +++ b/plugins/frontlinesms-core/web-app/js/chosen.jquery.js @@ -327,10 +327,10 @@ Copyright (c) 2011 by Harvest return Chosen.__super__.constructor.apply(this, arguments); } - function calculateDropTop(container, offset) { + function calculateDropTop(self, offset) { var dd_top, scrollTop; - offset = offset || container.offset(); - dd_top = container.height(); + offset = offset || self.container.offset(); + dd_top = self.is_multiple ? self.container.height() : self.container.height() - 1; scrollTop = Math.max(parseInt($(window).scrollTop(), 10), 0); return offset.top + dd_top - scrollTop; } @@ -628,7 +628,6 @@ Copyright (c) 2011 by Harvest self.results_hide(); }); - var dd_top; if (!this.is_multiple) { this.selected_item.addClass("chzn-single-with-drop"); if (this.result_single_selected) { @@ -640,14 +639,13 @@ Copyright (c) 2011 by Harvest }); return false; } - dd_top = this.is_multiple ? this.container.height() : this.container.height() - 1; this.form_field_jq.trigger("liszt:showing_dropdown", { chosen: this }); var offset = this.container.offset(); this.dropdown.css({ - "top": calculateDropTop(this.container, offset) + "px", + "top": calculateDropTop(this, offset) + "px", "left": calculateDropLeft(this.container, offset) + "px", position:"fixed" }); @@ -1080,7 +1078,7 @@ Copyright (c) 2011 by Harvest 'width': w + 'px' }); return this.dropdown.css({ - "top": calculateDropTop(this.container) + "px" + "top": calculateDropTop(this) + "px" }); } }; From 8593bff463c312081566980d3102f76118d241c0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 28 Feb 2013 12:05:15 +0300 Subject: [PATCH 1031/2668] do/build_deploy_plugin only deploys to m2 if --m2-deploy is passed as an arg --- .../frontlinesms-core/do/build_deploy_plugin | 53 +++++++++++++------ 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 4f0fe07b8..b36bc4717 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -1,6 +1,22 @@ #!/bin/bash set -e +# Extract flags +FLAGS="" +M2_DEPLOY=false +while [[ $1 == "--"* ]]; do + if [ -z "$FLAGS" ]; then + FLAGS=$1 + else + FLAGS="$FLAGS $1" + fi + shift +done + +if [[ $FLAGS == *"--m2-deploy"* ]]; then + M2_DEPLOY=true +fi + echo "# extract app name from application.properties..." APP_NAME=`grep '^app.name=' application.properties | cut -d= -f2 | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` @@ -24,20 +40,23 @@ rm $IVY_CACHED_ZIP || echo "# Old plugin was not found in ivy cache." echo "# Deploying to local ivy cache..." cp $NEW_PLUGIN_ZIP_NAME $IVY_CACHED_ZIP -echo "# deploy core plugin to remote plugin repo" -echo "# TODO skip maven deploy for non-SNAPSHOT builds" -echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" -ftp -nv dev.frontlinesms.com << EOF -hash -user m2repo $FRONTLINESMS_MAVEN_PASSWORD -mkdir org -mkdir org/grails/plugins -mkdir org/grails/plugins/$APP_NAME -cd org/grails/plugins/$APP_NAME -mkdir $PLUGIN_VERSION -cd $PLUGIN_VERSION -put $NEW_PLUGIN_ZIP_NAME -exit -EOF - -echo "# Plugin built and deployed to remote maven repo." +echo "# Plugin built and deployed to local ivy cache." + +if $M2_DEPLOY ;then + echo "# deploy core plugin to remote plugin repo" + echo "# TODO skip maven deploy for non-SNAPSHOT builds" + echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" + ftp -nv dev.frontlinesms.com << EOF + hash + user m2repo $FRONTLINESMS_MAVEN_PASSWORD + mkdir org + mkdir org/grails/plugins + mkdir org/grails/plugins/$APP_NAME + cd org/grails/plugins/$APP_NAME + mkdir $PLUGIN_VERSION + cd $PLUGIN_VERSION + put $NEW_PLUGIN_ZIP_NAME + exit + EOF + echo "# Plugin deployed to remote maven repo." +fi From 3f44a69a40608ba0a6f71bbd8c82d93870fe5f31 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 28 Feb 2013 12:09:48 +0300 Subject: [PATCH 1032/2668] minor change to do/build_deploy_plugin --- plugins/frontlinesms-core/do/build_deploy_plugin | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index b36bc4717..3fd475f53 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -60,3 +60,4 @@ if $M2_DEPLOY ;then EOF echo "# Plugin deployed to remote maven repo." fi + From a686571ed7798366a54d77c8636ca753e148491f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 28 Feb 2013 12:19:34 +0300 Subject: [PATCH 1033/2668] fixed do/build_deploy_plugin --- .../frontlinesms-core/do/build_deploy_plugin | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 3fd475f53..9e2f35fbd 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -3,7 +3,6 @@ set -e # Extract flags FLAGS="" -M2_DEPLOY=false while [[ $1 == "--"* ]]; do if [ -z "$FLAGS" ]; then FLAGS=$1 @@ -13,6 +12,7 @@ while [[ $1 == "--"* ]]; do shift done +unset M2_DEPLOY if [[ $FLAGS == *"--m2-deploy"* ]]; then M2_DEPLOY=true fi @@ -42,21 +42,21 @@ cp $NEW_PLUGIN_ZIP_NAME $IVY_CACHED_ZIP echo "# Plugin built and deployed to local ivy cache." -if $M2_DEPLOY ;then +if [ -n "$M2_DEPLOY" ]; then echo "# deploy core plugin to remote plugin repo" echo "# TODO skip maven deploy for non-SNAPSHOT builds" echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" ftp -nv dev.frontlinesms.com << EOF - hash - user m2repo $FRONTLINESMS_MAVEN_PASSWORD - mkdir org - mkdir org/grails/plugins - mkdir org/grails/plugins/$APP_NAME - cd org/grails/plugins/$APP_NAME - mkdir $PLUGIN_VERSION - cd $PLUGIN_VERSION - put $NEW_PLUGIN_ZIP_NAME - exit + hash + user m2repo $FRONTLINESMS_MAVEN_PASSWORD + mkdir org + mkdir org/grails/plugins + mkdir org/grails/plugins/$APP_NAME + cd org/grails/plugins/$APP_NAME + mkdir $PLUGIN_VERSION + cd $PLUGIN_VERSION + put $NEW_PLUGIN_ZIP_NAME + exit EOF echo "# Plugin deployed to remote maven repo." fi From 7eb43b050ee5e329535d51d81e927f9ce535c1db Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 13:05:19 +0300 Subject: [PATCH 1034/2668] Cleaned up specs broken by messageList refactor. --- .../frontlinesms2/archive/ArchiveFSpec.groovy | 7 ++++-- .../autoforward/AutoforwardViewSpec.groovy | 15 +++++++----- .../autoreply/AutoreplyViewSpec.groovy | 24 ++++++++++--------- .../message/MessageDeleteSpec.groovy | 2 +- .../frontlinesms2/message/PageMessage.groovy | 2 +- .../WebconnectionViewSpec.groovy | 19 +++++++++------ 6 files changed, 41 insertions(+), 28 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy index 1abd19404..09492ccc4 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy @@ -26,12 +26,15 @@ class ArchiveFSpec extends ArchiveBaseSpec { when: to PageArchiveInbox, Fmessage.findBySrc('Max') then: - messageList.sources.sort() == ['Jane', 'Max'] + messageList.messageCount == 2 + messageList.messageSource(0) == 'Jane' + messageList.messageSource(1) == 'Max' when: to PageArchiveInbox, Fmessage.findBySrc('Max') singleMessageDetails.delete.click() then: - messageList.sources == ['Jane'] + messageList.messageCount == 1 + messageList.messageSource == 'Jane' } def '"Archive All" button does not appear in archive section'() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy index 4e0b36d37..1060c6a58 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy @@ -139,7 +139,7 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Sudden shock 0") + messageList.messageText(0) != 'Sudden shock 0' } def "delete multiple message action works for multiple select"(){ @@ -157,7 +157,8 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Sudden shock 0", "Sudden shock 1") + !(messageList.messageText(0) in ['Sudden shock 0', 'Sudden shock 1']) + !(messageList.messageText(1) in ['Sudden shock 0', 'Sudden shock 1']) } def "move single message action works"() { @@ -175,12 +176,12 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { then: waitFor("veryslow") { at PageMessageAutoforward } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Sudden shock 0") + messageList.messageText(0) != 'Sudden shock 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.contains("Sudden shock 0") + messageList.messageText(0) == 'Sudden shock 0' } def "move multiple message action works"() { @@ -198,12 +199,14 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Sudden shock 0", "Sudden shock 1") + !(messageList.messageText(0) in ['Sudden shock 0', 'Sudden shock 1']) + !(messageList.messageText(1) in ['Sudden shock 0', 'Sudden shock 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Sudden shock 0", "Sudden shock 1") + messageList.messageText(0) in ['Sudden shock 0', 'Sudden shock 1'] + messageList.messageText(1) in ['Sudden shock 0', 'Sudden shock 1'] } def "moving a message from another activity to a autoforward displays an update message"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy index 6b2da5a8b..c3e9a5d1c 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy @@ -26,9 +26,9 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { header[item] == value where: - item | value - 'title' | "fruits autoreply" - 'autoreplyMessage' | 'Hello, this is an autoreply message' + item | value + 'title' | "fruits autoreply" + 'autoreplyMessage' | 'Hello, this is an autoreply message' } def "clicking the edit option opens the Autoreply Dialog for editing"() { @@ -138,7 +138,7 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' } def "delete multiple message action works for multiple select"(){ @@ -148,7 +148,7 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { waitFor { messageList.displayed } when: messageList.toggleSelect(0) - waitFor {singleMessageDetails.displayed } + waitFor { singleMessageDetails.displayed } messageList.toggleSelect(1) then: waitFor { multipleMessageDetails.displayed } @@ -156,7 +156,8 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) } def "move single message action works"() { @@ -174,12 +175,11 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { then: waitFor("veryslow") { at PageMessageAutoreply } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: - waitFor { messageList.displayed } - messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) == 'Test message 0' } def "move multiple message action works"() { @@ -197,12 +197,14 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Test message 0", "Test message 1") + messageList.messageText(0) in ['Test message 0', 'Test message 1'] + messageList.messageText(1) in ['Test message 0', 'Test message 1'] } def "moving a message from another activity to a autoreply displays an update message"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy index 6d7103d0c..c21bd31be 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy @@ -15,7 +15,7 @@ class MessageDeleteSpec extends grails.plugin.geb.GebSpec { def bobMessage = Fmessage.findBySrc('Bob') deleteMessage(bobMessage) to PageMessageTrash - messageList.messages[0].textLink.click() + messageList.clickLink() then: waitFor { singleMessageDetails.displayed } Fmessage.deleted(false).count() == 1 diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index 6a5dd95dd..01c1a6a5a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -76,7 +76,7 @@ class MessageList extends geb.Module { message { i=0, onlySelected=false -> onlySelected? $('tbody tr.selected', i): $("tbody tr:nth-of-type(${i+1})") } messageCount { js.exec('return jQuery("#main-list tbody tr").size()') as Integer } selectedMessageCount { js.exec('return jQuery("#main-list tbody tr.selected").size()') as Integer } - clickLink { i -> message(i).find('td.message-text-cell a').click(); true } + clickLink { i=0 -> message(i).find('td.message-text-cell a').click(); true } selectedMessageLinkUrl { i=0 -> message(i, true).find('td.message-text-cell a').@href } getCheckbox { i -> message(i).find('input[type=checkbox]') } isChecked { i -> getCheckbox(i).checked } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy index 6d6730710..5e9a30207 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy @@ -172,7 +172,7 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' } def "delete multiple message action works for multiple select"(){ @@ -190,7 +190,8 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) } def "move single message action works"() { @@ -208,12 +209,12 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { then: waitFor("veryslow") { at PageMessageWebconnection } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) == 'Test message 0' } def "move multiple message action works"() { @@ -231,12 +232,14 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Test message 0", "Test message 1") + messageList.messageText(0) in ['Test message 0', 'Test message 1'] + messageList.messageText(1) in ['Test message 0', 'Test message 1'] } def "should display SENT message status for successfully forwarded messages"() { @@ -244,7 +247,9 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { to PageMessageWebconnection, Webconnection.findByName("Sync") then: waitFor { messageList.displayed } - messageList.messages*.any { it.hasStatus("sent") } + js.exec ''' + return $("#main-list tbody tr.ownerdetail-webconnection-SENT").size() > 0 + ''' } def "retry failed uploads option should be present in more actions dropdown, and should redirect to same view"() { From 85d2bc6b763f8fab650dc1c87dcdef02c4d1eee0 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 13:05:49 +0300 Subject: [PATCH 1035/2668] Re-enabled RecipientLookupServiceISpec --- .../grails/plugin/geb/GebSpec.groovy | 7 +++++ .../RecipientLookupServiceISpec.groovy | 28 +++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy b/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy index 7beb4f9c0..806638d3e 100644 --- a/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy @@ -3,4 +3,11 @@ package grails.plugin.geb /** TODO you should directly extend geb.spock.GebReportingSpec instead of this class */ @Deprecated class GebSpec extends geb.spock.GebReportingSpec { + def cleanupSpec() { + // CLearing the hibernate session should improve performance of tests over time + frontlinesms2.Contact.withSession { s -> + s.clear() + } + } } + diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy index 8fce3034f..38ed54f6f 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy @@ -4,15 +4,12 @@ import frontlinesms2.* import spock.lang.* class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { - /* - * TODO: UNCOMMENT THIS ONCE CORE-1703 IS MERGED TO MASTER - * - + @Shared def recipientLookupService - def i18ns = [group: "Groups", smartGroup: "Smartgroups", contact: "Contacts", address: "Add phone number"] + private static final i18ns = [group: "Groups", smartGroup: "Smartgroups", contact: "Contacts", address: "Add phone number"] - def createTestData() { - recipientLookupService.contactSearchService = new ContactSearchService() + // we can set up the data model here because none of these tests modify data + def setupSpec() { 20.times { Contact.build(name:"test-contact-$it") SmartGroup.build(name:"test-smartgroup-$it", mobile:"+543") @@ -20,9 +17,16 @@ class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { } } + def 'lookup should not return a contact if he is already selected'() { + when: +println "All contacts: ${Contact.findAll()*.name}" + def firstContactId = Contact.findByName('test-contact-1').id + def results = recipientLookupService.lookup([term:"test-contact-1", 'selectedSoFar[]':"contact-${firstContactId}"]) + then: + getLookupResultFor(results, 'contact') == ['test-contact-10', 'test-contact-11', 'test-contact-12'] + } + def "lookup should return matching contacts, groups and smartgroups, as well as the raw contact name"() { - given: - createTestData() when: def results = recipientLookupService.lookup([term:"12"]) then: @@ -34,8 +38,6 @@ class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { @Unroll def "lookup should only return addresses if they are valid phone numbers"() { - given: - createTestData() when: def results = recipientLookupService.lookup(query) then: @@ -52,8 +54,6 @@ class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { } def "contactSearchResults() should return the selected groups, contacts, smartgroups and addresses"() { - given: - createTestData() when: def results = recipientLookupService.contactSearchResults([recipients:["contact-${Contact.getAll()[0].id}".toString(), "group-${Group.getAll()[0].id}".toString(), "smartgroup-${SmartGroup.getAll()[0].id}".toString(), "address-+12345"]]) then: @@ -63,5 +63,5 @@ class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { private def getLookupResultFor(lookupResult, section) { return lookupResult.find { it.text == i18ns."$section" }?.items*.text } - */ } + From ddb0773200e6aa156aaef6707ea1cfcad4ced590 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 13:05:19 +0300 Subject: [PATCH 1036/2668] Cleaned up specs broken by messageList refactor. --- .../frontlinesms2/archive/ArchiveFSpec.groovy | 7 ++++-- .../autoforward/AutoforwardViewSpec.groovy | 15 +++++++----- .../autoreply/AutoreplyViewSpec.groovy | 24 ++++++++++--------- .../message/MessageDeleteSpec.groovy | 2 +- .../frontlinesms2/message/PageMessage.groovy | 2 +- .../WebconnectionViewSpec.groovy | 19 +++++++++------ 6 files changed, 41 insertions(+), 28 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy index 1abd19404..09492ccc4 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/archive/ArchiveFSpec.groovy @@ -26,12 +26,15 @@ class ArchiveFSpec extends ArchiveBaseSpec { when: to PageArchiveInbox, Fmessage.findBySrc('Max') then: - messageList.sources.sort() == ['Jane', 'Max'] + messageList.messageCount == 2 + messageList.messageSource(0) == 'Jane' + messageList.messageSource(1) == 'Max' when: to PageArchiveInbox, Fmessage.findBySrc('Max') singleMessageDetails.delete.click() then: - messageList.sources == ['Jane'] + messageList.messageCount == 1 + messageList.messageSource == 'Jane' } def '"Archive All" button does not appear in archive section'() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy index 4e0b36d37..1060c6a58 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoforward/AutoforwardViewSpec.groovy @@ -139,7 +139,7 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Sudden shock 0") + messageList.messageText(0) != 'Sudden shock 0' } def "delete multiple message action works for multiple select"(){ @@ -157,7 +157,8 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Sudden shock 0", "Sudden shock 1") + !(messageList.messageText(0) in ['Sudden shock 0', 'Sudden shock 1']) + !(messageList.messageText(1) in ['Sudden shock 0', 'Sudden shock 1']) } def "move single message action works"() { @@ -175,12 +176,12 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { then: waitFor("veryslow") { at PageMessageAutoforward } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Sudden shock 0") + messageList.messageText(0) != 'Sudden shock 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.contains("Sudden shock 0") + messageList.messageText(0) == 'Sudden shock 0' } def "move multiple message action works"() { @@ -198,12 +199,14 @@ class AutoforwardViewSpec extends AutoforwardBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Sudden shock 0", "Sudden shock 1") + !(messageList.messageText(0) in ['Sudden shock 0', 'Sudden shock 1']) + !(messageList.messageText(1) in ['Sudden shock 0', 'Sudden shock 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Sudden shock 0", "Sudden shock 1") + messageList.messageText(0) in ['Sudden shock 0', 'Sudden shock 1'] + messageList.messageText(1) in ['Sudden shock 0', 'Sudden shock 1'] } def "moving a message from another activity to a autoforward displays an update message"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy index 6b2da5a8b..c3e9a5d1c 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/autoreply/AutoreplyViewSpec.groovy @@ -26,9 +26,9 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { header[item] == value where: - item | value - 'title' | "fruits autoreply" - 'autoreplyMessage' | 'Hello, this is an autoreply message' + item | value + 'title' | "fruits autoreply" + 'autoreplyMessage' | 'Hello, this is an autoreply message' } def "clicking the edit option opens the Autoreply Dialog for editing"() { @@ -138,7 +138,7 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' } def "delete multiple message action works for multiple select"(){ @@ -148,7 +148,7 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { waitFor { messageList.displayed } when: messageList.toggleSelect(0) - waitFor {singleMessageDetails.displayed } + waitFor { singleMessageDetails.displayed } messageList.toggleSelect(1) then: waitFor { multipleMessageDetails.displayed } @@ -156,7 +156,8 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) } def "move single message action works"() { @@ -174,12 +175,11 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { then: waitFor("veryslow") { at PageMessageAutoreply } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: - waitFor { messageList.displayed } - messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) == 'Test message 0' } def "move multiple message action works"() { @@ -197,12 +197,14 @@ class AutoreplyViewSpec extends AutoreplyBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Test message 0", "Test message 1") + messageList.messageText(0) in ['Test message 0', 'Test message 1'] + messageList.messageText(1) in ['Test message 0', 'Test message 1'] } def "moving a message from another activity to a autoreply displays an update message"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy index 6d7103d0c..c21bd31be 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageDeleteSpec.groovy @@ -15,7 +15,7 @@ class MessageDeleteSpec extends grails.plugin.geb.GebSpec { def bobMessage = Fmessage.findBySrc('Bob') deleteMessage(bobMessage) to PageMessageTrash - messageList.messages[0].textLink.click() + messageList.clickLink() then: waitFor { singleMessageDetails.displayed } Fmessage.deleted(false).count() == 1 diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index 6a5dd95dd..01c1a6a5a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -76,7 +76,7 @@ class MessageList extends geb.Module { message { i=0, onlySelected=false -> onlySelected? $('tbody tr.selected', i): $("tbody tr:nth-of-type(${i+1})") } messageCount { js.exec('return jQuery("#main-list tbody tr").size()') as Integer } selectedMessageCount { js.exec('return jQuery("#main-list tbody tr.selected").size()') as Integer } - clickLink { i -> message(i).find('td.message-text-cell a').click(); true } + clickLink { i=0 -> message(i).find('td.message-text-cell a').click(); true } selectedMessageLinkUrl { i=0 -> message(i, true).find('td.message-text-cell a').@href } getCheckbox { i -> message(i).find('input[type=checkbox]') } isChecked { i -> getCheckbox(i).checked } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy index 6d6730710..5e9a30207 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionViewSpec.groovy @@ -172,7 +172,7 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { singleMessageDetails.delete.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' } def "delete multiple message action works for multiple select"(){ @@ -190,7 +190,8 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { multipleMessageDetails.deleteAll.click() then: waitFor { messageList.displayed } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) } def "move single message action works"() { @@ -208,12 +209,12 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { then: waitFor("veryslow") { at PageMessageWebconnection } waitFor { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) != 'Test message 0' when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.contains("Test message 0") + messageList.messageText(0) == 'Test message 0' } def "move multiple message action works"() { @@ -231,12 +232,14 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { multipleMessageDetails.moveTo(Activity.findByName("Sample Announcement").id).click() then: waitFor("veryslow") { notifications.flashMessageText.contains("updated") } - !messageList.messages*.text.containsAll("Test message 0", "Test message 1") + !(messageList.messageText(0) in ['Test message 0', 'Test message 1']) + !(messageList.messageText(1) in ['Test message 0', 'Test message 1']) when: to PageMessageAnnouncement, Activity.findByName("Sample Announcement") then: waitFor { messageList.displayed } - messageList.messages*.text.containsAll("Test message 0", "Test message 1") + messageList.messageText(0) in ['Test message 0', 'Test message 1'] + messageList.messageText(1) in ['Test message 0', 'Test message 1'] } def "should display SENT message status for successfully forwarded messages"() { @@ -244,7 +247,9 @@ class WebconnectionViewSpec extends WebconnectionBaseSpec { to PageMessageWebconnection, Webconnection.findByName("Sync") then: waitFor { messageList.displayed } - messageList.messages*.any { it.hasStatus("sent") } + js.exec ''' + return $("#main-list tbody tr.ownerdetail-webconnection-SENT").size() > 0 + ''' } def "retry failed uploads option should be present in more actions dropdown, and should redirect to same view"() { From cfe460c710b2c87451102e02e71c87f6a1c37507 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 13:08:09 +0300 Subject: [PATCH 1037/2668] Modified GebSpec to clear hibernate cache after each spec is run. --- .../test/functional/grails/plugin/geb/GebSpec.groovy | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy b/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy index 7beb4f9c0..806638d3e 100644 --- a/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy @@ -3,4 +3,11 @@ package grails.plugin.geb /** TODO you should directly extend geb.spock.GebReportingSpec instead of this class */ @Deprecated class GebSpec extends geb.spock.GebReportingSpec { + def cleanupSpec() { + // CLearing the hibernate session should improve performance of tests over time + frontlinesms2.Contact.withSession { s -> + s.clear() + } + } } + From 7b5bfb6eaa38d9566e21488f57c1b591c63c6848 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 14:25:42 +0300 Subject: [PATCH 1038/2668] Fixed imports in CoreAppInfoProvidersSpec --- .../test/unit/frontlinesms2/CoreAppInfoProvidersSpec.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/CoreAppInfoProvidersSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/CoreAppInfoProvidersSpec.groovy index 51bf458ce..3ab20ff2c 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/CoreAppInfoProvidersSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/CoreAppInfoProvidersSpec.groovy @@ -4,6 +4,8 @@ import spock.lang.* import frontlinesms2.CoreAppInfoProviders as CAIP +import static ConnectionStatus.* + class CoreAppInfoProvidersSpec extends Specification { @Unroll def 'test statusIndicatorProvider traffic lights'() { From 2230633be5ed17ab7015e133ea0dacdf3de0686a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 15:38:42 +0300 Subject: [PATCH 1039/2668] CORE-1916 Refactor all calls to new SystemNotification() to use SystemNotificationService --- .../frontlinesms2/SystemNotification.groovy | 1 + .../FailPendingMessagesService.groovy | 2 +- .../frontlinesms2/FconnectionService.groovy | 2 +- .../frontlinesms2/SmssyncService.groovy | 4 +++- .../frontlinesms2/WebconnectionService.groovy | 2 +- .../SystemNotificationSpec.groovy | 18 ++++++++++++++++++ 6 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/SystemNotificationSpec.groovy diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SystemNotification.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SystemNotification.groovy index 4fdc48348..dd2a4ec94 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SystemNotification.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SystemNotification.groovy @@ -13,3 +13,4 @@ class SystemNotification { this.text = text?.truncate(MAX_TEXT_LENGTH) } } + diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FailPendingMessagesService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FailPendingMessagesService.groovy index 56b3a7958..bf5693034 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FailPendingMessagesService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FailPendingMessagesService.groovy @@ -11,7 +11,7 @@ class FailPendingMessagesService { it.save() } def text = "${pendingDispatchList.size()} pending message(s) failed. Go to pending messages section to view." - def sn = SystemNotification.findByText(text) ?: new SystemNotification(text:text) + def sn = SystemNotification.findOrCreateByText(text) sn.read = false sn.save(failOnError:true) } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 68ed17fc8..268ea425c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -129,7 +129,7 @@ class FconnectionService { private def createSystemNotification(code, args, exception=null) { if(exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] def text = i18nUtilService.getMessage(code:code, args:args) - def notification = SystemNotification.findByText(text) ?: new SystemNotification(text:text) + def notification = SystemNotification.findOrCreateByText(text) notification.read = false notification.save(failOnError:true, flush:true) } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index cd56dad76..37948085a 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -20,7 +20,9 @@ class SmssyncService { } def reportTimeout(connection) { - new SystemNotification(text:i18nUtilService.getMessage(code:'smssync.timeout', args:[connection.name, connection.timeout, connection.id])).save(failOnError:true) + SystemNotification.findOrCreateByText(i18nUtilService.getMessage( + code:'smssync.timeout', args:[connection.name, connection.timeout, connection.id])) + .save(failOnError:true) } def apiProcess(connection, controller) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 375d3f864..47bb8482c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -103,7 +103,7 @@ class WebconnectionService { def message = Fmessage.get(x.in.headers.'fmessage-id') def text = i18nUtilService.getMessage(code:"webconnection.${message.ownerDetail}.label", args:[webConn.name]) println "######## StatusNotification::: $text #########" - def notification = SystemNotification.findByText(text) ?: new SystemNotification(text:text) + def notification = SystemNotification.findOrCreateByText(text) notification.read = false notification.save(failOnError:true, flush:true) } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/SystemNotificationSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/SystemNotificationSpec.groovy new file mode 100644 index 000000000..bb55f08ca --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/SystemNotificationSpec.groovy @@ -0,0 +1,18 @@ +package frontlinesms2 + +import spock.lang.* + +@TestFor(SystemNotification) +class SystemNotificationSpec extends Specification { + @Unroll + def 'creating a system notification should automatically truncate text'() { + expect: + new SystemNotification(text:supplied).text == expected + where: + supplied | expected + 'asdf' | 'asdf' + 'x' * 511 | 'x' * 511 + 'x' * 512 | ('x' * 510) + '…' + } +} + From 374ecdd798feb7e9df13c912616d0a10a141d60a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 15:58:16 +0300 Subject: [PATCH 1040/2668] Fixed test setup in RecipientLookupServiceISpec --- .../service/RecipientLookupServiceISpec.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy index 38ed54f6f..eb7b40e6a 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy @@ -6,15 +6,17 @@ import spock.lang.* class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { @Shared def recipientLookupService - private static final i18ns = [group: "Groups", smartGroup: "Smartgroups", contact: "Contacts", address: "Add phone number"] + private static final i18ns = [group:'Groups', smartGroup:'Smartgroups', contact:'Contacts', address:'Add phone number'] // we can set up the data model here because none of these tests modify data - def setupSpec() { + def setup() { +println "setupSpec() :: All contacts: ${Contact.findAll()*.name}" 20.times { Contact.build(name:"test-contact-$it") SmartGroup.build(name:"test-smartgroup-$it", mobile:"+543") Group.build(name:"test-group-$it") } +println "setupSpec() :: All contacts: ${Contact.findAll()*.name}" } def 'lookup should not return a contact if he is already selected'() { @@ -33,7 +35,7 @@ println "All contacts: ${Contact.findAll()*.name}" getLookupResultFor(results, "group") == ["test-group-12"] getLookupResultFor(results, "smartGroup") == ["test-smartgroup-12"] getLookupResultFor(results, "contact") == ["test-contact-12"] - getLookupResultFor(results, "address") == ["\"12\""] + getLookupResultFor(results, "address") == ['"12"'] } @Unroll From c3ededb0694d8cf85d89de4ed62eef6cdfdc1429 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 16:38:08 +0300 Subject: [PATCH 1041/2668] Fixed filtering of contacts which are already selected. --- .../frontlinesms2/ContactSearchService.groovy | 16 +++++++++++++++- .../frontlinesms2/RecipientLookupService.groovy | 10 +++++++--- .../service/RecipientLookupServiceISpec.groovy | 6 +----- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy index bb9d4dd5d..0fe8c9ab8 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/ContactSearchService.groovy @@ -24,7 +24,21 @@ class ContactSearchService { } else if(params.smartGroupId) { return SmartGroup.getMembersByNameIlike(asLong(params.smartGroupId), searchString, [max:params.max, offset:params.offset]) } - return Contact.findAllByNameIlikeOrMobileIlike(searchString, searchString, params) + if(params.exclude) { + return Contact.withCriteria { + not { + 'in' 'id', params.exclude + } + or { + ilike 'name', searchString + ilike 'mobile', searchString + } + if(params.max) maxResults(params.max) + if(params.order && params.sort) order params.sort, params.order + } + } else { + return Contact.findAllByNameIlikeOrMobileIlike(searchString, searchString, params) + } } private def countContacts(params) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/RecipientLookupService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/RecipientLookupService.groovy index 5f8de856e..5d73299db 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/RecipientLookupService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/RecipientLookupService.groovy @@ -38,8 +38,12 @@ class RecipientLookupService { smartgroup:lookupSmartgroups(query, ids(selectedSoFar, SmartGroup))].collect { k, v -> if(v) [group:true, text:i18nUtilService.getMessage(code:"contact.search.$k"), items:v] } - null def strippedNumber = stripNumber(params.term) - if (strippedNumber) - results << [group:true, text: i18nUtilService.getMessage([code:"contact.search.address"]), items: [[value: "address-$strippedNumber", text: "\"$strippedNumber\""]]] + if (strippedNumber) { + results << [group:true, + text:i18nUtilService.getMessage([code:"contact.search.address"]), + items:[[value: "address-$strippedNumber", + text: "\"$strippedNumber\""]]] + } return results } @@ -59,7 +63,7 @@ class RecipientLookupService { } private def lookupContacts(query, alreadySelected=[]) { - contactSearchService.getContacts([searchString:query, max:MAX_PER_SECTION]).collect { + contactSearchService.getContacts([searchString:query, max:MAX_PER_SECTION, exclude:alreadySelected]).collect { [value: "contact-${it.id}", text: it.name] } } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy index eb7b40e6a..ccaed455b 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/RecipientLookupServiceISpec.groovy @@ -8,22 +8,18 @@ class RecipientLookupServiceISpec extends grails.plugin.spock.IntegrationSpec { def recipientLookupService private static final i18ns = [group:'Groups', smartGroup:'Smartgroups', contact:'Contacts', address:'Add phone number'] - // we can set up the data model here because none of these tests modify data def setup() { -println "setupSpec() :: All contacts: ${Contact.findAll()*.name}" 20.times { Contact.build(name:"test-contact-$it") SmartGroup.build(name:"test-smartgroup-$it", mobile:"+543") Group.build(name:"test-group-$it") } -println "setupSpec() :: All contacts: ${Contact.findAll()*.name}" } def 'lookup should not return a contact if he is already selected'() { when: -println "All contacts: ${Contact.findAll()*.name}" def firstContactId = Contact.findByName('test-contact-1').id - def results = recipientLookupService.lookup([term:"test-contact-1", 'selectedSoFar[]':"contact-${firstContactId}"]) + def results = recipientLookupService.lookup([term:"test-contact-1", 'selectedSoFar[]':"contact-${firstContactId}".toString()]) then: getLookupResultFor(results, 'contact') == ['test-contact-10', 'test-contact-11', 'test-contact-12'] } From 7849954ffcba42519e5683f6ff2526982bae1395 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 16:45:51 +0300 Subject: [PATCH 1042/2668] Removed printlns. --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index f8fbf07d6..97c59d638 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -328,16 +328,12 @@ class Fmessage { } def getMessageDetailValue(owner) { - println "# Fmessage.getMessageDetailValue # ${owner}" def ownerType = getOwnerType(owner) if(owner && (Activity.get(owner?.id) instanceof CustomActivity)) { - println "Fmessage.getMessageDetailValue # for CustomActivity # " def stepId = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id }?.value def t = this.details.find { (it.ownerType == MessageDetail.OwnerType.STEP) && (it.ownerId == stepId as Long) }?.value - println "Fmessage.getMessageDetailValue # for CustomActivity # and ownerDetail is # ${t}" return t } else { - println "Fmessage.getMessageDetailValue # for Other Activities # " return this.details?.find { it.ownerType == ownerType && it.ownerId == owner?.id }?.value?:'' } } @@ -348,7 +344,6 @@ class Fmessage { } def setMessageDetail(activityOrStep, val) { - println "# Fmessage.setMessageDetail # ${activityOrStep} # ${val}" if (activityOrStep instanceof Activity) { this.setMessageDetailValue(activityOrStep, val) } else { @@ -358,7 +353,6 @@ class Fmessage { } private def setMessageDetailValue(owner, value) { - println "# Fmessage.setMessageDetailValue # ${owner} # ${value} #" def ownerType = getOwnerType(owner) def messageDetailInstance = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id } if(!messageDetailInstance) { From fd019e019f35e4ba4e8a8552c98d2f50b4e545e0 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 16:47:04 +0300 Subject: [PATCH 1043/2668] Removed println from ControllerUtils --- .../src/groovy/frontlinesms2/ControllerUtils.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy index c3ab57093..90890c81a 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/ControllerUtils.groovy @@ -5,7 +5,6 @@ class ControllerUtils { return { c -> if(domainClass instanceof Closure) domainClass = domainClass.call() def objectId = objectIdFetcher.call() - println "domainClass::: $domainClass" def o = objectId? domainClass.get(objectId): domainClass.newInstance() if(o) c.call(o) else { From 559a4964fc6806fcbebe15fd203738729d41be0d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 28 Feb 2013 17:14:52 +0300 Subject: [PATCH 1044/2668] deleted Vanuatu SMPP connection from bootstrap for privacy reasons --- plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy index 6bc636764..3190de77a 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreBootStrap.groovy @@ -219,7 +219,6 @@ class CoreBootStrap { serverPort:993, username:'mr.testy@zoho.com', password:'mister').save(failOnError:true) new ClickatellFconnection(name:"Clickatell Mock Server", apiId:"api123", username:"boris", password:"top secret").save(failOnError:true) new IntelliSmsFconnection(name:"IntelliSms Mock connection", sendEnabled:true, username:"johnmark", password:"pass_word").save(failOnError:true) - new SmppFconnection(name:'Vanuatu', sendEnabled:true, receive:true, url:'127.0.0.1', port:'5775', fromNumber:'FrontlineSMS', username:'pavel', password:'wpsd').save(failOnError:true) } private def dev_initRealSmslibFconnections() { From 671e4f832fd6e6c12d6e32dc9ef91d6cc85a2d42 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 28 Feb 2013 17:20:07 +0300 Subject: [PATCH 1045/2668] Modified chosen.js so it rises up instead of dropping down when there isn't space. --- plugins/frontlinesms-core/web-app/css/chosen.css | 1 - .../frontlinesms-core/web-app/js/chosen.jquery.js | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/css/chosen.css b/plugins/frontlinesms-core/web-app/css/chosen.css index 991541d39..711c07ba3 100644 --- a/plugins/frontlinesms-core/web-app/css/chosen.css +++ b/plugins/frontlinesms-core/web-app/css/chosen.css @@ -9,7 +9,6 @@ .chzn-container .chzn-drop { background: #fff; border: 1px solid #aaa; - border-top: 0; position: absolute; top: 29px; left: 0; diff --git a/plugins/frontlinesms-core/web-app/js/chosen.jquery.js b/plugins/frontlinesms-core/web-app/js/chosen.jquery.js index 767599adc..99c9ec739 100644 --- a/plugins/frontlinesms-core/web-app/js/chosen.jquery.js +++ b/plugins/frontlinesms-core/web-app/js/chosen.jquery.js @@ -328,11 +328,18 @@ Copyright (c) 2011 by Harvest } function calculateDropTop(self, offset) { - var dd_top, scrollTop; + var dd_top, scrollTop, top, dropdownHeight, windowHeight; offset = offset || self.container.offset(); dd_top = self.is_multiple ? self.container.height() : self.container.height() - 1; scrollTop = Math.max(parseInt($(window).scrollTop(), 10), 0); - return offset.top + dd_top - scrollTop; + dropdownHeight = self.dropdown.height(); + windowHeight = $(window).height(); + top = offset.top + dd_top - scrollTop; + if(top + dropdownHeight > windowHeight) { + return top - dropdownHeight - dd_top; + } else { + return top; + } } function calculateDropLeft(container, offset) { @@ -907,6 +914,9 @@ Copyright (c) 2011 by Harvest $("#" + this.results_data[option.group_array_index].dom_id).css('display', 'list-item'); } } else { + return this.dropdown.css({ + "top": calculateDropTop(this) + "px" + }); if (this.result_highlight && result_id === this.result_highlight.attr('id')) { this.result_clear_highlight(); } From d05cf2d0c251cb038d395e34b9d344fe61a5b9e9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 28 Feb 2013 17:21:09 +0300 Subject: [PATCH 1046/2668] Added validation test to join step in customactivity dialog --- .../CustomActivityCedSpec.groovy | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy index eb7d930c1..c1f00f5e8 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/customactivity/CustomActivityCedSpec.groovy @@ -34,9 +34,23 @@ class CustomActivityCedSpec extends CustomActivityBaseSpec { } def 'validation in configure tab works'() { - expect: - //TODO ensure that group has to be selected - false + when: + to PageMessageInbox + bodyMenu.newActivity.click() + then: + waitFor { at CreateActivityDialog } + when: + customactivity.click() + then: + waitFor('slow') { at CustomActivityCreateDialog } + when: + keyword.keywordText.value("test") + next.click() + configure.stepActions.jquery.val("join").jquery.trigger('change') + next.click() + then: + error.displayed + errorText == "please select a group" } def 'can add and remove steps in the confiure tab'(){ From 7c81dce39f8fcb897b21b1ef5bd6c3f4e536a301 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 28 Feb 2013 18:07:46 +0300 Subject: [PATCH 1047/2668] Added url mappings for all redirect calls --- .../grails-app/conf/CoreUrlMappings.groovy | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy index 915eb8c39..a12b463f3 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy @@ -30,10 +30,13 @@ class CoreUrlMappings { // Don't know why this is neccessary, but it is "/poll/create"(controller:'poll', action:'create') "/poll/save"(controller:'poll', action:'save') + "/folder/create"(controller:'folder', action:'create') "/folder/save"(controller:'folder', action:'save') + "/announcement/create"(controller:'announcement', action: 'create') "/announcement/save"(controller:'announcement', action: 'save') + "/autoreply/create"(controller:'autoreply', action: 'create') "/autoreply/save"(controller:'autoreply', action: 'save') "/autoforward/create"(controller:'autoforward', action: 'create') @@ -43,21 +46,27 @@ class CoreUrlMappings { "/archive/inbox/show/$messageId"(controller:'archive', action:'inbox') {} "/archive/sent/show/$messageId"(controller:'archive', action:'sent') {} - "/archive/activity"(controller:'archive', action:'activityList') {} "/archive/activity/$ownerId"(controller:'archive', action:'activity') {} "/archive/activity/$ownerId/show/$messageId"(controller:'archive', action:'activity') {} - "/archive/folder"(controller:'archive', action:'folderList') {} "/archive/folder/$ownerId"(controller:'archive', action:'folder') {} "/archive/folder/$ownerId/show/$messageId"(controller:'archive', action:'folder') {} "/webconnection/$imp/$action"(controller:'webconnection') {} + "/status/show"(controller:'status', action:'show') {} + + "/settings/general"(controller:'settings', action:'general') {} + + "/connection/list"(controller:'connection', action:'list') {} + "/help/images/$imagePath**.png"(controller:'help', action:'image') {} "/help/$helpSection**"(controller:'help', action:'section') {} "/help"(controller:'help', action:'index') {} + "/export/wizard"(controller:'export', action:'wizard') {} + "/$controller/$action?/$id?"{ constraints { // apply constraints here From 466869944ac191fcbe9d03be684b03eaac711dc4 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 1 Mar 2013 10:36:21 +0300 Subject: [PATCH 1048/2668] Removed cloud specific url mappings on core --- .../grails-app/conf/CoreUrlMappings.groovy | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy index a409949c2..915eb8c39 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreUrlMappings.groovy @@ -30,13 +30,10 @@ class CoreUrlMappings { // Don't know why this is neccessary, but it is "/poll/create"(controller:'poll', action:'create') "/poll/save"(controller:'poll', action:'save') - "/folder/create"(controller:'folder', action:'create') "/folder/save"(controller:'folder', action:'save') - "/announcement/create"(controller:'announcement', action: 'create') "/announcement/save"(controller:'announcement', action: 'save') - "/autoreply/create"(controller:'autoreply', action: 'create') "/autoreply/save"(controller:'autoreply', action: 'save') "/autoforward/create"(controller:'autoforward', action: 'create') @@ -44,31 +41,23 @@ class CoreUrlMappings { "/customactivity/create"(controller:'customactivity', action: 'create') "/customactivity/save"(controller:'customactivity', action: 'save') - "/archive/inbox"(controller:'archive', action:'inbox') {} "/archive/inbox/show/$messageId"(controller:'archive', action:'inbox') {} "/archive/sent/show/$messageId"(controller:'archive', action:'sent') {} + "/archive/activity"(controller:'archive', action:'activityList') {} "/archive/activity/$ownerId"(controller:'archive', action:'activity') {} "/archive/activity/$ownerId/show/$messageId"(controller:'archive', action:'activity') {} + "/archive/folder"(controller:'archive', action:'folderList') {} "/archive/folder/$ownerId"(controller:'archive', action:'folder') {} "/archive/folder/$ownerId/show/$messageId"(controller:'archive', action:'folder') {} "/webconnection/$imp/$action"(controller:'webconnection') {} - "/status/show"(controller:'status', action:'show') {} - - "/settings/general"(controller:'settings', action:'general') {} - - "/connection/save"(controller:'connection', action:'save') {} - "/connection/list"(controller:'connection', action:'list') {} - "/help/images/$imagePath**.png"(controller:'help', action:'image') {} "/help/$helpSection**"(controller:'help', action:'section') {} "/help"(controller:'help', action:'index') {} - "/export/wizard"(controller:'export', action:'wizard') {} - "/$controller/$action?/$id?"{ constraints { // apply constraints here From 3c3f5451d91beb79ce125600cf2949b42ded5813 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 1 Mar 2013 11:42:40 +0300 Subject: [PATCH 1049/2668] Fixed broken filtering of Javascript unit test xml. --- .../do/js_unit_test_lib/xml_filter.groovy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy index dd1405fa7..a09430a97 100755 --- a/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy +++ b/plugins/frontlinesms-core/do/js_unit_test_lib/xml_filter.groovy @@ -6,13 +6,17 @@ def unfiltered = '' + sin.text + '' def slurp = new XmlParser().parseText(unfiltered) def suites = slurp.testsuites -suites = suites? [suites[-1]]: [] Node root = new Node(null, 'testsuites') -suites.each { testsuites -> +// Reverse the suites so we get the last-run first - this should give us proper timings for +// the tests +def alreadySeen = [] +suites.reverse().each { testsuites -> testsuites.children().each { testsuite -> - def expectedChildren = ['properties', 'system-out', 'system-err'] def classname = 'js.' + testsuite.attributes().name + if(classname in alreadySeen) return; + alreadySeen << classname + def expectedChildren = ['properties', 'system-out', 'system-err'] testsuite.attributes().name = classname testsuite.children().each { testcase -> expectedChildren.remove(testcase.name()) From 312918d2a8d6c8834623d39f2e79d8d6fda06ae7 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 1 Mar 2013 16:15:30 +0300 Subject: [PATCH 1050/2668] Removed sleep from webconnection func tests. --- .../webconnection/UshahidiWebconnectionCedSpec.groovy | 2 +- .../frontlinesms2/webconnection/WebconnectionBaseSpec.groovy | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy index d25abf46e..671575bf6 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy @@ -6,7 +6,7 @@ import frontlinesms2.popup.* import spock.lang.* class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { - def setup(){ + def setup() { createWebconnections() } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionBaseSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionBaseSpec.groovy index 2fe7cf863..56e6fffd9 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionBaseSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/WebconnectionBaseSpec.groovy @@ -35,10 +35,6 @@ abstract class WebconnectionBaseSpec extends grails.plugin.geb.GebSpec { webconnection.click() at WebconnectionWizard - // TODO sort this out so we don't need ugly sleep calls - // sleep here because otherwise option() calls are either very slow or timeout completely - sleep 1000 - if(!webconnectionType) { waitFor { option('generic').displayed } return true From 1098e2bc3cc672dde9618da014ba9ebe487fb41b Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 5 Mar 2013 15:56:44 +0300 Subject: [PATCH 1051/2668] Added functionality to radioGroup taglib, and used it to show Ushahidi logo in webconnection wizard --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 8 +++++++- .../grails-app/views/webconnection/_type.gsp | 1 + plugins/frontlinesms-core/web-app/css/wizard.css | 2 +- .../web-app/images/icons/ushahidi.png | Bin 0 -> 2835 bytes 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/icons/ushahidi.png diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 58581c4e4..99ffba44d 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -108,6 +108,7 @@ class FsmsTagLib { def descriptionPrefix = att.remove('descriptionPrefix')?: '' def descriptionSuffix = att.remove('descriptionSuffix')?: '' def hasDescription = descriptionPrefix || descriptionSuffix + def useImages = att.remove('useImages') def cssClasses = ['select', 'radio'] if(!hasDescription) cssClasses << 'no-description' out << "
            " @@ -118,8 +119,13 @@ class FsmsTagLib { def id = att.name + '-' + i def itemAttributes = att + [value:value, checked:isChecked(value), id:id] out << '
            • -
            -

            - -

            - <% def loc = frontlinesms2.ResourceUtils.resourcePath %> - - -
            -
            -

            - - - - -
            + + + +

            diff --git a/plugins/frontlinesms-core/grails-app/views/settings/sections/_basic_auth.gsp b/plugins/frontlinesms-core/grails-app/views/settings/sections/_basic_auth.gsp new file mode 100644 index 000000000..e591f9eb2 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/settings/sections/_basic_auth.gsp @@ -0,0 +1,10 @@ +
            +

            + + + + +
            \ No newline at end of file diff --git a/plugins/frontlinesms-core/grails-app/views/settings/sections/_database_backup.gsp b/plugins/frontlinesms-core/grails-app/views/settings/sections/_database_backup.gsp new file mode 100644 index 000000000..caa219464 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/settings/sections/_database_backup.gsp @@ -0,0 +1,8 @@ +
            +

            + +

            + <% def loc = frontlinesms2.ResourceUtils.resourcePath %> + + +
            \ No newline at end of file From 9615d43b4fbc22ab7ea7ad29de54d0a6bdcec9c9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 12 Mar 2013 16:58:37 +0300 Subject: [PATCH 1061/2668] WIP TOOLS-177 Created a new app info provider for msg counts, and js handler placeholder --- .../grails-app/conf/CoreResources.groovy | 7 ++++++- .../grails-app/views/layouts/messages.gsp | 1 + .../frontlinesms2/CoreAppInfoProviders.groovy | 11 +++++++++++ .../web-app/js/message/new_message_summary.js | 19 +++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/web-app/js/message/new_message_summary.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 41762ad72..19727fe91 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -70,7 +70,12 @@ modules = { dependsOn 'jquery' resource url:[dir:'js', file:'message/check_for_new_messages.js'] } - + + newMessageSummary { + dependsOn 'jquery' + resource url:[dir:'js', file:'message/new_message_summary.js'] + } + archive { dependsOn 'messages' } diff --git a/plugins/frontlinesms-core/grails-app/views/layouts/messages.gsp b/plugins/frontlinesms-core/grails-app/views/layouts/messages.gsp index ae03d0ecf..f0013a075 100644 --- a/plugins/frontlinesms-core/grails-app/views/layouts/messages.gsp +++ b/plugins/frontlinesms-core/grails-app/views/layouts/messages.gsp @@ -6,6 +6,7 @@ + diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index 0ae1dab98..7f279ad3f 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -76,6 +76,17 @@ class CoreAppInfoProviders { s.registerProvider('poll_stats') { app, controller, data -> Poll.get(data.ownerId)?.responseStats } + + s.registerProvider('new_message_summary') { app, controller, data -> + def m = [inbox: [Fmessage.countUnreadMessages()], activities: [:], folders: [:]] + Activity.findAllByArchivedAndDeleted(false, false).each { act -> + m.activities."${act.id}" = act.liveMessageCount + } + Folder.findAllByArchivedAndDeleted(false, false).each { folder -> + m.folders."${folder.id}" = folder.liveMessageCount + } + return m + } } } diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js new file mode 100644 index 000000000..1dc2426c3 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -0,0 +1,19 @@ +// TODO probably want to rename this something more descriptive such as message_list +new_message_summary = (function() { + var + newMessageSummaryResponseHandler = function(data) { + console.log(" woop! "); + console.log(data); + }, + init = function() { + app_info.listen("new_message_summary", newMessageSummaryResponseHandler); + }; + + return { init:init }; +}()); + +$(function() { + new_message_summary.init(); +}); + + From 3ae8ff9204600c008cb9e8699d3519f0024cd313 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 12 Mar 2013 17:12:31 +0300 Subject: [PATCH 1062/2668] PNGout'd Ushahidi logo. --- .../web-app/images/icons/ushahidi.png | Bin 2835 -> 2816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/images/icons/ushahidi.png b/plugins/frontlinesms-core/web-app/images/icons/ushahidi.png index 89cd920ed68b6fd9b627b5395e4798000316de9b..88ddabc00e5f79ddbe6a6fdc1ca359cd49e44058 100644 GIT binary patch delta 2808 zcmVNx9NU;yDR72bM8&hV){j+lVPFplz&S7DUcjgMFsNQ6xvDa zX*BuMaVmupb`40f>zLML=VNq-!h(*&kCxIr8jg-*7(Gsr1gfTY=|wUK2D#83Z84$! z7)wX!bu}4Ir}Kv0Za?L4IL=d@OLxhST1YZP5UrwTNkT)Ev%QpbC!_~GNTCEVgTADD z4a0!0>*X$&>wo#y*49x&h7L_%^u*(jOr4fBd&J1(v9>^4CN%up>2T=q9M6%TLjz)* zIuaaC@Ue&JPRKj7kG2vhjXownCIJ?UgCYAe599_{1pJ-b&}SYBFMTK2%$*lA4E9!Mza zoEmCIw>r^F*WtijjYzsz1m2~}F+}EzCsQY`4?)LareQK~9H|kaCS(ykMy>QcMYBx7 z+uM7^sDG4{BO^wP_@TDCdUX1vbkx+;VATsNkTrc8va+(kQik&K>nJNL!})^qk0uOD z*ySG(kj-SOD+M~RDa2*eC)=H7ho-Fru#R3OA5vo?trPd5bMYdb66v_}@SsBEOqz`CMF>ro@nN!bVO~S}_irhfeq#dA zmw$HAAV_d^AUHH+RpG_L`BsZ1@#f8&ID7UC#;2!a=B!y@;Lw4CxOnj*jvqaST|0N8 zs;UYXE?hv)?i>WzY)^+rL^N}rJejg5*_4i7FJoOBt)!J8?C4w=?vL*RmpZoNhOCUk z^fEa+m{XlsqiVS^zoS2y06asz3CgziR)2K===|WIpv7rp#vtdj-FWk_YmhQ}G@f6% z0!NM<0e4#%Ja{nrg!jRfpReHBwK9Z;hN9ryIr#eeqId6JGq_T6Skk}<(_kc3m`!lr z*$q5|GANy5J>0#G6dtZ@cOe4k7gC5Re8|ZiRA99bO@;M_(BY&OT zV;jwtL(}9QIN4ij(KDzgN=r-O=jV&$ks~LChJ{_$B_o=F*jAGUhxV&#N+4~f)ASV`po=uV zjg^u~$LYWHjff?Px%3mAq_5<ALVmS z(5G%C%^)8-Ec1V5l5zqS>wi&QU7gL#%gcXAd^{Q&8t~xc3^X-1V%ye_@g|c}P*4D# zLD08v6tbUL!oD&UscC6guy6qz{&Z;2VyY@D>&#~JO_?_I4r<9CrN4R6*ME|bn^Z|^ zXtdmI2Q!M^Ac!!Epl@j>6_Ou4OHY$~MA38PPSt+NeMS4v`N8811v)BqlXO-j2*WxBrG(V=MgV33=Jhd zE(2BrE<<)Ak}wOY;nT)0YZaYQn&hA9q=yEp6GVfIh5)UTT0TXdJ4ChZ?9d$KrOZto zMt_1Rc3biGjuN8Nd}&M!x9srGZ_y(@-W6tm;kPpovkgcSuAg|mBkr3Ea(7kD9t*V)JT)j zN#_VMj+XCvkPM2Z*VWGU90>6~l9AqAO*$j39;)gs<=zCgo0go+eYX zX425u(75{A)qk>$2?+@W!6Ct5F94f7dqg2vlJJjBo3MS`C+s6d7&IsjF#}`J($b8u zurQoBetdIoPEHe7%S=hgLAq)NKn#4Ql&-gF0>#LkpFxmiewILEDTF?h+FV1R=q{W+ zbc!H|pQ%Ecehltz>{nLOQ#6C3Xf^qDm=MKb+Dl*pCVyQnxin{QUf%RGr%zXp9XAey zL2+^5ZVGJp;4TV#zSzT3^$WIc*}@&zHe9@L@#N7Tjy@L<5b!3G;V<*PZZTk7wU}_; zYKD(td?+OcG*}W=Krbsx`&BZ?MDNgfIx0ORh}6VdJoG2C^12rlDSc<5e22rzd{*WC zW_1)AS%1{$JzQHzpDR^hw>-B{=}(rn-Y*GJ;T5W5LQq{@^FeKG?LEBXQ<|HbPnDFE zV9Jy!;K2|5qNCBbUlcMkGm$hR38#NNji;AnZ?CVbn^aR>{hG;Snhb{Q#m{I!sso7H zkO)=Mj0V=nX6Giy;eXhpk2!MG06(qA=lYSb9;Y-r$6C7Oj`+T%FQfQ zi=SA$_%oMF&*FCY8UETNo;xht(1f8bHvilE_w7GAFm~WN{z|?i|HO&6plLIevh$LZ zrGHqe(KRgcF|cc9V=MYOU2tfK0uW9Xx<$q0BsILHQHIKE*91hcB+Q_jk|4MX@gBE7O2yHW z1X08!3=47@_W2F1VEKXz65Zf2Az~qIB&%$PVRzW8Sk5k4t=4KL%EHnV!Co=YFbp4# zaEmdt)a_JTMuS>4t>r$u6PZo+&i>`FJ0W5>%|O@VG$qqy=@mW5MN4R-4#3|quyIIT zCEZ{`$FYJM(Dhg$3HVYH^Ejo^Mkw8^>xt<8Z$QPgh&~`6bS_rXeuB6ppwiIg=w2aW zJ7v+iPMlB|&>H;zqB|kt0HxA0DMLk6L6_+uy-X?eK7MUXuh delta 2828 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 From c2a572e7c4269e1711ffaee8b489c7341256afd8 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 12 Mar 2013 17:17:02 +0300 Subject: [PATCH 1063/2668] WIP TOOLS-177 Added attributes to menu items to aid finding when adding msg counts --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 7 ++++++- .../frontlinesms-core/grails-app/views/message/_menu.gsp | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 99ffba44d..4d6cf7051 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -424,7 +424,12 @@ class FsmsTagLib { def menuitem = { att, body -> def classlist = att.class?:"" classlist += att.selected ? " selected" : "" - out << '
          • ' + out << '
          • ' if (att?.bodyOnly) { out << body() diff --git a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp index 0c70fd864..6741da9e6 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp @@ -1,7 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8" %> - + @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + From ea5667b66bb77f6103690a4f212581fc9b9da712 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 12 Mar 2013 17:28:50 +0300 Subject: [PATCH 1064/2668] Updated build_deploy_plugin so that maven deployment works. --- .../frontlinesms-core/do/build_deploy_plugin | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 9e2f35fbd..21faef5f4 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -2,21 +2,14 @@ set -e # Extract flags -FLAGS="" while [[ $1 == "--"* ]]; do - if [ -z "$FLAGS" ]; then - FLAGS=$1 - else - FLAGS="$FLAGS $1" + if [ "$1" == "--m2-deploy" ]; then + echo "# Maven deployment enabled." + M2_DEPLOY=true fi shift done -unset M2_DEPLOY -if [[ $FLAGS == *"--m2-deploy"* ]]; then - M2_DEPLOY=true -fi - echo "# extract app name from application.properties..." APP_NAME=`grep '^app.name=' application.properties | cut -d= -f2 | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` @@ -24,8 +17,8 @@ echo "# extract version from application.properties..." PLUGIN_VERSION=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") echo "# Extracted plugin version as $PLUGIN_VERSION" rm plugin.xml || echo "# no plugin.xml present" -grails clean -grails package-plugin +grails --non-interactive clean +grails --non-interactive package-plugin NEW_PLUGIN_ZIP_NAME=$APP_NAME-$PLUGIN_VERSION.zip OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" @@ -47,17 +40,17 @@ if [ -n "$M2_DEPLOY" ]; then echo "# TODO skip maven deploy for non-SNAPSHOT builds" echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" ftp -nv dev.frontlinesms.com << EOF - hash - user m2repo $FRONTLINESMS_MAVEN_PASSWORD - mkdir org - mkdir org/grails/plugins - mkdir org/grails/plugins/$APP_NAME - cd org/grails/plugins/$APP_NAME - mkdir $PLUGIN_VERSION - cd $PLUGIN_VERSION - put $NEW_PLUGIN_ZIP_NAME - exit - EOF +hash +user m2repo $FRONTLINESMS_MAVEN_PASSWORD +mkdir org +mkdir org/grails/plugins +mkdir org/grails/plugins/$APP_NAME +cd org/grails/plugins/$APP_NAME +mkdir $PLUGIN_VERSION +cd $PLUGIN_VERSION +put $NEW_PLUGIN_ZIP_NAME +exit +EOF echo "# Plugin deployed to remote maven repo." fi From b0de739d3903679bbf2828df87fc8e748d52584b Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 12 Mar 2013 17:51:59 +0300 Subject: [PATCH 1065/2668] WIP TOOLS-177 Unread message count span is added to inbox by js --- .../web-app/js/message/new_message_summary.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js index 1dc2426c3..2c63889ad 100644 --- a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -2,8 +2,20 @@ new_message_summary = (function() { var newMessageSummaryResponseHandler = function(data) { - console.log(" woop! "); - console.log(data); + data = data.new_message_summary + console.log(data.inbox); + updateSpan($("li[entitytype='inbox']"), data.inbox); + }, + updateSpan = function(liSelector, value) { + var existingSpan = $(liSelector).find("span.unread_message_count"); + if($(existingSpan).length) { + console.log("FOUND, UPDATING"); + $(existingSpan).text(value); + } + else { + console.log("NOT FOUND, CREATING"); + $(liSelector).append(""+value+""); + } }, init = function() { app_info.listen("new_message_summary", newMessageSummaryResponseHandler); From 84e589a4812e640269be33e8fdb026321a6bc04e Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 12 Mar 2013 17:53:43 +0300 Subject: [PATCH 1066/2668] removed checks for render in controllers --- plugins/frontlinesms-core/do/check_for_bad_template_renders | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/do/check_for_bad_template_renders b/plugins/frontlinesms-core/do/check_for_bad_template_renders index 7042f5f6f..f83749a80 100755 --- a/plugins/frontlinesms-core/do/check_for_bad_template_renders +++ b/plugins/frontlinesms-core/do/check_for_bad_template_renders @@ -4,11 +4,7 @@ echo "# Checking views..." grep -rn "render.*template" grails-app/views/ | grep -v "fsms:render" VIEW_OUTPUT=$? -echo "# Checking controllers" -grep -rn "render.*template" grails-app/controllers/ | grep -v "fsms\.render" -CONTROLLER_OUTPUT=$? - -if [ "$CONTROLLER_OUTPUT" -eq 1 ] && [ "$VIEW_OUTPUT" -eq 1 ]; then +if [ "$VIEW_OUTPUT" -eq 1 ]; then echo "# No bad template renders detected" exit 0 else From 26ec002703a2133c3fa985735b25ed02252d8e3e Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 12 Mar 2013 18:00:11 +0300 Subject: [PATCH 1067/2668] activities and folders now also have new message count span appended --- .../web-app/js/message/new_message_summary.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js index 2c63889ad..c4940f920 100644 --- a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -5,6 +5,12 @@ new_message_summary = (function() { data = data.new_message_summary console.log(data.inbox); updateSpan($("li[entitytype='inbox']"), data.inbox); + $.each(data.activities, function(activityId, unreadMessageCount) { + updateSpan($("li[entitytype='activity'][entityid='" + activityId + "']"), unreadMessageCount); + }); + $.each(data.folders, function(folderId, unreadMessageCount) { + updateSpan($("li[entitytype='folder'][entityid='" + folderId + "']"), unreadMessageCount); + }); }, updateSpan = function(liSelector, value) { var existingSpan = $(liSelector).find("span.unread_message_count"); From a803dfe647bf71412564c51c2227bc0727b81feb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 11:23:17 +0300 Subject: [PATCH 1068/2668] WIP TOOLS-177 created new static methods in Fmessage to get unread counts --- .../domain/frontlinesms2/Fmessage.groovy | 11 +++++++++-- .../taglib/frontlinesms2/FsmsTagLib.groovy | 8 ++++++++ .../grails-app/views/message/_menu.gsp | 14 ++++++++++---- .../frontlinesms2/CoreAppInfoProviders.groovy | 4 ++-- .../web-app/js/message/new_message_summary.js | 9 ++++----- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index f8fbf07d6..6033f1e2f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -130,13 +130,16 @@ class Fmessage { eq("inbound", getSent) } } - unread { + unread { MessageOwner owner=null -> and { eq("isDeleted", false) eq("archived", false) eq("inbound", true) eq("read", false) - isNull("messageOwner") + if(owner == null) + isNull("messageOwner") + else + eq("messageOwner", owner) } } @@ -271,6 +274,10 @@ class Fmessage { static def countUnreadMessages() { Fmessage.unread.count() } + + static def countUnreadMessages(owner) { + Fmessage.unread(owner).count() + } static def countAllMessages(params) { def inboxCount = Fmessage.inbox.count() diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 4d6cf7051..11a053fc0 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -441,10 +441,18 @@ class FsmsTagLib { out << g.link(controller:att.controller, action:att.action, params:p, id:att.id) { out << (att.string ? att.string : g.message(code:msg, args:msgargs)) } + if (body) { + out << body() + } } out << '
            • ' } + def unreadCount = { att, body -> + def val = att.unreadCount + out << "" + val + "" + } + def select = { att, body -> // add the no-selection option to the list if required if(!att.hideNoSelection && att.noSelection && att.value != null) { diff --git a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp index 6741da9e6..c4a0d9fc0 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp @@ -1,7 +1,9 @@ -<%@ page contentType="text/html;charset=UTF-8" %> +<%@ page contentType="text/html;charset=UTF-8" import="frontlinesms2.Fmessage" %> - + + + @@ -9,7 +11,9 @@ - + + + @@ -19,7 +23,9 @@ - + + + diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index 7f279ad3f..b7ffb4621 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -80,10 +80,10 @@ class CoreAppInfoProviders { s.registerProvider('new_message_summary') { app, controller, data -> def m = [inbox: [Fmessage.countUnreadMessages()], activities: [:], folders: [:]] Activity.findAllByArchivedAndDeleted(false, false).each { act -> - m.activities."${act.id}" = act.liveMessageCount + m.activities."${act.id}" = Fmessage.countUnreadMessages(act) } Folder.findAllByArchivedAndDeleted(false, false).each { folder -> - m.folders."${folder.id}" = folder.liveMessageCount + m.folders."${folder.id}" = Fmessage.countUnreadMessages(folder) } return m } diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js index c4940f920..56d9aebad 100644 --- a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -1,9 +1,9 @@ -// TODO probably want to rename this something more descriptive such as message_list new_message_summary = (function() { var newMessageSummaryResponseHandler = function(data) { - data = data.new_message_summary - console.log(data.inbox); + data = data.new_message_summary; + console.log("New message summary f0llows"); + console.log(data); updateSpan($("li[entitytype='inbox']"), data.inbox); $.each(data.activities, function(activityId, unreadMessageCount) { updateSpan($("li[entitytype='activity'][entityid='" + activityId + "']"), unreadMessageCount); @@ -15,11 +15,10 @@ new_message_summary = (function() { updateSpan = function(liSelector, value) { var existingSpan = $(liSelector).find("span.unread_message_count"); if($(existingSpan).length) { - console.log("FOUND, UPDATING"); $(existingSpan).text(value); + // TODO flash if number is greater than previous value } else { - console.log("NOT FOUND, CREATING"); $(liSelector).append(""+value+""); } }, From 5f13a4fca5ca9a65fda66cde43f820132ab70bb1 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 15:28:57 +0300 Subject: [PATCH 1069/2668] WIP TOOLS-177 switched to new msg count mechanism, updated span css --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 10 +++++----- .../grails-app/views/message/_menu.gsp | 4 ++-- .../frontlinesms-core/web-app/css/message.css | 20 ++++++++++++++++++- .../web-app/js/message/new_message_summary.js | 14 ++++++------- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 11a053fc0..efce78a48 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -439,10 +439,10 @@ class FsmsTagLib { def msgargs = att.msgargs def p = att.params out << g.link(controller:att.controller, action:att.action, params:p, id:att.id) { - out << (att.string ? att.string : g.message(code:msg, args:msgargs)) - } - if (body) { - out << body() + out << "${(att.string ? att.string : g.message(code:msg, args:msgargs))}" + if (body) { + out << body() + } } } out << '' @@ -450,7 +450,7 @@ class FsmsTagLib { def unreadCount = { att, body -> def val = att.unreadCount - out << "" + val + "" + out << "" + val + "" } def select = { att, body -> diff --git a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp index c4a0d9fc0..9e65bfecf 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp @@ -12,7 +12,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/plugins/frontlinesms-core/web-app/css/message.css b/plugins/frontlinesms-core/web-app/css/message.css index 658424f83..793e18f46 100644 --- a/plugins/frontlinesms-core/web-app/css/message.css +++ b/plugins/frontlinesms-core/web-app/css/message.css @@ -1,7 +1,25 @@ #body-menu li.messages h3 { background-image:url("../images/icons/message.png"); } #body-menu li.activities h3 { background-image:url("../images/icons/activity.png"); } #body-menu li.folders h3 { background-image:url("../images/icons/folder.png"); } - +#body-menu span.menu-item-label { width: 80%; display: inline-block; } +#body-menu li { position: relative; } +#body-menu span.unread_message_count { + position:absolute; + top:50%; + float: right; + font-size: 7pt; + display: inline-block; + background-color: #aaa; + color: white; + padding: 4px 5px; + text-align: center; + border-radius: 3px; + margin-top: -7px; + height:6px; +} +#body-menu span.unread_message_count.zero { + display:none; +} #body.messages #main-list-container > * { width:auto; } #body.messages #main-list-head { padding:0 17px; background-color:white; } diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js index 56d9aebad..21581c322 100644 --- a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -2,24 +2,22 @@ new_message_summary = (function() { var newMessageSummaryResponseHandler = function(data) { data = data.new_message_summary; - console.log("New message summary f0llows"); - console.log(data); - updateSpan($("li[entitytype='inbox']"), data.inbox); + updateSpan($("li[entitytype='inbox'] a"), data.inbox[0]); $.each(data.activities, function(activityId, unreadMessageCount) { - updateSpan($("li[entitytype='activity'][entityid='" + activityId + "']"), unreadMessageCount); + updateSpan($("li[entitytype='activity'][entityid='" + activityId + "'] a"), unreadMessageCount); }); $.each(data.folders, function(folderId, unreadMessageCount) { - updateSpan($("li[entitytype='folder'][entityid='" + folderId + "']"), unreadMessageCount); + updateSpan($("li[entitytype='folder'][entityid='" + folderId + "'] a"), unreadMessageCount); }); }, - updateSpan = function(liSelector, value) { - var existingSpan = $(liSelector).find("span.unread_message_count"); + updateSpan = function(anchorSelecter, value) { + var existingSpan = $(anchorSelecter).find("span.unread_message_count"); if($(existingSpan).length) { $(existingSpan).text(value); // TODO flash if number is greater than previous value } else { - $(liSelector).append(""+value+""); + $(anchorSelecter).append(""+value+""); } }, init = function() { From 23f8c786f0a58d15f79a3d1bb7a51e45a4681730 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 15:31:09 +0300 Subject: [PATCH 1070/2668] WIP TOOLS-177 Circles -> Rounded Rectangles --- plugins/frontlinesms-core/web-app/css/head.css | 2 +- plugins/frontlinesms-core/web-app/css/message.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/css/head.css b/plugins/frontlinesms-core/web-app/css/head.css index d165a9dc3..57da1a8e5 100644 --- a/plugins/frontlinesms-core/web-app/css/head.css +++ b/plugins/frontlinesms-core/web-app/css/head.css @@ -28,7 +28,7 @@ body { background-image:url("../images/head_background.png"); #system-menu { right:17px; } #system-menu li a { display:block; border-top:3px solid #D5AFC6; padding:6px; } #system-menu li.selected a, #system-menu li a:hover, #system-menu li a:active { background-color:#E0E0E0; border-top:3px solid #C03283; } -#inbox-indicator { border-radius:10px; background-color:#C03283; color:white; font-weight:bold; padding:2px 4px; margin-left:3px; font-size:90%; } +#inbox-indicator { border-radius:3px; background-color:#C03283; color:white; font-weight:bold; padding:2px 4px; margin-left:3px; font-size:90%; } #status-indicator { padding:8px; background-repeat:no-repeat; background-position:center center; margin-left:3px; } #status-indicator.red { background-image:url('../images/status/red.png'); } #status-indicator.green { background-image:url('../images/status/green.png'); } diff --git a/plugins/frontlinesms-core/web-app/css/message.css b/plugins/frontlinesms-core/web-app/css/message.css index 793e18f46..a29e6a00f 100644 --- a/plugins/frontlinesms-core/web-app/css/message.css +++ b/plugins/frontlinesms-core/web-app/css/message.css @@ -14,8 +14,8 @@ padding: 4px 5px; text-align: center; border-radius: 3px; - margin-top: -7px; - height:6px; + right:12px; + margin-top: -9px; } #body-menu span.unread_message_count.zero { display:none; From 5f4c5ee2156efa239888d1f2266c81b7615b6c08 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 15:53:15 +0300 Subject: [PATCH 1071/2668] WIP TOOLS-177 Pulse on change of numbers --- .../grails-app/conf/CoreResources.groovy | 1 + .../web-app/js/jquery.pulse.js | 64 +++++++++++++++++++ .../web-app/js/message/new_message_summary.js | 21 +++++- 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 plugins/frontlinesms-core/web-app/js/jquery.pulse.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 19727fe91..bb2f06cb3 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -74,6 +74,7 @@ modules = { newMessageSummary { dependsOn 'jquery' resource url:[dir:'js', file:'message/new_message_summary.js'] + resource url:[dir:'js', file:'jquery.pulse.js'] } archive { diff --git a/plugins/frontlinesms-core/web-app/js/jquery.pulse.js b/plugins/frontlinesms-core/web-app/js/jquery.pulse.js new file mode 100644 index 000000000..5eb0bce5f --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/jquery.pulse.js @@ -0,0 +1,64 @@ +/*global jQuery*/ +/*jshint curly:false*/ + +;(function ( $, window, document, undefined ) { + "use strict"; + + var defaults = { + pulses : 1, + interval : 0, + returnDelay : 0, + duration : 500 + }; + + $.fn.pulse = function(properties, options, callback) { + if (typeof options === 'function') { + callback = options; + options = {}; + } + + options = $.extend({}, defaults, options); + + if (!(options.interval >= 0)) options.interval = 0; + if (!(options.returnDelay >= 0)) options.returnDelay = 0; + if (!(options.duration >= 0)) options.duration = 500; + if (!(options.pulses >= -1)) options.pulses = 1; + if (typeof callback !== 'function') callback = function(){}; + + return this.each(function () { + var el = $(this), + property, + original = {} + ; + + for (property in properties) { + if (properties.hasOwnProperty(property)) original[property] = el.css(property); + } + + var timesPulsed = 0; + + function animate() { + if (options.pulses > -1 && ++timesPulsed > options.pulses) return callback.apply(el); + el.animate( + properties, + { + duration : options.duration / 2, + complete : function(){ + window.setTimeout(function(){ + el.animate(original, { + duration : options.duration / 2, + complete : function() { + window.setTimeout(animate, options.interval); + } + }); + },options.returnDelay); + } + } + ); + } + + animate(); + }); + }; + +})( jQuery, window, document ); diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js index 21581c322..9bd353b18 100644 --- a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -12,12 +12,31 @@ new_message_summary = (function() { }, updateSpan = function(anchorSelecter, value) { var existingSpan = $(anchorSelecter).find("span.unread_message_count"); + var previousValue = 0; if($(existingSpan).length) { + previousValue = $(existingSpan).text(); $(existingSpan).text(value); - // TODO flash if number is greater than previous value } else { $(anchorSelecter).append(""+value+""); + existingSpan = $(anchorSelecter).find("span.unread_message_count"); + } + if(value == 0) { + $(existingSpan).addClass("zero"); + } + else { + $(existingSpan).removeClass("zero"); + if(value > previousValue) { + $(existingSpan).pulse({ + backgroundColor : '#C03283', + color : 'white' + }, + { + returnDelay : 300, + interval : 400, + pulses : 1 + }); + } } }, init = function() { From a2c91955d4e7e26005781e3eca18262906f1ed30 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 16:18:02 +0300 Subject: [PATCH 1072/2668] WIP TOOLS-177 Added integration test for new Fmessage.countUnreadMessages --- .../frontlinesms2/domain/FmessageISpec.groovy | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index 3074bc274..c77f6314d 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -445,6 +445,21 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { then: message.getOwnerType(customActivity) == MessageDetail.OwnerType.ACTIVITY } + + def "countUnreadMessages with an owner argument limits the count to only that owner's messages"() { + setup: + Fmessage.build(read:true) + Fmessage.build() + def autoReply = Autoreply.build() + 3.times { autoReply.addToMessages(Fmessage.build()) } + Fmessage.build(archived:true) + when: + def inboxUnread = Fmessage.countUnreadMessages() + def autoreplyUnread = Fmessage.countUnreadMessages(autoReply) + then: + inboxUnread == 1 + autoreplyUnread == 3 + } private Folder getTestFolder(params=[]) { new Folder(name:params.name?:'test', From 0243c0c409bb6c08afccf10fc9a91bcd66da9eea Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 16:23:23 +0300 Subject: [PATCH 1073/2668] WIP TOOLS-177 fixed selector for activities in body menu --- .../test/functional/frontlinesms2/message/PageMessage.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index 01c1a6a5a..5ed598b44 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -31,7 +31,7 @@ class BodyMenu extends geb.Module { newFolder { $('#body-menu li.folders a.btn.create') } folderLinks { $('ul li.folders ul.submenu li a') } activityLink { activityName -> - $('#body-menu li.activities ul.submenu li a', text: activityName + " " + Activity.findByName(activityName)?.shortName) + $('#body-menu li.activities ul.submenu li a', text: startsWith(activityName + " " + Activity.findByName(activityName)?.shortName)) } } } From e56debac404c86f16161c4786e04686c01c17605 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 13 Mar 2013 16:36:44 +0300 Subject: [PATCH 1074/2668] FIX TOOLS-177 Added functional test --- .../frontlinesms2/message/MessageInboxSpec.groovy | 15 +++++++++++++++ .../frontlinesms2/message/PageMessage.groovy | 1 + 2 files changed, 16 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy index ff18fa074..308ea4bbf 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy @@ -300,6 +300,21 @@ class MessageInboxSpec extends MessageBaseSpec { !singleMessageDetails.addToContacts.displayed } + def "messageCount is shown in left-hand menu next to inbox indicator and is updated asynchronously"() { + given: + createInboxTestMessages() + when: + to PageMessageInbox + then: + bodyMenu.inboxNewMessageCount == 2 + when: + messageList.toggleSelect(0) + then: + waitFor('veryslow') { + bodyMenu.inboxNewMessageCount == 1 + } + } + String dateToString(Date date) { new SimpleDateFormat("dd MMMM, yyyy hh:mm a", Locale.US).format(date) } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index 5ed598b44..bdf355df3 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -24,6 +24,7 @@ class BodyMenu extends geb.Module { messageSection { section -> $("a", text: "${section}") } + inboxNewMessageCount { $('#body-menu span.unread_message_count')[0].text() as Integer } selected { $('#body-menu .selected').text()?.toLowerCase() } activityList { $('#body-menu li.activities ul.submenu li') } activityLinks { $('#body-menu li.activities ul.submenu li a') } From a946a43336150d5bea47f357e09beeb4aa6bcebc Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 13 Mar 2013 17:26:15 +0300 Subject: [PATCH 1075/2668] WIP the messageowner link on the search page still isnt redirecting to the message owner page which is the activity page --- .../frontlinesms2/MessageController.groovy | 5 ++++- .../frontlinesms2/poll/PageMessagePoll.groovy | 4 ++++ .../frontlinesms2/search/PageSearch.groovy | 9 +++++++++ .../frontlinesms2/search/SearchViewSpec.groovy | 12 ++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index 300e611fe..8f09322cc 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -106,12 +106,15 @@ class MessageController extends ControllerUtils { def activityInstance = Activity.get(params.ownerId) if (activityInstance) { def getSent = params.containsKey("inbound") ? Boolean.parseBoolean(params.inbound) : null + def starred = params.starred ? params.starred : true + println "activity::${activityInstance} param:::${params}" def messageInstanceList = activityInstance.getActivityMessages(params.starred, getSent, params.stepId, params) + println "after::::::::::::::" def sentMessageCount = 0 def sentDispatchCount = 0 Fmessage.findAllByMessageOwnerAndInbound(activityInstance, false).each { sentDispatchCount += it.dispatches.size() - sentMessageCount++ + sentMessageCount++ } render view:"/activity/${activityInstance.shortName}/show", model:[messageInstanceList: messageInstanceList, diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy index 2015bf04c..5483952f5 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy @@ -3,6 +3,10 @@ package frontlinesms2.poll import frontlinesms2.* class PageMessagePoll extends frontlinesms2.page.PageMessageActivity { + static at = { + $('title').text().toLowerCase().contains('poll') + } + static content = { moreActions { $('div.header-buttons select#more-actions') } categoriseSingle { responseId -> diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/PageSearch.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/PageSearch.groovy index bcf1c2743..4ae1b084b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/PageSearch.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/PageSearch.groovy @@ -5,6 +5,7 @@ import frontlinesms2.message.* abstract class PageSearch extends frontlinesms2.page.PageBase { static content = { searchsidebar { module SearchSideBar } + detailsidebar { module DetailSideBar } bodyMenu { module BodyMenu } header { module ContentHeader } footer { module ContentFooter } @@ -37,3 +38,11 @@ class SearchSideBar extends geb.Module { expandedSearchOption(required:false) {$('#extra-options-list')} } } + +class DetailSideBar extends geb.Module { + static base = { $('#detail') } + static content = { + messageOwnerLink { $('#message-detail-owner a')} + messageContent { $('#message-detail-content p').jquery.text() } + } +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy index 1de44112f..04625c277 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/search/SearchViewSpec.groovy @@ -205,6 +205,18 @@ class SearchViewSpec extends SearchBaseSpec { waitFor { searchsidebar.searchString == "alex" } } + def "when message owner link is clicked it should redirect to the message owner page where no message is selected"() { + when: + to PageSearchResult, "cow" + then: + messageList.toggleSelect(0) + waitFor { singleMessageDetails.text == 'eat more cow' } + when: + detailsidebar.messageOwnerLink.click() + then: + waitFor { at frontlinesms2.poll.PageMessagePoll } + } + def "should expand the more option and select a contactName then the link to add contactName is hidden"() { when: createTestContactsAndCustomFieldsAndMessages() From a4d08813281cb44d78ba3e771643f9cf5002ed94 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 11:10:25 +0300 Subject: [PATCH 1076/2668] WIP CORE-1940 fixed issue where archive layout being rendered for search --- .../controllers/frontlinesms2/MessageController.groovy | 4 +++- .../frontlinesms-core/grails-app/views/activity/poll/show.gsp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index 8f09322cc..c3d98fea7 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -105,8 +105,10 @@ class MessageController extends ControllerUtils { def activity() { def activityInstance = Activity.get(params.ownerId) if (activityInstance) { + if (params.starred == null) params.starred = false + if (params.failed == null) params.failed = false + if (params.sort == null) params.sort = 'desc' def getSent = params.containsKey("inbound") ? Boolean.parseBoolean(params.inbound) : null - def starred = params.starred ? params.starred : true println "activity::${activityInstance} param:::${params}" def messageInstanceList = activityInstance.getActivityMessages(params.starred, getSent, params.stepId, params) println "after::::::::::::::" diff --git a/plugins/frontlinesms-core/grails-app/views/activity/poll/show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/poll/show.gsp index 54e40b988..a767ed090 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/poll/show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/poll/show.gsp @@ -1,7 +1,7 @@ <g:message code="poll.title" args="${[ownerInstance.name]}"/> - + From 9ff5d5a6a1402c36e6a8e34f786a7d735850895b Mon Sep 17 00:00:00 2001 From: ivermac Date: Thu, 14 Mar 2013 11:58:59 +0300 Subject: [PATCH 1077/2668] FIX CORE-1940 link to the activity(that owns a message) in the single message details view on the right now works --- .../controllers/frontlinesms2/MessageController.groovy | 3 +-- .../grails-app/views/activity/generic/_show.gsp | 2 +- .../frontlinesms-core/grails-app/views/message/standard.gsp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index c3d98fea7..a6da23226 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -109,9 +109,7 @@ class MessageController extends ControllerUtils { if (params.failed == null) params.failed = false if (params.sort == null) params.sort = 'desc' def getSent = params.containsKey("inbound") ? Boolean.parseBoolean(params.inbound) : null - println "activity::${activityInstance} param:::${params}" def messageInstanceList = activityInstance.getActivityMessages(params.starred, getSent, params.stepId, params) - println "after::::::::::::::" def sentMessageCount = 0 def sentDispatchCount = 0 Fmessage.findAllByMessageOwnerAndInbound(activityInstance, false).each { @@ -137,6 +135,7 @@ class MessageController extends ControllerUtils { def folder() { def folderInstance = Folder.get(params.ownerId) if (folderInstance) { + if (params.starred == null) params.starred = false def getSent = params.containsKey("inbound") ? Boolean.parseBoolean(params.inbound) : null def messageInstanceList = folderInstance?.getFolderMessages(params.starred, getSent) if (params.flashMessage) { flash.message = params.flashMessage } diff --git a/plugins/frontlinesms-core/grails-app/views/activity/generic/_show.gsp b/plugins/frontlinesms-core/grails-app/views/activity/generic/_show.gsp index b7deb9a88..54fe0f794 100644 --- a/plugins/frontlinesms-core/grails-app/views/activity/generic/_show.gsp +++ b/plugins/frontlinesms-core/grails-app/views/activity/generic/_show.gsp @@ -1,6 +1,6 @@ - + <g:message code="${ownerInstance.shortName}.title" args="${[ownerInstance.name]}"/> diff --git a/plugins/frontlinesms-core/grails-app/views/message/standard.gsp b/plugins/frontlinesms-core/grails-app/views/message/standard.gsp index 01a9c2be4..941c785b3 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/standard.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/standard.gsp @@ -1,6 +1,6 @@ - + <g:message code="message.header.${pageTitle?:params.action}" /> From 0f40bd4869ffb5c274c86c3dbb204f953123ba56 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 15:43:42 +0300 Subject: [PATCH 1078/2668] WIP TOOLS-178 Added integration & functional tests for pending message count view --- .../frontlinesms2/message/MessageBaseSpec.groovy | 7 +++++++ .../frontlinesms2/message/MessageInboxSpec.groovy | 9 +++++++++ .../frontlinesms2/message/PageMessage.groovy | 1 + .../frontlinesms2/domain/FmessageISpec.groovy | 12 ++++++++++++ 4 files changed, 29 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageBaseSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageBaseSpec.groovy index f2ee6ee66..d18a85ab2 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageBaseSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageBaseSpec.groovy @@ -16,6 +16,13 @@ class MessageBaseSpec extends grails.plugin.geb.GebSpec { createMiaouwMixPoll() } + static createPendingTestMessages() { + def a = Fmessage.buildWithoutSave(inbound:false) + a.addToDispatches(Dispatch.build(status: DispatchStatus.PENDING)) + def b = Fmessage.buildWithoutSave(inbound:false) + b.addToDispatches(Dispatch.build(status: DispatchStatus.PENDING)) + } + static createSearchTestMessages() { Fmessage.build(src:'Alex', text:'meeting at 11.00') Fmessage.build(src:'Bob', text:'hi Bob') diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy index 308ea4bbf..e937b748b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageInboxSpec.groovy @@ -315,6 +315,15 @@ class MessageInboxSpec extends MessageBaseSpec { } } + def "pending message count is shown in left-hand menu next to pending indicator"() { + given: + createPendingTestMessages() + when: + to PageMessageInbox + then: + bodyMenu.pendingMessageCount == 2 + } + String dateToString(Date date) { new SimpleDateFormat("dd MMMM, yyyy hh:mm a", Locale.US).format(date) } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index bdf355df3..bfdd85e69 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -25,6 +25,7 @@ class BodyMenu extends geb.Module { $("a", text: "${section}") } inboxNewMessageCount { $('#body-menu span.unread_message_count')[0].text() as Integer } + pendingMessageCount { $('#body-menu span.pending_message_count')[0].text() as Integer } selected { $('#body-menu .selected').text()?.toLowerCase() } activityList { $('#body-menu li.activities ul.submenu li') } activityLinks { $('#body-menu li.activities ul.submenu li a') } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index c77f6314d..e99343b22 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -460,6 +460,18 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { inboxUnread == 1 autoreplyUnread == 3 } + + def "pendingAndNotFailed returns count of dispatches with PENDING status"() { + setup: + def m1 = Fmessage.buildWithoutSave(inbound:false, date: new Date() - 10) + 4.times { m1.addToDispatches(Dispatch.build(status: DispatchStatus.PENDING)) } + m1.addToDispatches(Dispatch.build(status: DispatchStatus.SENT, dateSent:new Date())) + m1.addToDispatches(Dispatch.build(status: DispatchStatus.FAILED)) + when: + def pendingCount = Fmessage.pendingAndNotFailed.count() + then: + pendingCount == 4 + } private Folder getTestFolder(params=[]) { new Folder(name:params.name?:'test', From d8149161b68908988bcc070d5450f05f2416c6d0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 15:44:14 +0300 Subject: [PATCH 1079/2668] WIP TOOLS-178 Added new query for pending messages that excludes failed --- .../domain/frontlinesms2/Fmessage.groovy | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 6033f1e2f..12e946546 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -112,6 +112,24 @@ class Fmessage { property 'id' } } + + pendingAndNotFailed { + and { + eq("isDeleted", false) + eq("archived", false) + projections { + dispatches { + eq('status', DispatchStatus.PENDING) + } + } + } + projections { + distinct 'id' + property 'date' + property 'id' + } + } + deleted { getOnlyStarred=false -> and { eq("isDeleted", true) From ffc678d9a3678bc5d7cf4cb915fad0b307a48ec5 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 15:44:52 +0300 Subject: [PATCH 1080/2668] WIP TOOLS-178 added taglib and provider for pending message count --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 5 +++++ .../src/groovy/frontlinesms2/CoreAppInfoProviders.groovy | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index efce78a48..b313b055f 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -453,6 +453,11 @@ class FsmsTagLib { out << "" + val + "" } + def pendingCount = { att, body -> + def val = att.pendingCount + out << "" + val + "" + } + def select = { att, body -> // add the no-selection option to the list if required if(!att.hideNoSelection && att.noSelection && att.value != null) { diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index b7ffb4621..c8aed4cef 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -78,7 +78,7 @@ class CoreAppInfoProviders { } s.registerProvider('new_message_summary') { app, controller, data -> - def m = [inbox: [Fmessage.countUnreadMessages()], activities: [:], folders: [:]] + def m = [inbox: Fmessage.countUnreadMessages(), pending: Fmessage.pendingAndNotFailed.count(), activities: [:], folders: [:]] Activity.findAllByArchivedAndDeleted(false, false).each { act -> m.activities."${act.id}" = Fmessage.countUnreadMessages(act) } From a33d476c9ae576221ece92b9c139131219d28c0f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 15:45:16 +0300 Subject: [PATCH 1081/2668] WIP TOOLS-178 Message menu now has pending count rendered --- plugins/frontlinesms-core/grails-app/views/message/_menu.gsp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp index 9e65bfecf..36e02d847 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_menu.gsp @@ -5,7 +5,9 @@ - + + + From d6f7fbdcfc63662454eafe07436c37d62e905585 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 15:45:54 +0300 Subject: [PATCH 1082/2668] FIX TOOLS-178 Added js, style and image for ajax loading of pending msg count --- .../frontlinesms-core/web-app/css/message.css | 16 +++++++++++++++- .../images/message/gray-ajax-spinner.gif | Bin 0 -> 847 bytes .../web-app/js/message/new_message_summary.js | 17 +++++++++-------- 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/message/gray-ajax-spinner.gif diff --git a/plugins/frontlinesms-core/web-app/css/message.css b/plugins/frontlinesms-core/web-app/css/message.css index a29e6a00f..9c88775d8 100644 --- a/plugins/frontlinesms-core/web-app/css/message.css +++ b/plugins/frontlinesms-core/web-app/css/message.css @@ -17,7 +17,21 @@ right:12px; margin-top: -9px; } -#body-menu span.unread_message_count.zero { +#body-menu span.pending_message_count { + position:absolute; + top:50%; + float: right; + font-size: 8pt; + display: inline-block; + color: #aaa; + padding: 4px 18px 4px 5px; + text-align: right; + right:12px; + min-width:18px; + margin-top: -9px; + background:url('../images/message/gray-ajax-spinner.gif') 25px 1px no-repeat; +} +#body-menu span.unread_message_count.zero,#body-menu span.pending_message_count.zero { display:none; } #body.messages #main-list-container > * { width:auto; } diff --git a/plugins/frontlinesms-core/web-app/images/message/gray-ajax-spinner.gif b/plugins/frontlinesms-core/web-app/images/message/gray-ajax-spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..6f9a3ff28a46471ce308127f5e3e922e6b3a99f3 GIT binary patch literal 847 zcmZ?wbhEHb6krfw_`<;O|NsA0t5*H_^JmYVJy)+@UA=nswr$%!eE9J2;lqs^H(tDW z@$~7_U%!66bLYG!$-o+*pwO3+Id7?fNRFabOTwzP zGenL}lrnAjz;?5vA-b2vhAFc(V4^@PV`uB4zBQUU4W3ay7O5nC*yS;4fdgv-pu5*<>|Hn(-{gjt4u>v0=H?uP};XReTu;fv2}|U_B&<^oL6>a z;I;`cH(Wp`0?>!bpC@SC67kUDIuanlsk@}z@V#*(mzDEr zL+>pfElm&EJoIL$+}v2nz#*{j;u+Q(S=@S!;Vuq$_#zn=8F+Atwdxr3IbGrE%NFo@ z_Le8q-n5*VrA8&2H%616ryHxKL6Bf=P?*AGD00+cMYFRU+Zyp>+1*WZ7!{qKB-k@F zZfDvzLD{v*qRJ^Sq9J*A?xHeoA*F>1FAptFXiRA14Ru>4S#(E|Z)w46&ChB78?agf z@*6PrRygpu8VVdbDUlm1aeSwQN6&?}8yf5aT`VR{3ePokB$l};CVDVL1kd1T%r#xI zl`+Z1V+$L@s-1~RI$V9K4F$$x$w!nosQ=)7qr`4vW*(rX6`|jt(bKDf)zWyVr5-?! zaV&E%VK}tun4^;CM2-!!7AA1m<+ZYU8mM$g^vZdgZ{qdPVL#ZZThgr6)a)uHBCzDJ t?!|-^9SH}RehL_Na!72L?$FQYY@WfPZ^)9y8l&0Wqo&AU4N9J1007b06Kenf literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js index 9bd353b18..763f7cc18 100644 --- a/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js +++ b/plugins/frontlinesms-core/web-app/js/message/new_message_summary.js @@ -2,31 +2,32 @@ new_message_summary = (function() { var newMessageSummaryResponseHandler = function(data) { data = data.new_message_summary; - updateSpan($("li[entitytype='inbox'] a"), data.inbox[0]); + updateSpan($("li[entitytype='inbox'] a"), data.inbox, 'unread_message_count'); + updateSpan($("li[entitytype='pending'] a"), data.pending, 'pending_message_count'); $.each(data.activities, function(activityId, unreadMessageCount) { - updateSpan($("li[entitytype='activity'][entityid='" + activityId + "'] a"), unreadMessageCount); + updateSpan($("li[entitytype='activity'][entityid='" + activityId + "'] a"), unreadMessageCount, 'unread_message_count'); }); $.each(data.folders, function(folderId, unreadMessageCount) { - updateSpan($("li[entitytype='folder'][entityid='" + folderId + "'] a"), unreadMessageCount); + updateSpan($("li[entitytype='folder'][entityid='" + folderId + "'] a"), unreadMessageCount, 'unread_message_count'); }); }, - updateSpan = function(anchorSelecter, value) { - var existingSpan = $(anchorSelecter).find("span.unread_message_count"); + updateSpan = function(anchorSelecter, value, spanClass) { + var existingSpan = $(anchorSelecter).find("span." + spanClass); var previousValue = 0; if($(existingSpan).length) { previousValue = $(existingSpan).text(); $(existingSpan).text(value); } else { - $(anchorSelecter).append(""+value+""); - existingSpan = $(anchorSelecter).find("span.unread_message_count"); + $(anchorSelecter).append(""+value+""); + existingSpan = $(anchorSelecter).find("span." + spanClass); } if(value == 0) { $(existingSpan).addClass("zero"); } else { $(existingSpan).removeClass("zero"); - if(value > previousValue) { + if(value > previousValue && spanClass == 'unread_message_count') { $(existingSpan).pulse({ backgroundColor : '#C03283', color : 'white' From 1e4394d3085991f5b059d9e44acf3e2411f50787 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 14 Mar 2013 16:43:06 +0300 Subject: [PATCH 1083/2668] FIX TOOLS-326 Both the new recipient selector and the old list appear on select recipients tab of wizards --- .../grails-app/views/message/_select_recipients.gsp | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp index b5d01045a..14aad3a21 100644 --- a/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp +++ b/plugins/frontlinesms-core/grails-app/views/message/_select_recipients.gsp @@ -1,6 +1,5 @@ <%@ page import="grails.converters.JSON" contentType="text/html;charset=UTF-8" %>
            -
            From 7c8c95518dab38830a5b126cacf1b9a98a82bef2 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 15 Mar 2013 14:19:18 +0300 Subject: [PATCH 1084/2668] Load EnableFconnectionJob dynamically in ConnectionController --- .../controllers/frontlinesms2/ConnectionController.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 075737055..6d4b41166 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -109,7 +109,7 @@ class ConnectionController extends ControllerUtils { } def enable() { - EnableFconnectionJob.triggerNow([connectionId:params.id]) + this.class.classLoader.findClass("EnableFconnectionJob").triggerNow([connectionId:params.id]) params.connecting = true flash.message = message(code: 'connection.route.connecting') def connectionInstance = Fconnection.get(params.id) From 44ab67a2cb18d53f03f72c5c5b21c1a4eea5f413 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 15 Mar 2013 18:23:07 +0300 Subject: [PATCH 1085/2668] Minor code cleanup; removed extra browser opening from GebConfig --- .../frontlinesms-core/grails-app/conf/DataSource.groovy | 1 + plugins/frontlinesms-core/grails-app/views/_includes.gsp | 1 - plugins/frontlinesms-core/test/functional/GebConfig.groovy | 7 ++----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy b/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy index 79d122dfe..50cb4735e 100644 --- a/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/DataSource.groovy @@ -49,3 +49,4 @@ environments { } } } + diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 13c284aa8..82258f43a 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -55,7 +55,6 @@ var fsmsButton = new FsmsButton(); $(function() { // make dropdowns pretty - N.B. this will break geb tests, so should not be done in TEST environment - // TODO reintroduce dropdown when the CSS is fixed selectmenuTools.initAll("select"); fsmsButton.findAndApply("input[type='submit'], input[type='button']"); diff --git a/plugins/frontlinesms-core/test/functional/GebConfig.groovy b/plugins/frontlinesms-core/test/functional/GebConfig.groovy index f622ae39c..7b1aa6a20 100644 --- a/plugins/frontlinesms-core/test/functional/GebConfig.groovy +++ b/plugins/frontlinesms-core/test/functional/GebConfig.groovy @@ -3,6 +3,7 @@ import org.openqa.selenium.firefox.* import org.openqa.selenium.remote.* def jenkins = Boolean.parseBoolean(System.properties.jenkins) +baseUrl = System.properties['geb.build.baseUrl'] waiting { timeout = jenkins? 20: 5 @@ -40,17 +41,13 @@ driver = { } else { DesiredCapabilities capabilities = new DesiredCapabilities() capabilities.javascriptEnabled = true - driver = new RemoteWebDriver(new URL("http://localhost:8083"), capabilities) + driver = new RemoteWebDriver(new URL(baseUrl), capabilities) actualCapabilities = ((RemoteWebDriver) driver).getCapabilities(); assert actualCapabilities.javascriptEnabled } println "Configured WebDriver: ${driver.class}" - 3.times { try { - driver.navigate().to('http://localhost:8080/frontlinesms-core') // TODO should read this url from grails settings - driver.navigate().to('http://localhost:8080/frontlinesms-core/activity/create') - } catch(TimeoutException ex) { sleep 10000 } } def width = 1366 def height = 768 driver.manage().window().setSize(new Dimension(width, height)) From 20df8adc553136cd867058dc4717b0ef338e0baa Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Fri, 15 Mar 2013 19:17:01 +0300 Subject: [PATCH 1086/2668] Converted GroupCedSpec to work with remote control. --- .../contact/ContactBaseSpec.groovy | 46 +++++++++++-------- .../contact/GroupBaseSpec.groovy | 36 +++++++++------ .../frontlinesms2/contact/GroupCedSpec.groovy | 20 ++++---- .../contact/PageContactShow.groovy | 20 ++++++-- 4 files changed, 78 insertions(+), 44 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy index 3b05ea142..39b2cc281 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy @@ -4,35 +4,43 @@ import frontlinesms2.* class ContactBaseSpec extends grails.plugin.geb.GebSpec { static createTestContacts() { - Contact.build(name:'Alice', mobile:'2541234567', notes:'notes') - Contact.build(name:'Bob', mobile:'+254987654', email:"bob@bob.com") + remote { + Contact.build(name:'Alice', mobile:'2541234567', notes:'notes') + Contact.build(name:'Bob', mobile:'+254987654', email:"bob@bob.com") + } } static createTestMessages() { - Fmessage.build(src:'Bob', dst:'MyNumber', text:'hi Bob') - Fmessage.build(src:'Alice', dst:'MyNumber', text:'hi Alice') + remote { + Fmessage.build(src:'Bob', dst:'MyNumber', text:'hi Bob') + Fmessage.build(src:'Alice', dst:'MyNumber', text:'hi Alice') + } } static createTestGroups() { - def bob = Contact.findByName('Bob') - def groupThree = Group.build(name:'three') - def groupTest = Group.build(name:'Test') - ['Others', 'four'].each { Group.build(name:it) } + remote { + def bob = Contact.findByName('Bob') + def groupThree = Group.build(name:'three') + def groupTest = Group.build(name:'Test') + ['Others', 'four'].each { Group.build(name:it) } - groupTest.addToMembers(bob) - groupThree.addToMembers(bob) - groupTest.save(failOnError:true, flush:true) - groupThree.save(failOnError:true, flush:true) + groupTest.addToMembers(bob) + groupThree.addToMembers(bob) + groupTest.save(failOnError:true, flush:true) + groupThree.save(failOnError:true, flush:true) + } } static createTestCustomFields() { - Contact.findByName('Bob') - .addToCustomFields(name:'town', value:'Kusumu') - .save(failOnError:true, flush:true) + remote { + Contact.findByName('Bob') + .addToCustomFields(name:'town', value:'Kusumu') + .save(failOnError:true, flush:true) - Contact.findByName('Alice') - .addToCustomFields(name:'lake', value:'Victoria') - .save(failOnError:true, flush:true) + Contact.findByName('Alice') + .addToCustomFields(name:'lake', value:'Victoria') + .save(failOnError:true, flush:true) + } } def assertFieldDetailsCorrect(fieldName, labelText, expectedValue) { @@ -50,4 +58,4 @@ class ContactBaseSpec extends grails.plugin.geb.GebSpec { Contact.build(name:"Contact${it}", mobile:"987654321${it}", notes:'notes') } } -} \ No newline at end of file +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupBaseSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupBaseSpec.groovy index 5fec99475..45d7f955a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupBaseSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupBaseSpec.groovy @@ -4,25 +4,35 @@ import frontlinesms2.* abstract class GroupBaseSpec extends grails.plugin.geb.GebSpec { def createTestGroups() { - new Group(name:'Listeners').save(failOnError:true, flush:true) - new Group(name:'Friends').save(failOnError:true, flush:true) + remote { + new Group(name:'Listeners').save(failOnError:true, flush:true) + new Group(name:'Friends').save(failOnError:true, flush:true) + } + } + + def createTestContacts() { + remote { + def friendsGroup = Group.findByName('Friends') + def bobby = new Contact(name:'Bobby').save(failOnError:true, flush:true) + def duchamps = new Contact(name:'Duchamps').save(failOnError:true, flush:true) + [bobby, duchamps].each() { friendsGroup.addToMembers(it) } + } } def createTestGroupsAndContacts() { - def friendsGroup = createTestGroups() - def bobby = new Contact(name:'Bobby').save(failOnError:true, flush:true) - def duchamps = new Contact(name:'Duchamps').save(failOnError:true, flush:true) - [bobby, duchamps].each() { friendsGroup.addToMembers(it) } + createTestGroups() + createTestContacts() } - + def createManyContactsAddToGroups() { - def lastGroupMembership - (11..90).each { - def c = new Contact(name: "Contact${it}", mobile: "987654321${it}", notes: 'notes').save(failOnError:true, flush:true) - lastGroupMembership = c.addToGroup(Group.findByName('Friends')) + remote { + def lastGroupMembership + (11..90).each { + def c = new Contact(name: "Contact${it}", mobile: "987654321${it}", notes: 'notes').save(failOnError:true, flush:true) + lastGroupMembership = c.addToGroup(Group.findByName('Friends')) + } + lastGroupMembership.save(failOnError:true, flush:true) } - // TODO this could be changed to `sessionFactory.flush()`, but would need to get hold of the session factory - lastGroupMembership.save(failOnError:true, flush:true) } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy index 0f411cee0..cbde93284 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/GroupCedSpec.groovy @@ -9,23 +9,25 @@ class GroupCedSpec extends GroupBaseSpec { def 'button to save new group is displayed and works'() { when: to PageContactShow - def initNumGroups = Group.count() + def initNumGroups = remote { Group.count() } bodyMenu.newGroup.click() + then: waitFor { at GroupPopup } + when: groupName.value('People') ok.jquery.trigger("click") then: at PageContactShow waitFor { bodyMenu.getGroupLink "People" } - assert Group.count() == (initNumGroups + 1) + assert remote { Group.count() } == (initNumGroups + 1) } def 'More action dropdown has option to rename the group and it works'() { given: createTestGroupsAndContacts() - def friendsGroup = Group.findByName("Friends") + def friendsGroupId = remote { Group.findByName("Friends").id } when: - to PageContactShow, friendsGroup + to PageGroupShow, friendsGroupId then: waitFor { header.groupHeaderSection.displayed } when: @@ -40,19 +42,19 @@ class GroupCedSpec extends GroupBaseSpec { waitFor { bodyMenu.getGroupLink "Renamed Group" } header.groupHeaderTitle.text()?.equalsIgnoreCase('Renamed Group (2)') } - - def 'More action dropdown has option to delete the group and opens a confirmation popup'(){ + + def 'More action dropdown has option to delete the group and opens a confirmation popup'() { given: createTestGroupsAndContacts() - def friendsGroup = Group.findByName("Friends") + def friendsGroupId = remote { Group.findByName("Friends").id } when: - to PageContactShow, friendsGroup + to PageGroupShow, friendsGroupId then: waitFor { header.groupHeaderSection.displayed } when: header.moreGroupActions.value("delete").click() then: - waitFor{ at DeleteGroupPopup } + waitFor { at DeleteGroupPopup } when: warningMessage == 'Are you sure you want to delete Friends? WARNING: This cannot be undone' ok.jquery.trigger("click") diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/PageContactShow.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/PageContactShow.groovy index bbd46ae9e..e4179ef7d 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/PageContactShow.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/PageContactShow.groovy @@ -10,12 +10,26 @@ class PageContactShow extends frontlinesms2.page.PageContact { if (args[0] instanceof Contact) return "contact/show/${(args[0] as Contact).id}" if (args[0] instanceof Group && args.length == 2) - return "group/show/${(args[0] as Group).id}/contact/show/${(args[1] as Contact).id}" + return "group/show/${(args[0] as Group).id}/contact/show/${(args[1] as Contact).id}" if (args[0] instanceof Group && args.length == 1) - return "group/show/${(args[0] as Group).id}" + return "group/show/${(args[0] as Group).id}" } static at = { title.contains('Contacts') } -} \ No newline at end of file +} + +class PageGroupShow extends PageContactShow { + String convertToPath(Object [] args) { + if (args.equals(null) || args.length == 0) + return "contact/show" + if (args[0] instanceof Number) + return "group/show/${(args[0])}" + if (args[0] instanceof Group && args.length == 2) + return "group/show/${(args[0] as Group).id}/contact/show/${(args[1] as Contact).id}" + if (args[0] instanceof Group && args.length == 1) + return "group/show/${(args[0] as Group).id}" + } +} + From 4599c6dae4f32f8454438dd54f74f5562c4e5557 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 10:54:25 +0300 Subject: [PATCH 1087/2668] TOOLS-299 Switch to events for LogEntry creation --- .../frontlinesms2/FconnectionService.groovy | 15 +++++++++------ .../services/frontlinesms2/LogService.groovy | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 268ea425c..d159aba30 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -10,6 +10,7 @@ class FconnectionService { def deviceDetectionService def i18nUtilService def smssyncService + def logService def connectingIds = [].asSynchronized() def createRoutes(Fconnection c) { @@ -30,7 +31,8 @@ class FconnectionService { def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) - LogEntry.log("Created routes: ${routes*.id}") + event for:"fconnection", topic:"routeCreated", data:c + //logService.handleRouteCreated(c) } catch(FailedToCreateProducerException ex) { logFail(c, ex.cause) } catch(Exception ex) { @@ -122,16 +124,17 @@ class FconnectionService { private def logFail(c, ex) { ex.printStackTrace() log.warn("Error creating routes to fconnection with id $c?.id", ex) - LogEntry.log("Error creating routes to fconnection with name ${c?.name?: c?.id}") - createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], ex) + event for:"fconnection", topic:"routeCreationFailed", data:c + //logService.handleRouteCreationFailed(c) + //createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], ex) } private def createSystemNotification(code, args, exception=null) { if(exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] def text = i18nUtilService.getMessage(code:code, args:args) - def notification = SystemNotification.findOrCreateByText(text) - notification.read = false - notification.save(failOnError:true, flush:true) + //def notification = SystemNotification.findOrCreateByText(text) + //notification.read = false + //notification.save(failOnError:true, flush:true) } private def isFailed(Fconnection c) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy new file mode 100644 index 000000000..6408f8fdd --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy @@ -0,0 +1,16 @@ +package frontlinesms2 + +import grails.events.Listener + +class LogService { + @Listener(topic="routeCreated", namespace="fconnection") + def handleRouteCreated(connection) { + def routes = connection.routeDefinitions + LogEntry.log("Created routes: ${routes*.id}") + } + + @Listener(topic="routeCreationFailed", namespace="fconnection") + def handleRouteCreationFailed(connection) { + LogEntry.log("Error creating routes to fconnection with name ${connection?.name?: connection?.id}") + } +} From aaa7380d88ba7d18a42e9825cb6cbde8581d480d Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 11:10:45 +0300 Subject: [PATCH 1088/2668] TOOLS-299 Use the logService directly rather than via events --- .../services/frontlinesms2/FconnectionService.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index d159aba30..386fcf27e 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -31,8 +31,8 @@ class FconnectionService { def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) - event for:"fconnection", topic:"routeCreated", data:c - //logService.handleRouteCreated(c) + //event for:"fconnection", topic:"routeCreated", data:c + logService.handleRouteCreated(c) } catch(FailedToCreateProducerException ex) { logFail(c, ex.cause) } catch(Exception ex) { @@ -124,8 +124,8 @@ class FconnectionService { private def logFail(c, ex) { ex.printStackTrace() log.warn("Error creating routes to fconnection with id $c?.id", ex) - event for:"fconnection", topic:"routeCreationFailed", data:c - //logService.handleRouteCreationFailed(c) + //event for:"fconnection", topic:"routeCreationFailed", data:c + logService.handleRouteCreationFailed(c) //createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], ex) } From 6e585a227ddc81d7d2cde7205d9e3987302a8541 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Mar 2013 11:33:46 +0300 Subject: [PATCH 1089/2668] Updated target directory so is always within project working dir. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 9763a5b51..98b75030e 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -2,6 +2,7 @@ grails.servlet.version = "2.5" // Change depending on target container complianc grails.project.class.dir = "target/classes" grails.project.test.class.dir = "target/test-classes" grails.project.test.reports.dir = "target/test-reports" +grails.project.work.dir = 'target' grails.project.target.level = 1.6 grails.project.source.level = 1.6 //grails.project.war.file = "target/${appName}-${appVersion}.war" @@ -133,3 +134,4 @@ codenarc { GrailsPublicControllerMethod.enabled = false } } + From 226a1e9ab16cfd12ee989a6c79789228fc282c14 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 11:34:48 +0300 Subject: [PATCH 1090/2668] TOOLS-299 Call EnableFconnectionJob.triggerNow directly, without loading dynamically. --- .../controllers/frontlinesms2/ConnectionController.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 6d4b41166..075737055 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -109,7 +109,7 @@ class ConnectionController extends ControllerUtils { } def enable() { - this.class.classLoader.findClass("EnableFconnectionJob").triggerNow([connectionId:params.id]) + EnableFconnectionJob.triggerNow([connectionId:params.id]) params.connecting = true flash.message = message(code: 'connection.route.connecting') def connectionInstance = Fconnection.get(params.id) From e39ce9600e9dd743fd7052b37f6163011c5da263 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 13:00:50 +0300 Subject: [PATCH 1091/2668] TOOLS-299 Restore system notification creation code in fconnection service --- .../services/frontlinesms2/FconnectionService.groovy | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 386fcf27e..082c22fa4 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -31,7 +31,6 @@ class FconnectionService { def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) - //event for:"fconnection", topic:"routeCreated", data:c logService.handleRouteCreated(c) } catch(FailedToCreateProducerException ex) { logFail(c, ex.cause) @@ -124,17 +123,16 @@ class FconnectionService { private def logFail(c, ex) { ex.printStackTrace() log.warn("Error creating routes to fconnection with id $c?.id", ex) - //event for:"fconnection", topic:"routeCreationFailed", data:c logService.handleRouteCreationFailed(c) - //createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], ex) + createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], ex) } private def createSystemNotification(code, args, exception=null) { if(exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] def text = i18nUtilService.getMessage(code:code, args:args) - //def notification = SystemNotification.findOrCreateByText(text) - //notification.read = false - //notification.save(failOnError:true, flush:true) + def notification = SystemNotification.findOrCreateByText(text) + notification.read = false + notification.save(failOnError:true, flush:true) } private def isFailed(Fconnection c) { From 8d080e4e57ace3904810e1c965c688c437b3361b Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 14:43:43 +0300 Subject: [PATCH 1092/2668] TOOLS-299 Remove event listeners in log service --- .../grails-app/services/frontlinesms2/LogService.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy index 6408f8fdd..f099161b9 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/LogService.groovy @@ -1,15 +1,11 @@ package frontlinesms2 -import grails.events.Listener - class LogService { - @Listener(topic="routeCreated", namespace="fconnection") def handleRouteCreated(connection) { def routes = connection.routeDefinitions LogEntry.log("Created routes: ${routes*.id}") } - @Listener(topic="routeCreationFailed", namespace="fconnection") def handleRouteCreationFailed(connection) { LogEntry.log("Error creating routes to fconnection with name ${connection?.name?: connection?.id}") } From 4521ef4cbaae1f8e9e49859a765a1572971a3263 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Mar 2013 15:16:58 +0300 Subject: [PATCH 1093/2668] Converted jenkins build steps to do scripts --- plugins/frontlinesms-core/do/jenkins/after | 5 +++++ plugins/frontlinesms-core/do/jenkins/before | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100755 plugins/frontlinesms-core/do/jenkins/after create mode 100755 plugins/frontlinesms-core/do/jenkins/before diff --git a/plugins/frontlinesms-core/do/jenkins/after b/plugins/frontlinesms-core/do/jenkins/after new file mode 100755 index 000000000..727712354 --- /dev/null +++ b/plugins/frontlinesms-core/do/jenkins/after @@ -0,0 +1,5 @@ +#!/bin/bash +set -e +do/codenarc_report_postprocess +do/js_unit_test_xml + diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before new file mode 100755 index 000000000..7788575f8 --- /dev/null +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -0,0 +1,10 @@ +#!/bin/bash +set -e +do/check_for_ignored_tests +do/check_for_bad_template_renders +do/check_for_setInterval_calls +do/functional_test_unsafe_text_calls_checker +do/functional_test_unflushed_saves_checker +do/jslint_report +do/csslint_report + From f8de772cfecd0ed2eed04311f31e1ecd36ce28bf Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 18 Mar 2013 16:07:23 +0300 Subject: [PATCH 1094/2668] Added do script for generating simian reports. --- plugins/frontlinesms-core/do/jenkins/before | 1 + plugins/frontlinesms-core/do/simian_report | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100755 plugins/frontlinesms-core/do/simian_report diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before index 7788575f8..0493b9209 100755 --- a/plugins/frontlinesms-core/do/jenkins/before +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -7,4 +7,5 @@ do/functional_test_unsafe_text_calls_checker do/functional_test_unflushed_saves_checker do/jslint_report do/csslint_report +do/simian_report diff --git a/plugins/frontlinesms-core/do/simian_report b/plugins/frontlinesms-core/do/simian_report new file mode 100755 index 000000000..533e8e226 --- /dev/null +++ b/plugins/frontlinesms-core/do/simian_report @@ -0,0 +1,16 @@ +#!/bin/bash +set -e +if [[ -z $SIMIAN_JAR ]]; then + echo "# Environment variable SIMIAN_JAR not set. Simian report will not run." + exit 0 +fi + +if [[ $1 == "--xml" ]]; then + simianFormat='-formatter=xml:target/simian.xml' +fi + +echo "# Using simian jar at: $SIMIAN_JAR..." +echo "# I hope you've paid for a licence..." + +java -jar $SIMIAN_JAR $simianFormat -language=groovy "src/groovy/**/*.groovy" "grails-app/**/*.groovy" "test/**/*.groovy" + From 55dbcbf8bcba68286b664c615e85ad578a6c1f96 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 16:10:30 +0300 Subject: [PATCH 1095/2668] TOOLS-299 Inject LogService into FconnectionServiceSpec --- .../unit/frontlinesms2/services/FconnectionServiceSpec.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index 80cc9d267..691dc6420 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -13,6 +13,9 @@ class FconnectionServiceSpec extends Specification { def context def setup() { + defineBeans { + logService(LogService) + } context = Mock(CamelContext) service.camelContext = context def i18nUtilService = Mock(I18nUtilService) From 7d43677291afb2ed79eb4fdd012cb8b7c2d2ef28 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 17:21:13 +0300 Subject: [PATCH 1096/2668] TOOLS-299 Mock logService directly without using defineBeans. --- .../frontlinesms2/services/FconnectionServiceSpec.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index 691dc6420..df0c56b8a 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -13,15 +13,16 @@ class FconnectionServiceSpec extends Specification { def context def setup() { - defineBeans { - logService(LogService) - } context = Mock(CamelContext) service.camelContext = context def i18nUtilService = Mock(I18nUtilService) i18nUtilService.getMessage(_) >> { args -> args.code[0] } service.i18nUtilService = i18nUtilService Fconnection.metaClass.static.get = { Serializable id -> println "overrided 'get()' called"; return [] } + def logService = Mock(LogService) + logService.handleRouteCreated = {/* Impostor! */} + logService.handleRouteCreationFailed = {/* Another impostor! */} + service.logService = logService service.deviceDetectionService = Mock(DeviceDetectionService) } From 45bf2f98476da6ba85498503a0f571a7c85ba633 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 18 Mar 2013 18:05:06 +0300 Subject: [PATCH 1097/2668] TOOLS-299 Add integration test for Log Service --- .../service/LogServiceISpec.groovy | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 plugins/frontlinesms-core/test/integration/frontlinesms2/service/LogServiceISpec.groovy diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/LogServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/LogServiceISpec.groovy new file mode 100644 index 000000000..79c9d87ae --- /dev/null +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/LogServiceISpec.groovy @@ -0,0 +1,27 @@ +package frontlinesms2.service + +import frontlinesms2.* + +class LogServiceISpec extends grails.plugin.spock.IntegrationSpec { + def logService + + def "handleRouteCreated should create a LogEntry"() { + setup: + def connection = Fconnection.build() + LogEntry.findAll()*.delete(flush:true) + when: + logService.handleRouteCreated(connection) + then: + LogEntry.count() == 1 + } + + def "handleRouteCreationFailed should create a LogEntry"() { + setup: + def connection = Fconnection.build() + LogEntry.findAll()*.delete(flush:true) + when: + logService.handleRouteCreationFailed(connection) + then: + LogEntry.count() == 1 + } +} From f81577fd6ef9aa45e66930bd5e9c2809fc9b5c44 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 19 Mar 2013 10:08:31 +0300 Subject: [PATCH 1098/2668] fixed unsafe .text() call --- .../test/functional/frontlinesms2/poll/PageMessagePoll.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy index 5483952f5..95c653464 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PageMessagePoll.groovy @@ -4,7 +4,7 @@ import frontlinesms2.* class PageMessagePoll extends frontlinesms2.page.PageMessageActivity { static at = { - $('title').text().toLowerCase().contains('poll') + $('title')?.text()?.toLowerCase().contains('poll') } static content = { From 9b6fe3e4bde50403269c791b445d56b0a65347b0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 19 Mar 2013 10:59:48 +0300 Subject: [PATCH 1099/2668] FIX do/check_for_setInterval_calls now trims wc output so silly OSX can handle it --- plugins/frontlinesms-core/do/check_for_setInterval_calls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/check_for_setInterval_calls b/plugins/frontlinesms-core/do/check_for_setInterval_calls index 34ceb2f2f..8a7aca5f5 100755 --- a/plugins/frontlinesms-core/do/check_for_setInterval_calls +++ b/plugins/frontlinesms-core/do/check_for_setInterval_calls @@ -2,7 +2,7 @@ set -e echo "# Checking for bad calls to setInterval..." -VIOLATIONS=`grep -lr setInterval grails-app/views/ web-app/js/ | grep -v app_info | grep -v timer | wc -l` +VIOLATIONS=`grep -lr setInterval grails-app/views/ web-app/js/ | grep -v app_info | grep -v timer | wc -l | tr -d ' '` if [[ "$VIOLATIONS" != "0" ]]; then echo "# Violations found:" From a99fc2738c7bcc1984155475dc20533cba763cd9 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 19 Mar 2013 11:24:18 +0300 Subject: [PATCH 1100/2668] Changed simian output on Jenkins to be XML. --- plugins/frontlinesms-core/do/jenkins/before | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before index 0493b9209..f9fdc9e0a 100755 --- a/plugins/frontlinesms-core/do/jenkins/before +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -7,5 +7,5 @@ do/functional_test_unsafe_text_calls_checker do/functional_test_unflushed_saves_checker do/jslint_report do/csslint_report -do/simian_report +do/simian_report --xml From 50d69d6d9304e862a126dec0f548441147038581 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 19 Mar 2013 11:25:23 +0300 Subject: [PATCH 1101/2668] Changed simian_report so that exit code 0 is issued always. May need to tweak this to interpret simian exit codes more finely. --- plugins/frontlinesms-core/do/simian_report | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/frontlinesms-core/do/simian_report b/plugins/frontlinesms-core/do/simian_report index 533e8e226..a6b3cf794 100755 --- a/plugins/frontlinesms-core/do/simian_report +++ b/plugins/frontlinesms-core/do/simian_report @@ -12,5 +12,8 @@ fi echo "# Using simian jar at: $SIMIAN_JAR..." echo "# I hope you've paid for a licence..." +set +e java -jar $SIMIAN_JAR $simianFormat -language=groovy "src/groovy/**/*.groovy" "grails-app/**/*.groovy" "test/**/*.groovy" +echo "# Simian completed with exit code: $?" +set -e From b8718604421bc0ad1e86022c5cdbd1471be548de Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Tue, 19 Mar 2013 11:47:33 +0300 Subject: [PATCH 1102/2668] TOOLS-299 Use failOnError in log() method of LogEntry --- .../grails-app/domain/frontlinesms2/LogEntry.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LogEntry.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LogEntry.groovy index fa6a378ad..74bbe64ab 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LogEntry.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/LogEntry.groovy @@ -10,7 +10,7 @@ class LogEntry { } static def log(content) { - new LogEntry(date: new Date(), content: content).save() + new LogEntry(date: new Date(), content: content).save(failOnError:true) return content } } From 6d4a866433311e9439d7c05c54345ed2a603e956 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 20 Mar 2013 10:30:39 +0300 Subject: [PATCH 1103/2668] fiex UshahidiWebconnectionCedSpec --- .../webconnection/UshahidiWebconnectionCedSpec.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy index d25abf46e..18aa6b33d 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/webconnection/UshahidiWebconnectionCedSpec.groovy @@ -15,8 +15,6 @@ class UshahidiWebconnectionCedSpec extends WebconnectionBaseSpec { launchWizard() then: option('ushahidi').displayed - and: - getTitle('ushahidi') == 'Crowdmap / Ushahidi' and: getDescription('ushahidi') == 'Send messages to CrowdMap or to an Ushahidi server.' } From fc3c67360ed827a24fa61fff3445c9a2ea57cec4 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 20 Mar 2013 10:47:36 +0300 Subject: [PATCH 1104/2668] FIXED TESTS MessageActionSpec and PollListSpec --- .../functional/frontlinesms2/message/MessageActionSpec.groovy | 2 +- .../test/functional/frontlinesms2/message/PageMessage.groovy | 3 +++ .../test/functional/frontlinesms2/poll/PollListSpec.groovy | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy index 072aea16d..8518ce8c5 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/MessageActionSpec.groovy @@ -116,7 +116,7 @@ class MessageActionSpec extends frontlinesms2.poll.PollBaseSpec { then: waitFor { notifications.flashMessageText } when: - bodyMenu.messageSection("Inbox").click() + bodyMenu.sectionLink("Inbox").click() then: waitFor { title == "Inbox" } messageList.messageCount() == 2 diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy index bfdd85e69..4751fcf5a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/message/PageMessage.groovy @@ -35,6 +35,9 @@ class BodyMenu extends geb.Module { activityLink { activityName -> $('#body-menu li.activities ul.submenu li a', text: startsWith(activityName + " " + Activity.findByName(activityName)?.shortName)) } + sectionLink { sectionName -> + $('#body-menu li.messages ul.submenu li a', text: startsWith(sectionName)) + } } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy index 677064428..b1df6fda7 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/poll/PollListSpec.groovy @@ -53,7 +53,7 @@ class PollListSpec extends PollBaseSpec { when: to PageMessagePoll, 'Football Teams' then: - bodyMenu.selected == 'football teams poll' + bodyMenu.selected.contains('football teams poll') } def "should filter poll response messages for starred and unstarred messages"() { From a380c31f73d936bbcdeafc358d4d5ec269c534ab Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 20 Mar 2013 10:49:00 +0300 Subject: [PATCH 1105/2668] fixed FolderListSpec --- .../functional/frontlinesms2/folder/FolderListSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy index baa72cde3..7721a41ec 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/folder/FolderListSpec.groovy @@ -144,7 +144,7 @@ class FolderListSpec extends FolderBaseSpec { ok.jquery.trigger("click") to PageMessageFolder then: - folderLinks*.text().containsAll('New Work', 'Projects') + folderLinks*.text().every { it.startsWith('New Work') || it.startsWith('Projects') || it == "Create new folder" } } def 'Errors are displayed when creating a folder with an already existing folders name'() { @@ -223,7 +223,7 @@ class FolderListSpec extends FolderBaseSpec { waitFor { title.toLowerCase().contains("inbox") } then: at PageMessageInbox - bodyMenu.folderLinks*.text().containsAll('Projects') + bodyMenu.folderLinks*.text().any { it.startsWith "Projects" } } def "filter folder messages by incoming messages should not show new outgoing messages"() { From b7ead8354f535a422b92aea1dc227313b02eea8a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 20 Mar 2013 10:56:52 +0300 Subject: [PATCH 1106/2668] Updated build_deploy_plugin to read plugin name properly. --- plugins/frontlinesms-core/do/build_deploy_plugin | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 21faef5f4..f9b877376 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -11,7 +11,8 @@ while [[ $1 == "--"* ]]; do done echo "# extract app name from application.properties..." -APP_NAME=`grep '^app.name=' application.properties | cut -d= -f2 | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` +PLUGIN_NAME=`ls *GrailsPlugin.groovy | cut -d. -f1 | sed -E -e 's/^(.*)GrailsPlugin$/\1/' | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` +echo "# Extracted plugin name as $PLUGIN_NAME" echo "# extract version from application.properties..." PLUGIN_VERSION=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") @@ -19,12 +20,12 @@ echo "# Extracted plugin version as $PLUGIN_VERSION" rm plugin.xml || echo "# no plugin.xml present" grails --non-interactive clean grails --non-interactive package-plugin -NEW_PLUGIN_ZIP_NAME=$APP_NAME-$PLUGIN_VERSION.zip +NEW_PLUGIN_ZIP_NAME=$PLUGIN_NAME-$PLUGIN_VERSION.zip OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" mv $OLD_PLUGIN_ZIP_NAME $NEW_PLUGIN_ZIP_NAME -IVY_CACHE_DIR=~/.grails/ivy-cache/org.grails.plugins/$APP_NAME/zips +IVY_CACHE_DIR=~/.grails/ivy-cache/org.grails.plugins/$PLUGIN_NAME/zips mkdir -p $IVY_CACHE_DIR IVY_CACHED_ZIP=$IVY_CACHE_DIR/$NEW_PLUGIN_ZIP_NAME echo "# Removing old plugin from local ivy cache at $IVY_CACHED_ZIP..." @@ -44,8 +45,8 @@ hash user m2repo $FRONTLINESMS_MAVEN_PASSWORD mkdir org mkdir org/grails/plugins -mkdir org/grails/plugins/$APP_NAME -cd org/grails/plugins/$APP_NAME +mkdir org/grails/plugins/$PLUGIN_NAME +cd org/grails/plugins/$PLUGIN_NAME mkdir $PLUGIN_VERSION cd $PLUGIN_VERSION put $NEW_PLUGIN_ZIP_NAME From 2fed87b16dec8fc92ff7e40fbb48cd10d4ec7720 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 20 Mar 2013 11:44:53 +0300 Subject: [PATCH 1107/2668] fixed CustomActivityControllerISpec --- .../controllers/frontlinesms2/MessageController.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index a6da23226..b871344eb 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -107,7 +107,6 @@ class MessageController extends ControllerUtils { if (activityInstance) { if (params.starred == null) params.starred = false if (params.failed == null) params.failed = false - if (params.sort == null) params.sort = 'desc' def getSent = params.containsKey("inbound") ? Boolean.parseBoolean(params.inbound) : null def messageInstanceList = activityInstance.getActivityMessages(params.starred, getSent, params.stepId, params) def sentMessageCount = 0 From b74611e561cc935abb12b7b48b4781b6e2666631 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 20 Mar 2013 11:50:36 +0300 Subject: [PATCH 1108/2668] TOOLS-299 Create system notification service --- .../services/frontlinesms2/SystemNotificationService.groovy | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy new file mode 100644 index 000000000..2434b9717 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy @@ -0,0 +1,5 @@ +package frontlinesms2 + +class SystemNotificationService { + +} From 950fa178630124d5511d8337d5aa0512dbd6ef3d Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 20 Mar 2013 14:55:32 +0300 Subject: [PATCH 1109/2668] TOOLS-299 Create notifications using SystemNotificationService --- .../frontlinesms2/FconnectionService.groovy | 17 +++++------------ .../SystemNotificationService.groovy | 12 +++++++++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 082c22fa4..8c9399eb6 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -11,6 +11,7 @@ class FconnectionService { def i18nUtilService def smssyncService def logService + def systemNotificationService def connectingIds = [].asSynchronized() def createRoutes(Fconnection c) { @@ -30,7 +31,7 @@ class FconnectionService { connectingIds << c.id def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) - createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) + systemNotificationService.createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) logService.handleRouteCreated(c) } catch(FailedToCreateProducerException ex) { logFail(c, ex.cause) @@ -45,7 +46,7 @@ class FconnectionService { def destroyRoutes(Fconnection c) { destroyRoutes(c.id as long) - createSystemNotification('connection.route.destroyNotification', [c?.name?: c?.id]) + systemNotificationService.createSystemNotification('connection.route.destroyNotification', [c?.name?: c?.id]) } def destroyRoutes(long id) { @@ -101,7 +102,7 @@ class FconnectionService { log.warn("Caught exception for route: $ex.fromRouteId", caughtException) def routeId = (ex.fromRouteId =~ /(?:(?:in)|(?:out))-(?:[a-z]+-)?(\d+)/)[0][1] println "FconnectionService.handleDisconnection() : Looking to stop route: $routeId" - createSystemNotification('connection.route.exception', [routeId], caughtException) + systemNotificationService.createSystemNotification('connection.route.exception', [routeId], [exception:caughtException]) RouteDestroyJob.triggerNow([routeId:routeId as long]) } catch(Exception e) { e.printStackTrace() @@ -124,15 +125,7 @@ class FconnectionService { ex.printStackTrace() log.warn("Error creating routes to fconnection with id $c?.id", ex) logService.handleRouteCreationFailed(c) - createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], ex) - } - - private def createSystemNotification(code, args, exception=null) { - if(exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] - def text = i18nUtilService.getMessage(code:code, args:args) - def notification = SystemNotification.findOrCreateByText(text) - notification.read = false - notification.save(failOnError:true, flush:true) + systemNotificationService.createSystemNotification('connection.route.failNotification', [c?.id, c?.name?:c?.id], [exception: ex, connection: c]) } private def isFailed(Fconnection c) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy index 2434b9717..eff450e36 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy @@ -1,5 +1,15 @@ package frontlinesms2 class SystemNotificationService { - + def createSystemNotification(code, args, kwargs=[:]) { + if(kwargs.exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] + def text = i18nUtilService.getMessage(code:code, args:args) + getOrCreate(text) + } + + private def getOrCreate(text) { + def notification = SystemNotification.findOrCreateByText(text) + notification.read = false + notification.save(failOnError:true, flush:true) + } } From 5fdcdfa9f1d20fb3306139f57890608c9060292d Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 20 Mar 2013 15:23:39 +0300 Subject: [PATCH 1110/2668] TOOLS-299 Pass connection param to createSystemNotification --- .../services/frontlinesms2/FconnectionService.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 8c9399eb6..4c9ebda6c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -31,7 +31,7 @@ class FconnectionService { connectingIds << c.id def routes = c.routeDefinitions camelContext.addRouteDefinitions(routes) - systemNotificationService.createSystemNotification('connection.route.successNotification', [c?.name?: c?.id]) + systemNotificationService.createSystemNotification('connection.route.successNotification', [c?.name?: c?.id], [connection:c]) logService.handleRouteCreated(c) } catch(FailedToCreateProducerException ex) { logFail(c, ex.cause) @@ -46,7 +46,7 @@ class FconnectionService { def destroyRoutes(Fconnection c) { destroyRoutes(c.id as long) - systemNotificationService.createSystemNotification('connection.route.destroyNotification', [c?.name?: c?.id]) + systemNotificationService.createSystemNotification('connection.route.destroyNotification', [c?.name?: c?.id], [connection:c]) } def destroyRoutes(long id) { From ae64cc5a6a393f5b1c76c070324fb5d8b98609e6 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 20 Mar 2013 15:28:06 +0300 Subject: [PATCH 1111/2668] Added stacktrace when building plugin. --- plugins/frontlinesms-core/do/build_deploy_plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index f9b877376..5db90c859 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -19,7 +19,7 @@ PLUGIN_VERSION=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groov echo "# Extracted plugin version as $PLUGIN_VERSION" rm plugin.xml || echo "# no plugin.xml present" grails --non-interactive clean -grails --non-interactive package-plugin +grails --non-interactive --stacktrace package-plugin NEW_PLUGIN_ZIP_NAME=$PLUGIN_NAME-$PLUGIN_VERSION.zip OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" From 59be64a3010fe6acdb8d37c07dcd6826e4fb55bb Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 20 Mar 2013 15:30:15 +0300 Subject: [PATCH 1112/2668] Made resources plugin a compile-time dependency for compatibility with cached and zipped resources plugin compilation. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 1862a9458..b2c0c1388 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -85,7 +85,7 @@ grails.project.dependency.resolution = { runtime ":database-migration:1.0" runtime ":jquery:1.7.1" runtime ':jquery-ui:1.8.15' - runtime ':resources:1.2.RC3' + compile ':resources:1.2' runtime ":export:1.1" runtime ":markdown:1.0.0.RC1" From ad6db26c95b5a4e08eac60b14e46e2944a2b0a55 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 20 Mar 2013 15:30:15 +0300 Subject: [PATCH 1113/2668] Made resources plugin a compile-time dependency for compatibility with cached and zipped resources plugin compilation. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 98b75030e..039436089 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -86,7 +86,7 @@ grails.project.dependency.resolution = { runtime ":database-migration:1.0" runtime ":jquery:1.7.1" runtime ':jquery-ui:1.8.15' - runtime ':resources:1.2.RC3' + compile ':resources:1.2' runtime ":export:1.1" runtime ":markdown:1.0.0.RC1" From 76d0291295bd195fbd7d014d96705648f2f16776 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Thu, 21 Mar 2013 10:22:30 +0300 Subject: [PATCH 1114/2668] TOOLS-299 Only call provider in AppInfoService if it exists --- .../grails-app/services/frontlinesms2/AppInfoService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy index a0eff2ba1..b1697b81c 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy @@ -16,7 +16,7 @@ class AppInfoService { synchronized(this) { provider = providers[key] } - return provider.call(grailsApplication, controller, data) + return provider?.call(grailsApplication, controller, data) } } From a9060e704690283a52eb0c3e485ebe7603f9af78 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 21 Mar 2013 15:26:43 +0300 Subject: [PATCH 1115/2668] TOOLS-318 FIX inline-core-plugin should delete files excluded from plugin in FrontlinesmsCoreGrailsPlugin.groovy --- plugins/frontlinesms-core/do/rm_plugin_excluded_files | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 plugins/frontlinesms-core/do/rm_plugin_excluded_files diff --git a/plugins/frontlinesms-core/do/rm_plugin_excluded_files b/plugins/frontlinesms-core/do/rm_plugin_excluded_files new file mode 100755 index 000000000..093f92b78 --- /dev/null +++ b/plugins/frontlinesms-core/do/rm_plugin_excluded_files @@ -0,0 +1,9 @@ +NONEWLINES=$(tr -d '\n' < FrontlinesmsCoreGrailsPlugin.groovy) +FILE_LIST=$(echo $NONEWLINES | grep -o '\[.*\]') +ans=`echo $FILE_LIST | grep -o 'grai.*'` +for i in $ans +do + FILE=$(echo $i | tr -d ',' | tr -d '\"' | tr -d ']' | tr -d '[') + echo "# Deleting from core $FILE" + rm $FILE +done From e9ebf4f78bce8911af1879d3b9428b465018c01a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 21 Mar 2013 15:50:03 +0300 Subject: [PATCH 1116/2668] TOOLS-318 FIX added set -e to do/rm_plugin_exluded_files --- plugins/frontlinesms-core/do/rm_plugin_excluded_files | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/frontlinesms-core/do/rm_plugin_excluded_files b/plugins/frontlinesms-core/do/rm_plugin_excluded_files index 093f92b78..ed638094f 100755 --- a/plugins/frontlinesms-core/do/rm_plugin_excluded_files +++ b/plugins/frontlinesms-core/do/rm_plugin_excluded_files @@ -1,3 +1,6 @@ +#!/bin/bash +set -e + NONEWLINES=$(tr -d '\n' < FrontlinesmsCoreGrailsPlugin.groovy) FILE_LIST=$(echo $NONEWLINES | grep -o '\[.*\]') ans=`echo $FILE_LIST | grep -o 'grai.*'` From 1ff83ba8ec6fb501a5cc0eba2de167a03e036ef5 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 22 Mar 2013 12:43:25 +0300 Subject: [PATCH 1117/2668] TOOLS-299 Throw exception if no provider is registered in AppInfoService.provide method --- .../grails-app/services/frontlinesms2/AppInfoService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy index b1697b81c..a0eff2ba1 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AppInfoService.groovy @@ -16,7 +16,7 @@ class AppInfoService { synchronized(this) { provider = providers[key] } - return provider?.call(grailsApplication, controller, data) + return provider.call(grailsApplication, controller, data) } } From df9ecf3c23fb60524bd2706cc253599dce9538ba Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 22 Mar 2013 15:56:48 +0300 Subject: [PATCH 1118/2668] TOOLS-299 Mock systemNotificationService in FconnectionServiceSpec --- .../unit/frontlinesms2/services/FconnectionServiceSpec.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index df0c56b8a..f657c66da 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -16,8 +16,10 @@ class FconnectionServiceSpec extends Specification { context = Mock(CamelContext) service.camelContext = context def i18nUtilService = Mock(I18nUtilService) + def systemNotificationService = Mock(SystemNotificationService) i18nUtilService.getMessage(_) >> { args -> args.code[0] } service.i18nUtilService = i18nUtilService + service.systemNotificationService = systemNotificationService Fconnection.metaClass.static.get = { Serializable id -> println "overrided 'get()' called"; return [] } def logService = Mock(LogService) logService.handleRouteCreated = {/* Impostor! */} From 7c4006e61fe37f74fc1fa24cb67c0eb3646c87cc Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 22 Mar 2013 16:23:21 +0300 Subject: [PATCH 1119/2668] TOOLS-299 Fix handleDisconnection test to count invocations of createSystemNotification rather than SystemNotification instances --- .../unit/frontlinesms2/services/FconnectionServiceSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index f657c66da..c9578bd00 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -11,12 +11,12 @@ import org.apache.camel.Exchange @Mock([LogEntry, Dispatch, Fmessage, SystemNotification]) class FconnectionServiceSpec extends Specification { def context + def systemNotificationService = Mock(SystemNotificationService) def setup() { context = Mock(CamelContext) service.camelContext = context def i18nUtilService = Mock(I18nUtilService) - def systemNotificationService = Mock(SystemNotificationService) i18nUtilService.getMessage(_) >> { args -> args.code[0] } service.i18nUtilService = i18nUtilService service.systemNotificationService = systemNotificationService @@ -147,7 +147,7 @@ class FconnectionServiceSpec extends Specification { when: service.handleDisconnection(exchange) then: - SystemNotification.count() + 1 * systemNotificationService.createSystemNotification(_,_,_) jobRouteId == connectionId where: routeId | connectionId From 9f9755f106e68fb9f13da370dc3be4400ae4bc10 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 22 Mar 2013 17:19:10 +0300 Subject: [PATCH 1120/2668] TOOLS-299 Inject i18nUtilService --- .../services/frontlinesms2/SystemNotificationService.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy index eff450e36..2a5444eb2 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy @@ -1,6 +1,7 @@ package frontlinesms2 class SystemNotificationService { + def i18nUtilService def createSystemNotification(code, args, kwargs=[:]) { if(kwargs.exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] def text = i18nUtilService.getMessage(code:code, args:args) From 62262e5f6b1d31cc94e19ccf626108da91b2d560 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 22 Mar 2013 17:19:40 +0300 Subject: [PATCH 1121/2668] TOOLS-299 Add test for SystemNotificationService --- .../SystemNotificationServiceSpec.groovy | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 plugins/frontlinesms-core/test/unit/frontlinesms2/services/SystemNotificationServiceSpec.groovy diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SystemNotificationServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SystemNotificationServiceSpec.groovy new file mode 100644 index 000000000..92ed4991e --- /dev/null +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SystemNotificationServiceSpec.groovy @@ -0,0 +1,25 @@ +package frontlinesms2.services + +import spock.lang.* +import frontlinesms2.SystemNotification +import frontlinesms2.SystemNotificationService +import frontlinesms2.I18nUtilService + +@TestFor(SystemNotificationService) +@Mock([SystemNotification]) + +class SystemNotificationServiceSpec extends Specification { + def setup() { + def i18nUtilService = Mock(I18nUtilService) + i18nUtilService.getMessage(_) >> { args -> args.code } + service.i18nUtilService = i18nUtilService + } + def "createSystemNotification creates a SystemNotification"() { + given: + def code = "a.bit.of.i18n.code" + when: + service.createSystemNotification(code, [], [:]) + then: + SystemNotification.count() + } +} From bb11468913485cc984400c5e57c994209eecbd5d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:05:39 +0300 Subject: [PATCH 1122/2668] Updated CodeNarc report generation --- .../grails-app/conf/BuildConfig.groovy | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 039436089..115195b76 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -97,7 +97,7 @@ grails.project.dependency.resolution = { compile ':platform-core:1.0.RC3-frontlinesms' test ":code-coverage:1.2.5" - test ":codenarc:0.17" + test ":codenarc:0.18.1" test ":spock:0.6" test ":geb:$gebVersion" @@ -122,12 +122,20 @@ coverage { } codenarc { - reportName = 'target/analysis-reports/codenarc.xml' - reportType = 'xml' + reports = { + xmlReport('xml') { + outputFile = 'target/analysis-reports/codenarc.xml' + title = 'CodeNarc Report' + } + htmlReport('html') { + outputFile = 'target/analysis-reports/codenarc.html' + title = 'CodeNarc Report' + } + } systemExitOnBuildException = false // NB these numbers should be LOWERED over time as code quality should be INCREASING maxPriority1Violations = 0 - maxPriority2Violations = 250 + maxPriority2Violations = 260 maxPriority3Violations = 500 properties = { From 91835dce50c90fce2bec7d582ea6d80713b43f4a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:12:57 +0300 Subject: [PATCH 1123/2668] Fixed codenarc violations. --- .../frontlinesms2/AutoforwardController.groovy | 1 - .../controllers/frontlinesms2/AutoreplyController.groovy | 1 - .../controllers/frontlinesms2/ExportController.groovy | 8 ++++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy index 51cd4bf55..20a8a782b 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy @@ -1,6 +1,5 @@ package frontlinesms2 -import grails.converters.JSON class AutoforwardController extends ActivityController { def autoforwardService diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy index 55cb2a8e5..b6dffc013 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy @@ -1,6 +1,5 @@ package frontlinesms2 -import grails.converters.JSON class AutoreplyController extends ActivityController { def autoreplyService diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ExportController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ExportController.groovy index dabaec5d8..284d17970 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ExportController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ExportController.groovy @@ -91,9 +91,9 @@ class ExportController extends ControllerUtils { Map labels = ["id":message(code: 'export.database.id'), "inboundContactName":message(code: 'export.message.source.name'),"src":message(code: 'export.message.source.mobile'), "outboundContactList":message(code: 'export.message.destination.name'), "dispatches.dst":message(code: 'export.message.destination.mobile'), "text":message(code: 'export.message.text'), "date":message(code: 'export.message.date.created')] Map parameters = [title: message(code: 'export.message.title')] response.setHeader("Content-disposition", "attachment; filename=FrontlineSMS_Message_Export_${formatedTime}.${params.format}") - try{ + try { exportService.export(params.format, response.outputStream, messageInstanceList, fields, labels, [:], parameters) - } catch(Exception e){ + } catch(Exception e) { render(text: message(code: 'report.creation.error')) } [messageInstanceList: messageInstanceList] @@ -121,9 +121,9 @@ class ExportController extends ControllerUtils { } Map parameters = [title: message(code: 'export.contact.title')] response.setHeader("Content-disposition", "attachment; filename=FrontlineSMS_Contact_Export_${formatedTime}.${params.format}") - try{ + try { exportService.export(params.format, response.outputStream, contactInstanceList, fields, labels, [:],parameters) - } catch(Exception e){ + } catch(Exception e) { render(text: message(code: 'report.creation.error')) } [contactInstanceList: contactInstanceList] From 156d17c4caa38a1aff9a018dd2953a9df3dc7a9a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:14:08 +0300 Subject: [PATCH 1124/2668] Removed unused imports. --- .../grails-app/controllers/frontlinesms2/HelpController.groovy | 2 -- .../grails-app/controllers/frontlinesms2/PollController.groovy | 3 --- 2 files changed, 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy index a9d4927bf..9eac39ea6 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/HelpController.groovy @@ -1,8 +1,6 @@ package frontlinesms2 -import frontlinesms2.* import grails.converters.JSON -import org.codehaus.groovy.grails.plugins.PluginManagerHolder class HelpController extends ControllerUtils { def appSettingsService diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy index 144836757..972f939e8 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy @@ -1,8 +1,5 @@ package frontlinesms2 -import grails.converters.JSON - - class PollController extends ActivityController { def pollService From 5606e1f873c912b744767db916d205dbfbac028b Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:14:29 +0300 Subject: [PATCH 1125/2668] FIX Codenarc violations --- .../unit/frontlinesms2/services/CustomActivityServiceSpec.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy index 6bba54153..c9880261d 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/CustomActivityServiceSpec.groovy @@ -3,7 +3,6 @@ package frontlinesms2.services import frontlinesms2.* import spock.lang.* import grails.test.mixin.* -import grails.buildtestdata.mixin.Build @TestFor(CustomActivityService) @Mock([CustomActivity]) From 950fb464713c12bf9359c02f7a7a3a2d773b8f2d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:15:49 +0300 Subject: [PATCH 1126/2668] Disabled a couple of codenarc violation types. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 115195b76..d9883d67d 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -140,6 +140,8 @@ codenarc { properties = { GrailsPublicControllerMethod.enabled = false + GrailsDomainHasToString.enabled = false + GrailsDomainHasEquals.enabled = false } } From 125c008894ccb6233d62e2792805bad23e9b14a8 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:18:07 +0300 Subject: [PATCH 1127/2668] FIX Codenarc violations --- .../frontlinesms2/services/DispatchRouterServiceSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy index 5329e447f..756bea6e1 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/DispatchRouterServiceSpec.groovy @@ -107,7 +107,7 @@ class DispatchRouterServiceSpec extends Specification { mockAppSettingsService(false, 'dontsend') mockRoutes(1, 2, 3) when: - def routedTo = service.slip(mockExchange(), null, null) + service.slip(mockExchange(), null, null) then: thrown NoRouteAvailableException } @@ -116,7 +116,7 @@ class DispatchRouterServiceSpec extends Specification { given: mockAppSettingsService(false, 'dontsend') when: - def routedTo = service.slip(mockExchange(), null, null) + service.slip(mockExchange(), null, null) then: thrown NoRouteAvailableException } From 0aebbf071a2b4fc7d567b5996ef5a66eafbf33c7 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:20:12 +0300 Subject: [PATCH 1128/2668] FIX Codenarc violations --- .../unit/frontlinesms2/services/SmssyncServiceSpec.groovy | 1 - .../frontlinesms2/services/SubscriptionServiceSpec.groovy | 7 ------- 2 files changed, 8 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy index e0db1eb8b..5a5b639b6 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy @@ -6,7 +6,6 @@ import spock.lang.* @TestFor(SmssyncService) class SmssyncServiceSpec extends Specification { - private static final boolean TODO = false private static final def TEST_MESSAGE = [to:'123', message:'hi'] def connection diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy index 7e3d2bfbd..bb691f771 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy @@ -10,7 +10,6 @@ class SubscriptionServiceSpec extends Specification { def s, c, g, service, sendService, replyMessage private static final String TEST_CONTACT = '+1111111111' - private static final String TEST_NON_CONTACT = '+2222222222' def setup() { service = new SubscriptionService() @@ -69,12 +68,6 @@ class SubscriptionServiceSpec extends Specification { } //> HELPERS - private def processKeyword(String messageText, String sourcePhoneNumber, String ownerDetail) { - def k = Mock(Keyword) - k.ownerDetail >> ownerDetail - s.processKeyword(mockMessage(messageText, sourcePhoneNumber), k) - } - private def createTestContact() { c = Contact.build(mobile:TEST_CONTACT) } From f3d126360b953854a23e72bcae5a94c4a21d19f7 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:21:20 +0300 Subject: [PATCH 1129/2668] Removed unused method from FsmsTagLib. --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index b313b055f..d98f6c1ed 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -175,13 +175,6 @@ class FsmsTagLib { if(!rendered) throw new GrailsTagException("Failed to render [att=$att, plugins=${grailsApplication.config.frontlinesms.plugins}]") } - private def templateExists(name, plugin) { - // FIXME need to use `plugin` variable when checking for resource - def fullUri = grailsAttributes.getTemplateUri(name, request) - def resource = grailsAttributes.pagesTemplateEngine.getResourceForUri(fullUri) - return resource && resource.file && resource.exists() - } - def i18nBundle = { def locale = RequestContextUtils.getLocale(request) // Always include English in case their locale is not available. The most accurate From fcb490d797fb08fc7d7da907aa7466b98341f350 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:23:25 +0300 Subject: [PATCH 1130/2668] Converted non-final regex to regex and gave it a proper name. --- .../services/frontlinesms2/WebconnectionService.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 47bb8482c..86c51086d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -8,7 +8,7 @@ import grails.converters.JSON import frontlinesms2.api.* class WebconnectionService { - static def regex = /[$][{]*[a-z_]*[}]/ + private static final REPLACEMENT_KEY = /[$][{]*[a-z_]*[}]/ // Substitution variables def camelContext def i18nUtilService @@ -58,9 +58,9 @@ class WebconnectionService { String getProcessedValue(prop, msg) { def val = prop.value - def matches = val.findAll(regex) + def matches = val.findAll(REPLACEMENT_KEY) matches.each { match -> - val = val.replaceFirst(regex, getReplacement(match, msg)) + val = val.replaceFirst(REPLACEMENT_KEY, getReplacement(match, msg)) } return val } From 26ede6b97453f91a69f5479d3fdaea302462b0f4 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:23:44 +0300 Subject: [PATCH 1131/2668] FIX Codenarc violations --- .../frontlinesms2/services/SubscriptionServiceSpec.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy index bb691f771..faba991ec 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SubscriptionServiceSpec.groovy @@ -72,10 +72,6 @@ class SubscriptionServiceSpec extends Specification { c = Contact.build(mobile:TEST_CONTACT) } - private def mockMessage(String messageText, String sourcePhoneNumber) { - return Fmessage.build(text:messageText, src:sourcePhoneNumber) - } - private def mockFmessage(String messageText, String src=null) { Fmessage m = Mock() m.inbound >> true From 8c62903a19062f3a13bcf247ebe29ae233d526d9 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:28:02 +0300 Subject: [PATCH 1132/2668] FIX Codenarc violations --- .../unit/frontlinesms2/controllers/ApiControllerSpec.groovy | 1 - .../frontlinesms2/controllers/ArchiveControllerSpec.groovy | 1 - .../frontlinesms2/controllers/ContactControllerSpec.groovy | 4 ++-- .../frontlinesms2/controllers/ImportControllerSpec.groovy | 2 -- .../frontlinesms2/controllers/MessageControllerSpec.groovy | 3 +-- .../frontlinesms2/controllers/SettingsControllerSpec.groovy | 2 +- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy index a008dca39..beae207b6 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy @@ -3,7 +3,6 @@ package frontlinesms2.controllers import frontlinesms2.* import spock.lang.* -import grails.buildtestdata.mixin.Build @TestFor(ApiController) class ApiControllerSpec extends Specification { diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy index c13d0a480..ec7bce2d9 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ArchiveControllerSpec.groovy @@ -3,7 +3,6 @@ package frontlinesms2.controllers import frontlinesms2.* import spock.lang.* -import groovy.lang.MetaClass; import grails.buildtestdata.mixin.Build @TestFor(ArchiveController) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ContactControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ContactControllerSpec.groovy index 054a60588..5ef6087ed 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ContactControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ContactControllerSpec.groovy @@ -11,8 +11,8 @@ class ContactControllerSpec extends Specification { @Unroll def "check for duplicates should return true or false depending on matches"() { given: - def alice = new Contact(name: "Alice", mobile: "12345").save(flush: true) - def bob = new Contact(name: "Bob", mobile: "54321").save(flush: true) + new Contact(name: "Alice", mobile: "12345").save(flush: true) + new Contact(name: "Bob", mobile: "54321").save(flush: true) println "ids: ${Contact.list()*.id}" when: params.mobile = suppliedMobile diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ImportControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ImportControllerSpec.groovy index e122210df..9b7cd3b95 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ImportControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ImportControllerSpec.groovy @@ -5,8 +5,6 @@ import frontlinesms2.* import spock.lang.* import grails.test.mixin.* -import org.springframework.web.multipart.commons.CommonsMultipartFile - @TestFor(ImportController) @Mock([Group]) class ImportControllerSpec extends Specification { diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/MessageControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/MessageControllerSpec.groovy index c93358ee9..fb2847c6e 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/MessageControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/MessageControllerSpec.groovy @@ -1,12 +1,11 @@ package frontlinesms2.controllers +import static frontlinesms2.DispatchStatus.* import frontlinesms2.* import spock.lang.* import grails.test.mixin.* import grails.buildtestdata.mixin.Build -import frontlinesms2.* -import static frontlinesms2.DispatchStatus.* @TestFor(MessageController) @Mock([Contact, Fmessage, Group, GroupMembership, Poll, Trash]) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy index d65f49863..477513b07 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy @@ -101,7 +101,7 @@ class SettingsControllerSpec extends Specification { given: def conn1 = new SmslibFconnection(name:"Huawei Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) def conn2 = new SmslibFconnection(name:"COM4", port:'COM4', baud:9600).save(failOnError:true) - def conn3 = new SmslibFconnection(name:"COM5", port:'COM5', baud:9600, sendEnabled:false).save(failOnError:true) + new SmslibFconnection(name:"COM5", port:'COM5', baud:9600, sendEnabled:false).save(failOnError:true) controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-${conn1.id}"] when: def model = controller.general() From e4996a3be3a1c2c63bbcea33c30909680fa452a9 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:31:18 +0300 Subject: [PATCH 1133/2668] Fixed codenarc violations (dead code and imports) --- .../test/unit/frontlinesms2/AutoforwardSpec.groovy | 2 -- .../test/unit/frontlinesms2/AutoreplySpec.groovy | 4 ---- .../unit/frontlinesms2/ForwardActionStepSpec.groovy | 10 +--------- .../frontlinesms2/GenericWebconnectionSpec.groovy | 5 ----- .../frontlinesms2/IntelliSmsFconnectionSpec.groovy | 1 - .../test/unit/frontlinesms2/JoinActionStepSpec.groovy | 6 ++---- .../unit/frontlinesms2/LeaveActionStepSpec.groovy | 3 +-- .../test/unit/frontlinesms2/SubscriptionSpec.groovy | 11 +---------- .../frontlinesms2/UshahidiWebconnectionSpec.groovy | 4 +--- 9 files changed, 6 insertions(+), 40 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy index 64b85ce9c..e738c4366 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoforwardSpec.groovy @@ -89,8 +89,6 @@ class AutoforwardSpec extends Specification { 22 | 2 | 2 | 5 | 5 | 2 } - private def mockContact() { Contact.build() } - private def mockGroup(int memberCount) { mockMembers(Group, memberCount) } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy index c56b7a7d4..1f0b3da9e 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/AutoreplySpec.groovy @@ -48,10 +48,6 @@ class AutoreplySpec extends Specification { 1 * autoreplyService.doReply(autoreply, inMessage) } - private def mockKeyword(String value) { - return Mock(Keyword) - } - private def mockFmessage(String messageText, String src=null) { Fmessage m = Mock() m.text >> messageText diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/ForwardActionStepSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/ForwardActionStepSpec.groovy index 319439f13..c69a52f61 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/ForwardActionStepSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/ForwardActionStepSpec.groovy @@ -1,8 +1,6 @@ package frontlinesms2 -import grails.test.mixin.* import spock.lang.* -import grails.buildtestdata.mixin.Build @Mock([CustomActivity, Fmessage, Group, MessageSendService]) @TestFor(ForwardActionStep) @@ -40,11 +38,5 @@ class ForwardActionStepSpec extends Specification { then: 1 * forwardService.doForward(forwardActionStep, message) } - - private createMockOutgoingMessage() { - def m = Mock(Fmessage) - m.id >> 1 - m.setOwnerDetail(_,_) >> "setting the owner detail" - return m - } } + diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy index 9d780ba84..985071623 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy @@ -1,16 +1,11 @@ package frontlinesms2 -import grails.test.mixin.* import spock.lang.* -import frontlinesms2.* import frontlinesms2.camel.* -import org.apache.camel.Exchange -import org.apache.camel.Message @TestFor(GenericWebconnection) @Mock([Keyword]) class GenericWebconnectionSpec extends CamelUnitSpecification { - private static final String TEST_NUMBER = "+2345678" def setup() { Webconnection.metaClass.static.findAllByNameIlike = { name -> GenericWebconnection.findAll().findAll { it.name == name } } } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/IntelliSmsFconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/IntelliSmsFconnectionSpec.groovy index 0af7c76ac..01fb77977 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/IntelliSmsFconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/IntelliSmsFconnectionSpec.groovy @@ -62,7 +62,6 @@ class IntelliSmsFconnectionSpec extends Specification { MetaClassModifiers.addMapMethods() mockForConstraintsTests(IntelliSmsFconnection) when: - def configFields = IntelliSmsFconnection.configFields def conn = Fconnection.getNonnullableConfigFields(IntelliSmsFconnection) then: conn instanceof List diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy index 596e09423..9d8c4dac7 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/JoinActionStepSpec.groovy @@ -1,14 +1,11 @@ package frontlinesms2 import spock.lang.* -import grails.plugin.spock.* -import frontlinesms2.* @TestFor(JoinActionStep) @Mock([CustomActivity]) class JoinActionStepSpec extends Specification { @Unroll - def "Test dynamic constraints"() { when: def step = new JoinActionStep() @@ -34,4 +31,5 @@ class JoinActionStepSpec extends Specification { then: 1 * i18nUtilService.getMessage(_) } -} \ No newline at end of file +} + diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/LeaveActionStepSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/LeaveActionStepSpec.groovy index e4c8ea9e6..e622d5e2a 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/LeaveActionStepSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/LeaveActionStepSpec.groovy @@ -1,8 +1,6 @@ package frontlinesms2 import spock.lang.* -import grails.plugin.spock.* -import frontlinesms2.* @TestFor(LeaveActionStep) @Mock([CustomActivity]) @@ -21,3 +19,4 @@ class LeaveActionStepSpec extends Specification { true | 'group' | true } } + diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy index b29ceb9b0..74ba7fc7a 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/SubscriptionSpec.groovy @@ -9,9 +9,7 @@ import grails.buildtestdata.mixin.Build @Mock([Group, GroupMembership, SubscriptionService]) @Build([Contact, Fmessage]) class SubscriptionSpec extends Specification { - private static final String TEST_CONTACT = '+1111111111' - private static final String TEST_NON_CONTACT = '+2222222222' def s, c, g, subscriptionService, m @@ -65,12 +63,5 @@ class SubscriptionSpec extends Specification { private def mockMessage(String messageText, String sourcePhoneNumber) { return Fmessage.build(text:messageText, src:sourcePhoneNumber) } +} - private def mockFmessage(String messageText, String src=null) { - Fmessage m = Mock() - m.text >> messageText - m.src >> src - return m - } - -} \ No newline at end of file diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/UshahidiWebconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/UshahidiWebconnectionSpec.groovy index 51067374d..758cd623b 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/UshahidiWebconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/UshahidiWebconnectionSpec.groovy @@ -1,8 +1,6 @@ package frontlinesms2 -import grails.test.mixin.* import spock.lang.* -import frontlinesms2.* import frontlinesms2.camel.* import org.apache.camel.Exchange import org.apache.camel.Message @@ -12,7 +10,6 @@ import grails.buildtestdata.mixin.Build @Mock([Keyword]) @Build(Fmessage) class UshahidiWebconnectionSpec extends CamelUnitSpecification { - private static final String TEST_NUMBER = "+2345678" def setup() { Webconnection.metaClass.static.findAllByNameIlike = { name -> UshahidiWebconnection.findAll().findAll { it.name == name } } } @@ -76,3 +73,4 @@ class UshahidiWebconnectionSpec extends CamelUnitSpecification { return x } } + From d08b0807f3d7f33df947818d73c67a289e663be5 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Mon, 25 Mar 2013 16:31:32 +0300 Subject: [PATCH 1134/2668] Fixed codenarc violations in the grails service package --- .../services/frontlinesms2/AnnouncementService.groovy | 2 -- .../grails-app/services/frontlinesms2/AutoforwardService.groovy | 1 - .../grails-app/services/frontlinesms2/AutoreplyService.groovy | 2 -- .../services/frontlinesms2/DispatchRouterService.groovy | 2 -- .../services/frontlinesms2/SubscriptionService.groovy | 2 -- 5 files changed, 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AnnouncementService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AnnouncementService.groovy index b9ca90c9b..b3967a0b1 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AnnouncementService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AnnouncementService.groovy @@ -1,7 +1,5 @@ package frontlinesms2 -import frontlinesms2.* - class AnnouncementService { def messageSendService diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy index e14bbe16f..aa9cea519 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoforwardService.groovy @@ -1,6 +1,5 @@ package frontlinesms2 -import frontlinesms2.* import grails.events.Listener import groovy.sql.Sql diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy index 7942035cb..e51c9aca6 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/AutoreplyService.groovy @@ -1,7 +1,5 @@ package frontlinesms2 -import frontlinesms2.* - class AutoreplyService { def messageSendService def saveInstance(Autoreply autoreply, params) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index d3827cf20..6bbae28e7 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -97,8 +97,6 @@ class DispatchRouterService { def handleNoRoutes(Exchange x) { println "DispatchRouterService.handleNoRoutes() : NoRouteAvailableException handling..." createSystemNotification('no-available-route') - def id = x.in.getHeader('frontlinesms.dispatch.id') - def body = x.in.body x.out.body = x.in.body x.out.headers = x.in.headers println "DispatchRouterService.handleNoRoutes() : EXIT" diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy index a4f5d72e5..ba8492123 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SubscriptionService.groovy @@ -1,7 +1,5 @@ package frontlinesms2 -import frontlinesms2.* - // TODO TODO TODO this class needs a serious refactor as there's masses of copy.pasted code class SubscriptionService { def messageSendService From 8072bf4ca60dc25fc85f94a24a1eeb4464f310fe Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:37:15 +0300 Subject: [PATCH 1135/2668] Fixed codenarc violations in test/integration/../controller --- .../controller/AppInfoControllerISpec.groovy | 7 +++---- .../controller/ContactControllerISpec.groovy | 1 - .../frontlinesms2/controller/ExportControllerISpec.groovy | 3 ++- .../frontlinesms2/controller/ImportControllerISpec.groovy | 1 - .../controller/MessageControllerISpec.groovy | 8 ++++---- .../frontlinesms2/controller/PollControllerISpec.groovy | 2 +- .../frontlinesms2/controller/StatusControllerISpec.groovy | 4 ++-- .../controller/SubscriptionControllerISpec.groovy | 5 +---- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy index 94b0ffc52..935f60557 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/AppInfoControllerISpec.groovy @@ -2,7 +2,6 @@ package frontlinesms2.controller import frontlinesms2.* import grails.converters.JSON -import org.codehaus.groovy.grails.commons.DefaultGrailsApplication import spock.lang.* class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { @@ -21,7 +20,7 @@ class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { def requestData = [] controller.request.JSON = requestData when: - def response = controller.index() + controller.index() then: 0 * _ JSON.parse(controller.response.contentAsString).keySet().sort() == requestData @@ -32,7 +31,7 @@ class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { def requestData = [devices:null] controller.request.JSON = requestData when: - def response = controller.index() + controller.index() then: 1 * service.provide(controller, 'devices', _) 0 * _ @@ -44,7 +43,7 @@ class AppInfoControllerISpec extends grails.plugin.spock.IntegrationSpec { def requestData = [devices:null, gribbles:null] controller.request.JSON = requestData when: - def response = controller.index() + controller.index() then: 1 * service.provide(controller, 'devices', _) 1 * service.provide(controller, 'gribbles', _) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy index 73bbcb257..f094d101e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ContactControllerISpec.groovy @@ -2,7 +2,6 @@ package frontlinesms2.controller import frontlinesms2.* import spock.lang.* -import grails.converters.JSON class ContactControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ExportControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ExportControllerISpec.groovy index 21fc12407..9d70283b3 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ExportControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ExportControllerISpec.groovy @@ -157,8 +157,9 @@ class ExportControllerISpec extends grails.plugin.spock.IntegrationSpec { } def createTestAnnouncement() { - def m = Fmessage.build(src: "Bob", inbound: true, date: new Date()) + Fmessage.build(src: "Bob", inbound: true, date: new Date()) def a = new Announcement(name:'Free Food') a.addToMessages(Fmessage.build(src:"Alice", inbound:true, date:new Date())).save(failOnError:true, flush:true) } } + diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ImportControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ImportControllerISpec.groovy index 27c49c08f..ef2137d70 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ImportControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/ImportControllerISpec.groovy @@ -1,7 +1,6 @@ package frontlinesms2.controller import frontlinesms2.* -import org.springframework.web.multipart.commons.CommonsMultipartFile import org.codehaus.groovy.grails.plugins.testing.GrailsMockMultipartFile class ImportControllerISpec extends grails.plugin.spock.IntegrationSpec { diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy index dffe50077..ee8cd091e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy @@ -21,10 +21,10 @@ class MessageControllerISpec extends grails.plugin.spock.IntegrationSpec { controller.params.offset = 0 controller.params.starred = false - def sahara = new Group(name: "Sahara").save(flush: true) - def thar = new Group(name: "Thar").save(flush: true) + new Group(name: "Sahara").save(flush: true) + new Group(name: "Thar").save(flush: true) - controller.metaClass.getPaginationCount = {-> return 10} + controller.metaClass.getPaginationCount = { -> return 10 } } def "should send a message to the given address"() { @@ -44,7 +44,7 @@ class MessageControllerISpec extends grails.plugin.spock.IntegrationSpec { when: assert Fmessage.count() == 0 controller.send() - def flashMessage = controller.flash.message + controller.flash.message then: assert Fmessage.count() == 1 (Fmessage.getAll() as List)[0].dispatches*.dst.sort() == addresses.sort() diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy index 202da9acf..1493cb6cd 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/PollControllerISpec.groovy @@ -211,7 +211,7 @@ class PollControllerISpec extends grails.plugin.spock.IntegrationSpec { def "editing a poll and removing the top level keyword should set responses as top level"() { setup: - def p = TestData.createFootballPollWithKeywords() + TestData.createFootballPollWithKeywords() and: controller.params.ownerId=Poll.findByName('This is a poll').id controller.params.name = 'test-poll-1' diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/StatusControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/StatusControllerISpec.groovy index 6e43e8d36..bdde32aea 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/StatusControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/StatusControllerISpec.groovy @@ -32,7 +32,7 @@ class StatusControllerISpec extends grails.plugin.spock.IntegrationSpec { def "message start dates should be inclusive"() { given: def sentDate = createDate(2011, 10, 18, 23, 58, 59) - def m1 = new Fmessage(text:'', src:"src1", date:createDate(2011, 10, 18, 0, 0, 1), inbound:true).save(flush:true, failOnError:true) + new Fmessage(text:'', src:"src1", date:createDate(2011, 10, 18, 0, 0, 1), inbound:true).save(flush:true, failOnError:true) def m2 = new Fmessage(text:'', src:"src2", date:sentDate, hasSent:true, inbound: false) def d = new Dispatch(dst:'123', status:DispatchStatus.SENT, dateSent:sentDate) m2.addToDispatches(d) @@ -110,7 +110,7 @@ class StatusControllerISpec extends grails.plugin.spock.IntegrationSpec { PollResponse.findByValue('Barcelona').addToMessages(Fmessage.build(src:'Jim', text:'hi Bob')) p.save(failOnError:true, flush:true) - def f = Folder.build(name:'test-folder') + Folder.build(name:'test-folder') .addToMessages(Fmessage.build(src:'src')) .save(failOnError:true, flush:true) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy index 87853de93..9d7375ec1 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/SubscriptionControllerISpec.groovy @@ -2,10 +2,7 @@ package frontlinesms2.controller import spock.lang.* import grails.plugin.spock.* -import java.text.DateFormat -import java.text.SimpleDateFormat import frontlinesms2.* -import grails.converters.JSON class SubscriptionControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller @@ -162,7 +159,7 @@ class SubscriptionControllerISpec extends grails.plugin.spock.IntegrationSpec { } private def createTestMessageFromContact(text, Contact c) { - def m = new Fmessage(text:text, src:c.mobile, inbound:true).save(failOnError:true) + new Fmessage(text:text, src:c.mobile, inbound:true).save(failOnError:true) } } From 4e49ecbe06c8529f82e89b85b036bfc96e5a2b20 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:38:54 +0300 Subject: [PATCH 1136/2668] FIX Codenarc violations --- .../camel/intellisms/IntelliSmsPreProcessorSpec.groovy | 3 +-- .../frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/intellisms/IntelliSmsPreProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/intellisms/IntelliSmsPreProcessorSpec.groovy index 9ce15f6f3..85fc8d109 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/intellisms/IntelliSmsPreProcessorSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/intellisms/IntelliSmsPreProcessorSpec.groovy @@ -5,7 +5,6 @@ import frontlinesms2.* import frontlinesms2.camel.* import org.apache.camel.Exchange -import org.apache.camel.Message import grails.buildtestdata.mixin.Build @Mock([IntelliSmsFconnection, Dispatch]) @@ -14,7 +13,7 @@ class IntelliSmsPreProcessorSpec extends CamelUnitSpecification { IntelliSmsPreProcessor p def setup() { - def c = IntelliSmsFconnection.build(username:'bob', password:'secret') + IntelliSmsFconnection.build(username:'bob', password:'secret') p = new IntelliSmsPreProcessor() } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy index f6322d497..ad05800fa 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/camel/nexmo/NexmoPreProcessorSpec.groovy @@ -67,7 +67,7 @@ class NexmoPreProcessorSpec extends CamelUnitSpecification { x.out.headers.'nexmo.api_secret' == 'siri' x.out.headers.'nexmo.fromNumber' == '123321' } - private NexmoFconnection buildTestConnection(sendToUsa=false) { + private NexmoFconnection buildTestConnection() { NexmoFconnection.build(api_key:'ufunguo', api_secret:'siri',fromNumber: "123321") } } From 6ff0addebe36ca8ae0585957b540582644c9f098 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:39:34 +0300 Subject: [PATCH 1137/2668] Disabled RuntimeException and catchException codenarc rules. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index d9883d67d..2bd515e41 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -142,6 +142,8 @@ codenarc { GrailsPublicControllerMethod.enabled = false GrailsDomainHasToString.enabled = false GrailsDomainHasEquals.enabled = false + ThrowRuntimeException.enabled = false + CatchException.enabled = false } } From 7963c360eee811f561ee3a4994281e4179eee81d Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:40:25 +0300 Subject: [PATCH 1138/2668] Disabled static import order codenarc rule (don't understand the problem) --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 2bd515e41..bea104ad6 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -144,6 +144,7 @@ codenarc { GrailsDomainHasEquals.enabled = false ThrowRuntimeException.enabled = false CatchException.enabled = false + MisorderedStaticImports.enabled = false } } From eaf57ea3492ce4d28d7a3347c4126e83dc5d0798 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:43:49 +0300 Subject: [PATCH 1139/2668] FIX Codenarc violations --- .../test/integration/routing/IncomingSmslibRouteSpec.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/routing/IncomingSmslibRouteSpec.groovy b/plugins/frontlinesms-core/test/integration/routing/IncomingSmslibRouteSpec.groovy index d10b5b153..37e071804 100644 --- a/plugins/frontlinesms-core/test/integration/routing/IncomingSmslibRouteSpec.groovy +++ b/plugins/frontlinesms-core/test/integration/routing/IncomingSmslibRouteSpec.groovy @@ -5,8 +5,6 @@ import frontlinesms2.dev.MockModemUtils import serial.mock.* -import org.hibernate.FlushMode - class IncomingSmslibRouteSpec extends grails.plugin.spock.IntegrationSpec { static transactional = false def fconnectionService From b58eda366f53f56e0a0f6079d80e5e45735018b6 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Mon, 25 Mar 2013 16:46:27 +0300 Subject: [PATCH 1140/2668] More codenarc fixes for test.integration.frontlinesms2.domain --- .../frontlinesms2/domain/AutoforwardISpec.groovy | 6 +++--- .../integration/frontlinesms2/domain/ContactISpec.groovy | 6 +++--- .../integration/frontlinesms2/domain/FolderISpec.groovy | 2 +- .../integration/frontlinesms2/domain/GroupISpec.groovy | 2 +- .../frontlinesms2/domain/SubscriptionISpec.groovy | 7 ------- .../frontlinesms2/domain/UshahidiWebconnectionISpec.groovy | 1 - 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy index 11a59b4c3..492bd3acc 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy @@ -34,7 +34,7 @@ class AutoforwardISpec extends grails.plugin.spock.IntegrationSpec { def group = new Group (name:'Group 1').save(failOnError:true) def smartGroup = new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) def contact1 = new Contact(name:"Soja", mobile:"12345").save(failOnError:true) - def contact2 = new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) + new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) def contact3 = new Contact(name:"Hijo", mobile:"34534534").save(failOnError:true) group.addToMembers(contact1).save(failOnError:true) def autoforward = new Autoforward(name: "test", sentMessageText: "Someone said something") @@ -52,8 +52,8 @@ class AutoforwardISpec extends grails.plugin.spock.IntegrationSpec { def group = new Group (name:'Group 1').save(failOnError:true) def smartGroup = new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) def contact1 = new Contact(name:"Soja", mobile:"12345").save(failOnError:true) - def contact2 = new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) - def contact3 = new Contact(name:"Hijo", mobile:"34534534").save(failOnError:true) + new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) + new Contact(name:"Hijo", mobile:"34534534").save(failOnError:true) group.addToMembers(contact1).save(failOnError:true) def autoforward = new Autoforward(name: "test", sentMessageText: "Someone said something") .addToKeywords(new Keyword(value:"DOESNTMATTER")) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ContactISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ContactISpec.groovy index 3c325158c..5bdf4222f 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ContactISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/ContactISpec.groovy @@ -31,9 +31,9 @@ class ContactISpec extends grails.plugin.spock.IntegrationSpec { Contact contact = new Contact(name: "John", mobile: johnsmobile).save(flush:true) def d1 = new Dispatch(dst: johnsmobile, status: DispatchStatus.FAILED) def d2 = new Dispatch(dst: johnsmobile, status: DispatchStatus.FAILED) - def m1 = new Fmessage(text:'', isDeleted: false, inbound: false, date: new Date(), hasFailed:true).addToDispatches(d1).save(flush:true, failOnError:true) - def m2 = new Fmessage(text:'', isDeleted: true, inbound: false, date: new Date(), hasFailed:true).addToDispatches(d2).save(flush:true, failOnError:true) - def m3 = new Fmessage(text:'', isDeleted: false, inbound: false, date: new Date(), hasFailed:true).addToDispatches(d1).save(flush:true, failOnError:true) + new Fmessage(text:'', isDeleted: false, inbound: false, date: new Date(), hasFailed:true).addToDispatches(d1).save(flush:true, failOnError:true) + new Fmessage(text:'', isDeleted: true, inbound: false, date: new Date(), hasFailed:true).addToDispatches(d2).save(flush:true, failOnError:true) + new Fmessage(text:'', isDeleted: false, inbound: false, date: new Date(), hasFailed:true).addToDispatches(d1).save(flush:true, failOnError:true) when: def count = contact.outboundMessagesCount then: diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FolderISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FolderISpec.groovy index a25923870..45b4d82e5 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FolderISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FolderISpec.groovy @@ -67,7 +67,7 @@ class FolderISpec extends grails.plugin.spock.IntegrationSpec { controller.params.name == 'folder' controller.save() when: - def f = new Folder(name:'FolDeR').save(failOnError:true) + new Folder(name:'FolDeR').save(failOnError:true) then: Folder.findByNameIlike("folder").count() == 1 controller.flash.message == 'Could not create folder' diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/GroupISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/GroupISpec.groovy index c30be777a..ac1cca8fb 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/GroupISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/GroupISpec.groovy @@ -13,7 +13,7 @@ class GroupISpec extends grails.plugin.spock.IntegrationSpec { def samTina = new Contact(name: 'SaM Tina', mobile: "1234567893").save(failOnError: true) samAnderson.addToGroups(fpGroup, true) samJones.addToGroups(fpGroup,true) - def bob = new Contact(name: 'Bob', mobile: "1234567894").save(failOnError: true).addToGroups(fpGroup,true) + new Contact(name: 'Bob', mobile: "1234567894").save(failOnError: true).addToGroups(fpGroup,true) when: def results = contactSearchService.getContacts([groupId:fpGroup.id, searchString:"Sam", max:50, offset:0]) def resultsCount = contactSearchService.countContacts([groupId:fpGroup.id, searchString:"Sam"]) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/SubscriptionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/SubscriptionISpec.groovy index ae89d02b5..269277a8d 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/SubscriptionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/SubscriptionISpec.groovy @@ -114,13 +114,6 @@ class SubscriptionISpec extends grails.plugin.spock.IntegrationSpec { return Fmessage.build(text:messageText, src:sourcePhoneNumber) } - private def mockFmessage(String messageText, String src=null) { - Fmessage m = Mock() - m.text >> messageText - m.src >> src - return m - } - private def getNewContact() { Contact.findByMobile(TEST_NON_CONTACT) } diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy index 4bf13a0f2..5c628b82b 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/UshahidiWebconnectionISpec.groovy @@ -2,7 +2,6 @@ package frontlinesms2.domain import spock.lang.* import frontlinesms2.* -import grails.converters.JSON class UshahidiWebconnectionISpec extends grails.plugin.spock.IntegrationSpec { def webCService = Mock(WebconnectionService) From 11a3fd0b43f677873e756b5ca0d8bb41149ce4a8 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:48:12 +0300 Subject: [PATCH 1141/2668] Fixed codenarc violations in services. --- .../services/frontlinesms2/CustomActivityService.groovy | 1 - .../services/frontlinesms2/DataUploadService.groovy | 4 ++-- .../services/frontlinesms2/FconnectionService.groovy | 1 + .../grails-app/services/frontlinesms2/I18nUtilService.groovy | 4 ++-- .../grails-app/services/frontlinesms2/SmssyncService.groovy | 4 ---- .../services/frontlinesms2/WebconnectionService.groovy | 1 - 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy index d6e1905a7..d9e586291 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/CustomActivityService.groovy @@ -1,7 +1,6 @@ package frontlinesms2 import org.codehaus.groovy.grails.web.json.JSONArray -import org.codehaus.groovy.grails.web.json.JSONObject class CustomActivityService { /* TODO if you do insist on committing printlns, please make sure they are neat and make sense when diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy index 9d764587c..c46e53c42 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DataUploadService.groovy @@ -1,9 +1,8 @@ package frontlinesms2 + import groovyx.net.http.HTTPBuilder -import static groovyx.net.http.ContentType.URLENC class DataUploadService { - def upload(String url, Map dataToSend) { def http = new HTTPBuilder(url) boolean success = false @@ -13,3 +12,4 @@ class DataUploadService { success } } + diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 268ea425c..c25ceaafd 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -135,6 +135,7 @@ class FconnectionService { } private def isFailed(Fconnection c) { + // TODO I rather suspect that this method needs implementing false } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy index 6f8016750..1597cfecc 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/I18nUtilService.groovy @@ -70,14 +70,14 @@ class I18nUtilService { def getMessage(args) { // maybe we need Locale.setDefault(new Locale("en","US")) try { - def text = messageSource.getMessage(args.code, args.args as Object[], null) + return messageSource.getMessage(args.code, args.args as Object[], null) } catch(org.springframework.context.NoSuchMessageException _) { return args.code } } private String getRootDirectory() { - def fileURL = new File('web-app/WEB-INF/grails-app/i18n').path + return new File('web-app/WEB-INF/grails-app/i18n').path } } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 37948085a..62564da02 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -84,10 +84,6 @@ class SmssyncService { return success(generateOutgoingResponse(connection, true)) } - private def handleRouteDestroyed(connection) { - ReportSmssyncTimeoutJob.unschedule("SmssyncFconnection-${connection.id}", "SmssyncFconnectionTimeoutJobs") - } - private def generateOutgoingResponse(connection, boolean includeWhenEmpty) { def responseMap = [:] diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index 86c51086d..a98d21b99 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -1,6 +1,5 @@ package frontlinesms2 -import frontlinesms2.* import org.apache.camel.* import grails.converters.JSON From 52d375249c986cd918380393633af79de91151ad Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 16:50:36 +0300 Subject: [PATCH 1142/2668] CODENARC FIX on SmppTranslationService --- .../services/frontlinesms2/SmppTranslationService.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy index c558cc731..f7c4ebc19 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmppTranslationService.groovy @@ -17,8 +17,7 @@ class SmppTranslationService implements Processor { log ("in.getHeaders: ${i.getHeaders()}") //TODO allow messages is source is set - //if(i.headers['CamelSmppSourceAddr']) { - if(true) { + if(i.headers['CamelSmppSourceAddr']) { Fmessage message = new Fmessage(inbound:true) def messageBody = i.body def messageSource = i.headers['CamelSmppSourceAddr'] From 1756fcb024e193f5a01a4b64a483fd5dcb7d7e89 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 25 Mar 2013 16:50:38 +0300 Subject: [PATCH 1143/2668] FIX Codenarc violations in service integration tests --- .../service/ExpressionProcessorServiceISpec.groovy | 4 ++-- .../service/KeywordProcessorServiceISpec.groovy | 6 +++--- .../frontlinesms2/service/MessageSendServiceISpec.groovy | 6 +++--- .../service/WebconnectionServiceISpec.groovy | 9 +-------- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy index 5ade38855..760b28950 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/ExpressionProcessorServiceISpec.groovy @@ -10,7 +10,7 @@ class ExpressionProcessorServiceISpec extends grails.plugin.spock.IntegrationSpe @Unroll def 'process should return message content with no expressions in it, unless some expressions are not recognised'() { setup: - def contact = new Contact(name:'Gedi', mobile:'10983').save(failOnError:true, flush:true) + new Contact(name:'Gedi', mobile:'10983').save(failOnError:true, flush:true) def m = new Fmessage(src:'10983', inbound:false) m.text = messageText def d = new Dispatch(dst:'10983', status:DispatchStatus.FAILED) @@ -33,7 +33,7 @@ class ExpressionProcessorServiceISpec extends grails.plugin.spock.IntegrationSpe @Unroll def 'process should work for autoforward expressions which require further context from the message and its owner'() { setup: - def source = new Contact(name:'Source', mobile:'112233').save(failOnError:true, flush:true) + new Contact(name:'Source', mobile:'112233').save(failOnError:true, flush:true) def destination = new Contact(name:'Destination', mobile:'445566').save(failOnError:true, flush:true) def autoforward = new Autoforward(name:'I forward stuff', sentMessageText:'This is not too relevant as we are manually setting message text') .addToKeywords(value:'INCOMING') diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy index 7150433f6..310fe8d0e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy @@ -9,7 +9,7 @@ class KeywordProcessorServiceISpec extends grails.plugin.spock.IntegrationSpec { @Unroll def "activity.processKeyword should be called with most specific keyword match"() { given: - Poll p = createTestPoll() + createTestPoll() def m = createFmessage(messageText).save(failOnError:true) when: keywordProcessorService.process(m) @@ -35,7 +35,7 @@ class KeywordProcessorServiceISpec extends grails.plugin.spock.IntegrationSpec { @Unroll def "no activity should be processed if no keyword matches"() { given: - Poll p = createTestPoll() + createTestPoll() def m = createFmessage(messageText) when: keywordProcessorService.process(m) @@ -48,7 +48,7 @@ class KeywordProcessorServiceISpec extends grails.plugin.spock.IntegrationSpec { @Unroll def "archived and deleted activities should not be matched"() { given: - Poll p = createTestPoll(archived, deleted) + createTestPoll(archived, deleted) def m = createFmessage(messageText) when: keywordProcessorService.process(m) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/MessageSendServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/MessageSendServiceISpec.groovy index 6f49f314d..5f7e2a659 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/MessageSendServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/MessageSendServiceISpec.groovy @@ -9,10 +9,10 @@ class MessageSendServiceISpec extends grails.plugin.spock.IntegrationSpec { given: def contact1 = Contact.build(name: "test1", mobile:"+11111").save() // in g1 def contact2 = Contact.build(name: "test2", mobile:"+22222").save() // in g2 - def contact3 = Contact.build(name: "test3", mobile:"+33333").save() // in sg1 - def contact4 = Contact.build(name: "test4", mobile:"+44444").save() // in sg2 + Contact.build(name: "test3", mobile:"+33333").save() // in sg1 + Contact.build(name: "test4", mobile:"+44444").save() // in sg2 def contact5 = Contact.build(name: "test5", mobile:"+334455").save() // in g1 and sg1 - def contact6 = Contact.build(name: "test6", mobile:"+66666").save() // in no groups or smartgroups + Contact.build(name: "test6", mobile:"+66666").save() // in no groups or smartgroups def sg1 = SmartGroup.build(name: "test-smartgroup-1", mobile: "+33").save() def sg2 = SmartGroup.build(name: "test-smartgroup-2", mobile: "+44").save() def g1 = Group.build(name: "test-group-1").save() diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy index 3fc557362..9ec6e58ab 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy @@ -5,14 +5,12 @@ import spock.lang.* import org.apache.camel.* import org.apache.camel.Message import org.apache.camel.spi.UnitOfWork -import org.apache.camel.spi.RouteContext -import org.apache.camel.model.RouteDefinition class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ def webconnectionService def setup() { def k = new Keyword(value:'FOREWARD') - def webconnection = new GenericWebconnection(name:"Sync", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).addToKeywords(k).save(failOnError:true) + new GenericWebconnection(name:"Sync", url:"http://www.frontlinesms.com/sync",httpMethod:Webconnection.HttpMethod.GET).addToKeywords(k).save(failOnError:true) } //Pre-Processor Tests def 'out_header url should contain the RequestParameters for GET request'() { @@ -165,11 +163,6 @@ class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ */ } - private String urlEncode(String s) throws UnsupportedEncodingException { - println "PreProcessor.urlEncode : s=$s -> ${URLEncoder.encode(s, "UTF-8")}" - return URLEncoder.encode(s, "UTF-8"); - } - def mockExchangeMessage(headers, body) { def m = Mock(Message) m.body >> body From 98256747e6d47ef6b9e4e0839c1210c33afba72c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:54:17 +0300 Subject: [PATCH 1144/2668] Disabled codenarc empty method rule for controllers. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index bea104ad6..3ca8712d9 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -145,6 +145,7 @@ codenarc { ThrowRuntimeException.enabled = false CatchException.enabled = false MisorderedStaticImports.enabled = false + EmptyMethod.doNotApplyToClassNames = '*Controller' } } From 480b9fb960ac202daa8b9f327f084f7f4931682b Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Mon, 25 Mar 2013 16:56:28 +0300 Subject: [PATCH 1145/2668] More codenarc fixes for test.integration.frontlinesms2 --- .../test/integration/frontlinesms2/FsmsTagLibSpec.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/FsmsTagLibSpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/FsmsTagLibSpec.groovy index 26550fe8b..a3f5eda1e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/FsmsTagLibSpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/FsmsTagLibSpec.groovy @@ -2,7 +2,6 @@ package frontlinesms2 import spock.lang.* import grails.plugin.spock.* -import frontlinesms2.* class FsmsTagLibSpec extends GroovyPagesSpec { def "confirmTypeRow generates a row that is properly internationalized"() { From 52609063fc496e404cb391e67431678faee0f72c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 16:58:49 +0300 Subject: [PATCH 1146/2668] Fixed codenarc violations in controllers. --- .../frontlinesms2/ArchiveController.groovy | 12 +----------- .../frontlinesms2/ConnectionController.groovy | 1 - .../frontlinesms2/MessageController.groovy | 2 +- .../frontlinesms2/SearchController.groovy | 1 - .../frontlinesms2/SettingsController.groovy | 2 -- .../frontlinesms2/SubscriptionController.groovy | 2 -- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ArchiveController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ArchiveController.groovy index 9bec69865..80ab8a0cf 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ArchiveController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ArchiveController.groovy @@ -1,11 +1,6 @@ package frontlinesms2 class ArchiveController extends MessageController { -//> SERVICES - -//> INTERCEPTORS - -//> ACTIONS def index() { def action = params.messageSection ?: 'inbox' redirect action:action, params:params @@ -24,10 +19,5 @@ class ArchiveController extends MessageController { itemInstanceTotal: folderInstanceList.size(), messageSection: "folder"] } - -//> PRIVATE HELPERS - private def getShowModel(messageInstanceList) { - def model = super.getShowModel(messageInstanceList) - return model - } } + diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 075737055..1758e21f0 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -20,7 +20,6 @@ class ConnectionController extends ControllerUtils { fconnectionInstanceTotal:fconnectionInstanceTotal] if(params?.id) { model << show() - def connectionInstance = model.connectionInstance render view:'show', model:model } else { params.id = fconnectionInstanceList[0]?.id diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index b871344eb..52ce28cf2 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -270,7 +270,7 @@ class MessageController extends ControllerUtils { private def withFmessage = withDomainObject Fmessage, { params.messageId } - private def getShowModel(messageInstanceList) { + private def getShowModel() { def messageInstance = params.messageId? Fmessage.get(params.messageId): null messageInstance?.read = true messageInstance?.save() diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SearchController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SearchController.groovy index 264f59024..bdbad4eb0 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SearchController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SearchController.groovy @@ -47,7 +47,6 @@ class SearchController extends MessageController { def rawSearchResults = Fmessage.search(search) int offset = params.offset?.toInteger()?:0 int max = params.max?.toInteger()?:50 - def checkedMessageCount = params.checkedMessageList?.tokenize(',')?.size() flash.message = params.flashMessage [searchDescription:getSearchDescription(search), search:search, checkedMessageCount:params.checkedMessageList?.tokenize(',')?.size(), diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index 944a38d18..3047a6643 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -109,7 +109,5 @@ class SettingsController extends ControllerUtils { fconnectionRoutingMap } - - private def withFconnection = withDomainObject Fconnection, { params.id }, { render(view:'show_connections', model: [fconnectionInstanceTotal: 0]) } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy index 16c6e05a8..6d6c5ff00 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy @@ -1,7 +1,5 @@ package frontlinesms2 -import grails.converters.JSON - class SubscriptionController extends ActivityController { def subscriptionService From 47abc23782d42cd22aec3ecd9b277e0614cdf952 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:02:20 +0300 Subject: [PATCH 1147/2668] CODENARC FIX in Activity.groovy --- .../grails-app/domain/frontlinesms2/Activity.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index fdf398c61..79410cd6b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -67,7 +67,7 @@ abstract class Activity extends MessageOwner { this.messages*.isDeleted = false } - def processKeyword(Fmessage message, Keyword match) { + def processKeyword(Fmessage message) { message.setMessageDetail(this, "") this.addToMessages(message) this.save(failOnError:true) @@ -83,7 +83,7 @@ abstract class Activity extends MessageOwner { def move(messageInstance) { messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) - this.processKeyword(messageInstance, null) + this.processKeyword(messageInstance) } private def logFail(c, ex) { From 77eb5a3596d019fa28ca20a234e7c046c7579acf Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:05:29 +0300 Subject: [PATCH 1148/2668] CODENARC FIX Autoforward.groovy and Autoreply.groovy --- .../grails-app/domain/frontlinesms2/Autoforward.groovy | 2 +- .../grails-app/domain/frontlinesms2/Autoreply.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index bd7f759fe..f35f4f3cc 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -26,7 +26,7 @@ class Autoforward extends Activity { } //> PROCESS METHODS - def processKeyword(Fmessage message, Keyword matchedKeyword) { + def processKeyword(Fmessage message) { this.addToMessages(message) this.save(failOnError:true) if(addressesAvailable()){ diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy index 6d8fafaef..c09fe79cb 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy @@ -21,7 +21,7 @@ class Autoreply extends Activity { def autoreplyService //> PROCESS METHODS - def processKeyword(Fmessage message, Keyword matchedKeyword) { + def processKeyword(Fmessage message) { this.addToMessages(message) autoreplyService.doReply(this, message) this.save(failOnError:true) From 8be36706180c9be4a9ad076c99c5d7a576dd9428 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 17:06:00 +0300 Subject: [PATCH 1149/2668] Removed unused imports from WebconnectionControllerISpec --- .../controller/WebconnectionControllerISpec.groovy | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy index 04975bd6f..3db43885e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/WebconnectionControllerISpec.groovy @@ -2,10 +2,7 @@ package frontlinesms2.controller import spock.lang.* import grails.plugin.spock.* -import java.text.DateFormat -import java.text.SimpleDateFormat import frontlinesms2.* -import grails.converters.JSON class WebconnectionControllerISpec extends grails.plugin.spock.IntegrationSpec { def controller From b4e1a16a7e36e9a6a3afb69b57467206ef73d2c1 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 17:09:26 +0300 Subject: [PATCH 1150/2668] Updated ActivityService.doSave to drop a pointless argument. --- .../controllers/frontlinesms2/ActivityController.groovy | 2 +- .../controllers/frontlinesms2/AnnouncementController.groovy | 4 +--- .../controllers/frontlinesms2/AutoforwardController.groovy | 2 +- .../controllers/frontlinesms2/AutoreplyController.groovy | 2 +- .../controllers/frontlinesms2/CustomactivityController.groovy | 2 +- .../controllers/frontlinesms2/PollController.groovy | 2 +- .../controllers/frontlinesms2/SubscriptionController.groovy | 2 +- .../controllers/frontlinesms2/WebconnectionController.groovy | 4 ++-- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy index 256b01d73..d3761b563 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ActivityController.groovy @@ -129,7 +129,7 @@ class ActivityController extends ControllerUtils { return collidingKeywords } - protected void doSave(classShortname, service, instance, activate=true) { + protected void doSave(service, instance, activate=true) { try { service.saveInstance(instance, params) if(activate) instance.activate() diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AnnouncementController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AnnouncementController.groovy index 635224b62..411f1cd88 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AnnouncementController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AnnouncementController.groovy @@ -14,9 +14,7 @@ class AnnouncementController extends ActivityController { def save() { def announcementInstance = Announcement.get(params.ownerId)?: new Announcement() - doSave('announcement', announcementService, announcementInstance) + doSave(announcementService, announcementInstance) } - - private def withAnnouncement = withDomainObject Announcement } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy index 20a8a782b..586a803a8 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoforwardController.groovy @@ -5,7 +5,7 @@ class AutoforwardController extends ActivityController { def save() { withAutoforward { autoforward -> - doSave('autoreply', autoforwardService, autoforward) + doSave(autoforwardService, autoforward) } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy index b6dffc013..c67b27313 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AutoreplyController.groovy @@ -7,7 +7,7 @@ class AutoreplyController extends ActivityController { // FIXME this should use withAutoreply to shorten and DRY the code, but it causes cascade errors as referenced here: // http://grails.1312388.n4.nabble.com/Cascade-problem-with-hasOne-relationship-td4495102.html def autoreply = Autoreply.get(params.ownerId)?: new Autoreply() - doSave('autoreply', autoreplyService, autoreply) + doSave(autoreplyService, autoreply) } def sendReply() { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomactivityController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomactivityController.groovy index 44eb95e0e..f261fb9ab 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomactivityController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/CustomactivityController.groovy @@ -5,7 +5,7 @@ class CustomactivityController extends ActivityController { def save() { withCustomActivity { customActivity -> - doSave('customactivity', customActivityService, customActivity) + doSave(customActivityService, customActivity) } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy index 972f939e8..1a8f33f9e 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/PollController.groovy @@ -6,7 +6,7 @@ class PollController extends ActivityController { def save() { params.keywords = params.topLevelKeyword?: "$params.keywordsA,$params.keywordsB,$params.keywordsC,$params.keywordsD,$params.keywordsE" withPoll { poll -> - doSave('poll', pollService, poll) + doSave(pollService, poll) } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy index 6d6c5ff00..53b077343 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SubscriptionController.groovy @@ -52,7 +52,7 @@ class SubscriptionController extends ActivityController { //TODO Should use the withDefault subscription closure def subscriptionInstance = Subscription.get(params.ownerId)?: new Subscription() params.keywords = (params.topLevelKeywords?.trim()?.length() > 0) ? params.topLevelKeywords:("${params.joinKeywords},${params.leaveKeywords}") - doSave('subscription', subscriptionService, subscriptionInstance) + doSave(subscriptionService, subscriptionInstance) } def categoriseSubscriptionPopup() { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy index 27723378b..5f25d9c77 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/WebconnectionController.groovy @@ -13,7 +13,7 @@ class WebconnectionController extends ActivityController { def save() { if(params.activityId) params.ownerId = params.activityId withWebconnection { webconnectionInstance -> - doSave('webconnection', webconnectionService, webconnectionInstance) + doSave(webconnectionService, webconnectionInstance) } } @@ -36,7 +36,7 @@ class WebconnectionController extends ActivityController { def testRoute() { withWebconnection { webconnectionInstance -> - doSave('webconnection', webconnectionService, webconnectionInstance, false) + doSave(webconnectionService, webconnectionInstance, false) TestWebconnectionJob.triggerNow([webconnectionId:webconnectionInstance.id]) } } From 5a5573b30452a6704d407a7243741b7f901ed947 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:09:53 +0300 Subject: [PATCH 1151/2668] CODENARC FIX Dispatch.groovy --- .../grails-app/domain/frontlinesms2/Dispatch.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Dispatch.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Dispatch.groovy index 6efdf3fba..d2624d26a 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Dispatch.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Dispatch.groovy @@ -43,7 +43,6 @@ class Dispatch { def messageOwner = params.messageOwner def startDate = params.startDate.startOfDay def endDate = params.endDate.endOfDay - def statuses = params.messageStatus.collect { it.toLowerCase() } and { eq('isDeleted', false) From 28e8804af4a1f8ea1e52690fa3761fd98750c181 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 17:11:58 +0300 Subject: [PATCH 1152/2668] Whitespace cleanup. --- .../services/frontlinesms2/IncomingMessageRouterService.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IncomingMessageRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IncomingMessageRouterService.groovy index 99df8d27a..9919149f9 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IncomingMessageRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/IncomingMessageRouterService.groovy @@ -9,3 +9,4 @@ class IncomingMessageRouterService { camelContext.routes*.endpoint.findAll { it.endpointUri.endsWith('-fmessages-to-process') } } } + From 79c46f66d29ff787d60ed88899271e11dca93988 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:13:20 +0300 Subject: [PATCH 1153/2668] CODENARC FIX --- .../grails-app/domain/frontlinesms2/SmppFconnection.groovy | 3 +-- .../grails-app/domain/frontlinesms2/Trash.groovy | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy index 51498fa4c..bf36bca83 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmppFconnection.groovy @@ -2,7 +2,6 @@ package frontlinesms2 import frontlinesms2.camel.smpp.* -import org.apache.camel.Exchange import org.apache.camel.builder.RouteBuilder import org.apache.camel.model.RouteDefinition import frontlinesms2.camel.exception.* @@ -73,4 +72,4 @@ class SmppFconnection extends Fconnection { private getReceivingUrl(){ return "smpp://${this.username}@${this.url}:${this.port}?password=${this.password}&enquireLinkTimer=30000&transactionTimer=50000&systemType=consumer" } -} \ No newline at end of file +} diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy index 4cb5ddb4b..fe38b5e80 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Trash.groovy @@ -1,7 +1,5 @@ package frontlinesms2 -import frontlinesms2.Fmessage - class Trash { Date dateCreated Long objectId From 804a58dc44591a54572dba45d07c8ba08300273d Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:14:22 +0300 Subject: [PATCH 1154/2668] codenarc fix --- .../domain/frontlinesms2/UshahidiWebconnection.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy index 63dba9c1c..e2ad2d567 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/UshahidiWebconnection.groovy @@ -1,7 +1,5 @@ package frontlinesms2 -import org.apache.camel.Exchange - class UshahidiWebconnection extends Webconnection { static String getType() { 'ushahidi' } static constraints = { From 983905d86838c0bd00b38a6b36967948e40327a0 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 17:15:43 +0300 Subject: [PATCH 1155/2668] Fixed codenarc violation. --- .../integration/frontlinesms2/domain/AutoforwardISpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy index 492bd3acc..32f46d0f0 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/AutoforwardISpec.groovy @@ -50,7 +50,7 @@ class AutoforwardISpec extends grails.plugin.spock.IntegrationSpec { def 'Autoforward.addressesAvailable returns false if contacts/groups/smartgroups dont have contacts'(){ setup: def group = new Group (name:'Group 1').save(failOnError:true) - def smartGroup = new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) + new SmartGroup(name:'Group 2', mobile:'+44').save(failOnError:true) def contact1 = new Contact(name:"Soja", mobile:"12345").save(failOnError:true) new Contact(name:"tim", mobile:"+4412345321").save(failOnError:true) new Contact(name:"Hijo", mobile:"34534534").save(failOnError:true) From cbb6f29d4b3712c0f08f2f8de49bf354759d591d Mon Sep 17 00:00:00 2001 From: ivermac Date: Mon, 25 Mar 2013 17:22:29 +0300 Subject: [PATCH 1156/2668] added exception --- .../src/groovy/frontlinesms2/MetaClassModifiers.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy index 25251ae23..c4d05b24a 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy @@ -19,7 +19,7 @@ class MetaClassModifiers { static def addTodoConstantToSpecifications() { try { Class.forName("spock.lang.Specification")?.metaClass.static.getTODO = { false } - } catch(Exception ex) { /* presumably we are in prod mode and spock is not on the classpath */ } + } catch(Exception ex) { ex.printStackTrace()/* presumably we are in prod mode and spock is not on the classpath */ } } static def addZipMethodToFile() { From c2ec4b3fb058ddc4e1c956af28cdb5fbacd302be Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 17:24:49 +0300 Subject: [PATCH 1157/2668] Removed unused methods. --- .../frontlinesms2/MessageController.groovy | 2 +- .../domain/frontlinesms2/Activity.groovy | 7 ------- .../domain/frontlinesms2/Contact.groovy | 3 +-- .../domain/frontlinesms2/Fmessage.groovy | 16 ++-------------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy index 52ce28cf2..ad3e1ad28 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/MessageController.groovy @@ -280,7 +280,7 @@ class MessageController extends ControllerUtils { checkedMessageCount: checkedMessageCount, activityInstanceList: Activity.findAllByArchivedAndDeleted(viewingArchive, false), folderInstanceList: Folder.findAllByArchivedAndDeleted(viewingArchive, false), - messageCount: Fmessage.countAllMessages(params), + messageCount: Fmessage.countAllMessages(), hasFailedMessages: Fmessage.hasFailedMessages(), failedDispatchCount: messageInstance?.hasFailed ? Dispatch.findAllByMessageAndStatus(messageInstance, DispatchStatus.FAILED).size() : 0] } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index 79410cd6b..f86088dc0 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -85,12 +85,5 @@ abstract class Activity extends MessageOwner { messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) this.processKeyword(messageInstance) } - - private def logFail(c, ex) { - ex.printStackTrace() - log.warn("Error creating routes of webconnection with id $c?.id", ex) - LogEntry.log("Error creating routes to webconnection with name ${c?.name?: c?.id}") - //createSystemNotification('connection.route.failNotification', [c.id, c?.name?:c?.id], ex) - } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy index e319f7994..f79de4bdf 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy @@ -24,8 +24,7 @@ class Contact { static mapping = { sort name:'asc' - customFields cascade: 'all' - customFields sort: 'name','value' + customFields cascade:'all', sort:['name', 'value'] } //> EVENT METHODS diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 12e946546..66ba8d009 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -261,14 +261,6 @@ class Fmessage { contactlist?contactlist:"" } - private boolean isMoveAllowed(){ - if(this.messageOwner){ - return !(this.messageOwner?.archived) - } else { - return (!this.isDeleted && !this.archived) - } - } - private def areAnyDispatches(status) { dispatches?.any { it.status == status } } @@ -297,12 +289,8 @@ class Fmessage { Fmessage.unread(owner).count() } - static def countAllMessages(params) { - def inboxCount = Fmessage.inbox.count() - def sentCount = Fmessage.sent.count() - def pendingCount = Fmessage.pending.count() - def deletedCount = Fmessage.deleted.count() - [inbox: inboxCount, sent: sentCount, pending: pendingCount, deleted: deletedCount] + static def countAllMessages() { + ['inbox', 'sent', 'pending', 'deleted'].collect { Fmessage[it].count() } } // TODO should this be in a service? From ee174ce0fcb8299a4747d1f81e17e8fb55f44341 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:25:08 +0300 Subject: [PATCH 1158/2668] Revert "CODENARC FIX Autoforward.groovy and Autoreply.groovy" This reverts commit 77eb5a3596d019fa28ca20a234e7c046c7579acf. --- .../grails-app/domain/frontlinesms2/Autoforward.groovy | 2 +- .../grails-app/domain/frontlinesms2/Autoreply.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy index f35f4f3cc..bd7f759fe 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoforward.groovy @@ -26,7 +26,7 @@ class Autoforward extends Activity { } //> PROCESS METHODS - def processKeyword(Fmessage message) { + def processKeyword(Fmessage message, Keyword matchedKeyword) { this.addToMessages(message) this.save(failOnError:true) if(addressesAvailable()){ diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy index c09fe79cb..6d8fafaef 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Autoreply.groovy @@ -21,7 +21,7 @@ class Autoreply extends Activity { def autoreplyService //> PROCESS METHODS - def processKeyword(Fmessage message) { + def processKeyword(Fmessage message, Keyword matchedKeyword) { this.addToMessages(message) autoreplyService.doReply(this, message) this.save(failOnError:true) From bb3ccdb3a139c9a65e9b4684899563cc09caaebc Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:26:16 +0300 Subject: [PATCH 1159/2668] Revert "CODENARC FIX in Activity.groovy" This reverts commit 47abc23782d42cd22aec3ecd9b277e0614cdf952. --- .../grails-app/domain/frontlinesms2/Activity.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy index 79410cd6b..fdf398c61 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Activity.groovy @@ -67,7 +67,7 @@ abstract class Activity extends MessageOwner { this.messages*.isDeleted = false } - def processKeyword(Fmessage message) { + def processKeyword(Fmessage message, Keyword match) { message.setMessageDetail(this, "") this.addToMessages(message) this.save(failOnError:true) @@ -83,7 +83,7 @@ abstract class Activity extends MessageOwner { def move(messageInstance) { messageInstance.messageOwner?.removeFromMessages(messageInstance)?.save(failOnError:true) - this.processKeyword(messageInstance) + this.processKeyword(messageInstance, null) } private def logFail(c, ex) { From 7c2753da2daf0e10d10bbc3b6c0fc3013f8df099 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Mon, 25 Mar 2013 17:27:24 +0300 Subject: [PATCH 1160/2668] Revert "added exception" - actually added printStackTrace unnecessarily. This reverts commit cbb6f29d4b3712c0f08f2f8de49bf354759d591d. --- .../src/groovy/frontlinesms2/MetaClassModifiers.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy index c4d05b24a..25251ae23 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/MetaClassModifiers.groovy @@ -19,7 +19,7 @@ class MetaClassModifiers { static def addTodoConstantToSpecifications() { try { Class.forName("spock.lang.Specification")?.metaClass.static.getTODO = { false } - } catch(Exception ex) { ex.printStackTrace()/* presumably we are in prod mode and spock is not on the classpath */ } + } catch(Exception ex) { /* presumably we are in prod mode and spock is not on the classpath */ } } static def addZipMethodToFile() { From 1aa40cb326ae8b2e5712f45c836a01c75d7bfb1a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 25 Mar 2013 17:31:25 +0300 Subject: [PATCH 1161/2668] CODENARC FIX on ForwardActionStep --- .../grails-app/domain/frontlinesms2/ForwardActionStep.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ForwardActionStep.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ForwardActionStep.groovy index 20fdb7b5c..a0ae9aca0 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ForwardActionStep.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ForwardActionStep.groovy @@ -58,8 +58,6 @@ class ForwardActionStep extends Step { } domainInstances - null } - - def setRecipients(groups, smartGroups, contacts, addresses) { } def process(Fmessage message) { autoforwardService.doForward(this, message) From b63a41d5cb40366232400d119eff2ddde8574f9b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 10:45:33 +0300 Subject: [PATCH 1162/2668] Updated indonesian translation. --- .../grails-app/i18n/messages_in_ID.properties | 425 +++++++++++++++--- 1 file changed, 356 insertions(+), 69 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties index 9e1483a09..e215b31d2 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_in_ID.properties @@ -1,4 +1,3 @@ -# FrontlineSMS English translation by the FrontlineSMS team, Nairobi language.name=Indonesian # General info @@ -14,7 +13,7 @@ action.prev=Sebelumnya action.back=Kembali action.create=Buat action.edit=Sunting -action.rename=Namai Ulang +action.rename=Ubah Nama action.save=Simpan action.save.all=Simpan Seluruhnya action.delete=Hapus @@ -24,23 +23,27 @@ action.export=Ekspor # Messages when FrontlineSMS server connection is lost server.connection.fail.title=Koneksi ke server telah terputus. -server.connection.fail.info=Silakan luncurkan ulang FrontlineSMS, atau tutup jendela ini. +server.connection.fail.info=Luncurkan ulang FrontlineSMS, atau tutup jendela ini. #Connections: connection.creation.failed=Tidak dapat melakukan koneksi {0} -connection.route.destroyed=Destroyed route dari {0} ke {1} +connection.route.destroyed=Putuskan route dari {0} ke {1} connection.route.connecting=Melakukan koneksi... connection.route.disconnecting=Memutus koneksi... -connection.route.successNotification=Berhasil menciptakan route di {0} -connection.route.failNotification=Gagal menciptakan route pada {1}: {2} [edit] +connection.route.successNotification=Berhasil membuat route di {0} +connection.route.failNotification=Gagal membuat route pada {1}: {2} [edit] connection.route.destroyNotification=Putuskan koneksi pada route {0} -connection.test.sent=Tes pesan berhasil terkirim ke to {0} lewat {1} +connection.test.sent=Tes pesan berhasil terkirim ke {0} lewat {1} + # Connection exception messages connection.error.org.smslib.alreadyconnectedexception=Piranti sudah terhubung -connection.error.org.smslib.gsmnetworkregistrationexception=Gagal untuk terhubung dengan jaringan GSM -connection.error.org.smslib.invalidpinexception=Memasukkan PIN yang salah +connection.error.org.smslib.gsmnetworkregistrationexception=Gagal terhubung dengan jaringan GSM +connection.error.org.smslib.invalidpinexception=PIN yang dimasukkan salah connection.error.org.smslib.nopinexception=Dibutuhkan PIN tetapi belum dimasukkan +connection.error.org.smslib.nosuchportexception=Port tidak ditemukan, atau tidak dapat diakses connection.error.java.io.ioexception=Terdapat kesalahan pada port: {0} +connection.error.serial.nosuchportexception=Port tidak ditemukan +connection.error.org.apache.camel.runtimecamelexception=Tidak dapat terhubung connection.header=Koneksi connection.list.none=Anda tidak memiliki jaringan yang terkonfigurasi @@ -49,24 +52,25 @@ connection.delete=Hapus Koneksi connection.deleted=Koneksi {0} sudah dihapus. connection.route.create=Buat route connection.add=Tambahkan koneksi baru -connection.createtest.message.label=Pesan -connection.route.destroy=Hancurkan route +connection.createtest.message.label=Buat tes pesan +connection.route.destroy=Putuskan route connection.send.test.message=Kirim tes pesan connection.test.message=Selamat dari FrontlineSMS \\o/ Anda sudah sukses terkonfigurasi dengan {0} untuk mengirim SMS \\o/ connection.validation.prompt=Harap mengisi seluruh informasi yang diperlukan connection.select=Pilih tipe koneksi connection.type=Pilih tipe -connection.details=Masukkan detail +connection.details=Masukkan rincian connection.confirm=Konfirmasi -connection.createtest.number=Nomor +connection.createtest.number=Buat nomor tes connection.confirm.header=Konfirmasi pengaturan -connection.name.autoconfigured=Auto-konfigurasi {0} {1} pada port {2}" +connection.name.autoconfigured=Konfigurasi otomatis {0} {1} pada port {2}" status.connection.header=Koneksi status.connection.none=Anda tidak punya koneksi yang terkonfigurasi status.devises.header=Piranti terdeteksi status.detect.modems=Mendeteksi modem -status.modems.none=Tidak ada piranti yang sudah terdeteksi. +status.modems.none=Tidak ada piranti yang sudah terdeteksi +status.header=Status connectionstatus.not_connected=Tidak terkoneksi connectionstatus.connecting=Sedang terkoneksi @@ -75,9 +79,9 @@ connectionstatus.connected=Sudah terkoneksi default.doesnt.match.message=Properti [{0}] dari [{1}] dengan [{2}] tidak cocok dengan pola yang disyaratkan [{3}] default.invalid.url.message=Properti [{0}] dari [{1}] dengan [{2}] bukan URL yang valid default.invalid.creditCard.message=Properti [{0}] dari [{1}] dengan [{2}] bukan nomor kartu kredit yang valid -default.invalid.email.message=Properti[{0}] dari [{1}] dengan [{2}] bukan alamat email yang valid -default.invalid.range.message=Properti[{0}] dari [{1}] dengan [{2}] tidak berada dalam rentang yang valid dari [{3}] sampai [{4}] -default.invalid.size.message= Properti[{0}] dari [{1}] dengan [{2}] tidak beradad dalam rentang ukuran yang valid dari [{3}] sampai [{4}] +default.invalid.email.message=Properti [{0}] dari [{1}] dengan [{2}] bukan alamat email yang valid +default.invalid.range.message=Properti [{0}] dari [{1}] dengan [{2}] tidak berada dalam rentang yang valid dari [{3}] sampai [{4}] +default.invalid.size.message= Properti [{0}] dari [{1}] dengan [{2}] tidak berada dalam rentang ukuran yang valid dari [{3}] sampai [{4}] default.invalid.max.message=Properti [{0}] dari [{1}] dengan [{2}] melebihi nilai maksimum [{3}] default.invalid.min.message=Properti [{0}] dari [{1}] dengan [{2}] kurang dari nilai minumum [{3}] default.invalid.max.size.message=Properti [{0}] dari [{1}] dengan [{2}] melebihi ukuran maksimum [{3}] @@ -111,9 +115,9 @@ default.update.failed=Gagal memperbarui {0} dengan id {1} default.updated.multiple= {0} sudah diperbarui default.updated.message={0} diperbarui default.deleted={0} dihapus -default.trashed={0} pindahkan ke tempat sampah +default.trashed={0} dibuang default.trashed.multiple={0} pindah ke tempat sampah -default.archived={0} diarsipkan +default.archived={0} berhasil diarsipkan! default.unarchived={0} membuka arsip default.unarchive.keyword.failed=Membuka arsip {0} gagal. Kata kunci sudah digunakan default.unarchived.multiple={0} membuka arsip @@ -165,15 +169,19 @@ default.search.moreoption.label=Pilihan lainnya smslibfconnection.label=Telepon/Modem smslibfconnection.type.label=Tipe smslibfconnection.name.label=Nama +smslibfconnection.manufacturer.label=Perusahaan +smslibfconnection.model.label=Model smslibfconnection.port.label=Port smslibfconnection.baud.label=Baud rate smslibfconnection.pin.label=PIN smslibfconnection.imsi.label=SIM IMSI smslibfconnection.serial.label=Serial Piranti # -smslibfconnection.send.label=Gunakan modem HANYA untuk megirim Pesan -smslibfconnection.receive.label =Gunakan modem HANYA untuk menerima Pesan +smslibfconnection.send.label=Gunakan modem HANYA untuk mengirim Pesan +smslibfconnection.receive.label=Gunakan modem HANYA untuk menerima Pesan smslibFconnection.send.validator.error.send=Modem seharusnya digunakan untuk mengirim smslibFconnection.receive.validator.error.receive=atau menerima pesan +smslibfconnection.description=Sambungkan ke USB, serial, modem bluetooth atau telepon +smslibfconnection.global.info=FrontlineSMS akan melakukan konfigurasi secara otomatis dengan sambungan modem atau telepon, tetapi anda bisa mengatur konfigurasi secara manual disini # Email Fconnection emailfconnection.label=Email @@ -181,7 +189,7 @@ emailfconnection.type.label=Tipe emailfconnection.name.label=Nama emailfconnection.receiveProtocol.label=Protokol emailfconnection.serverName.label=Nama Server -emailfconnection.serverPort.label=Server Port +emailfconnection.serverPort.label=Port Server emailfconnection.username.label=Nama Pengguna emailfconnection.password.label=Kata Sandi @@ -192,31 +200,54 @@ clickatellfconnection.name.label=Nama clickatellfconnection.apiId.label=API ID clickatellfconnection.username.label=Nama Pengguna clickatellfconnection.password.label=Kata sandi +clickatellfconnection.sendToUsa.label=Kirim ke AS +clickatellfconnection.fromNumber.label=Dari Nomor +clickatellfconnection.description=Kirim dan terima pesan melalui akun Clickatell +clickatellfconnection.global.info=Anda harus mengatur konfigurasi dengan akun Clickatell (www.clickatell.com). +clickatellFconnection.fromNumber.validator.invalid= Dibutuhkan 'Nomor Dari' untuk mengirimkan pesan ke Amerika Serikat + +# Smssync Fconnection +smssyncfconnection.label=SMSSync +smssyncfconnection.name.label=Nama +smssyncfconnection.type.label=Tipe +smssyncfconnection.receiveEnabled.label=Fungsi menerima diaktifkan +smssyncfconnection.sendEnabled.label=Fungsi mengirim diaktifkan +smssyncfconnection.secret.label=Rahasia +smssyncfconnection.description=Gunakan HP Android yang sudah terinstal dengan app SMSSync untuk mengirim dan menerima SMS dengan FrontlineSMS +smssyncfconnection.field.secret.info=Di app anda, atur 'rahasia' sesuai dengan kolom ini +smssyncfconnection.global.info=Unduh app SMSSync dari smssync.ushahidi.com # Messages Tab message.create.prompt=Masukkan pesan message.character.count=Tersisa karakter {0} ({1} pesan SMS message.character.count.warning=Bisa lebih panjang setelah melakukan pertukaran +message.header.inbox=Kotak pesan +message.header.sent=Terkirim +message.header.pending=Tertunda +message.header.trash=Tempat sampah +message.header.folder=Folder +message.header.activityList=DaftarAktivitas +message.header.folderList=DaftarFolder announcement.label=Pengumuman announcement.description=Kirim pesan pengumuman dan mengatur balasan announcement.info1=Pengumuman sudah disimpan dan pesan sudah ditambahkan ke antrian pesan -announcement.info2= Akan memakan waktu beberapa lama untuk mengirikan pesan-pesan ini, tergantung pada jumlah pesan dan jaringan koneksi. +announcement.info2= Akan memakan waktu beberapa lama untuk mengirimkan pesan-pesan ini, tergantung pada jumlah pesan dan jaringan koneksi. announcement.info3=Untuk melihat status pesan Anda, buka folder pesan "Tertunda" -announcement.info4=Untuk melihat pengumuman, klik saja di menu sebelah kiri +announcement.info4=Untuk melihat pengumuman, klik menu di sebelah kiri announcement.validation.prompt=Silakan mengisi semua keterangan yang disyaratkan announcement.select.recipients=Pilih penerima announcement.confirm=Konfirmasi -announcement.delete.warn=Menghapus {0} PERINGATAN: Anda tidak bisa membatalkan ini! +announcement.delete.warn=Menghapus {0} PERINGATAN: Anda tidak bisa membatalkan! announcement.prompt=Beri nama pengumuman ini announcement.confirm.message=Pesan -announcement.details.label=Konfirmasi detail +announcement.details.label=Konfirmasi rincian announcement.message.label=Pesan announcement.message.none=tidak ada announcement.recipients.label=Penerima announcement.create.message=Buat pesan #TODO embed javascript values announcement.recipients.count=Kontak dipilih -announcement.messages.count=pesan akan dikirimkan +announcement.messages.count=Pesan akan dikirimkan announcement.moreactions.delete=Hapus pengumuman announcement.moreactions.rename=Ubah nama pengumuman announcement.moreactions.edit=Sunting pengumuman @@ -224,7 +255,7 @@ announcement.moreactions.export=Ekspor pengumuman frontlinesms2.Announcement.name.unique.error.frontlinesms2.Announcement.name={1} {0} "{2}" harus unik -archive.inbox=Arsip kotak pesan +archive.inbox=Arsip pesan masuk archive.sent=Arsip terkirim archive.activity=Arsip aktivitas archive.folder=Arsip folder @@ -237,8 +268,12 @@ archive.activity.type=Tipe archive.activity.date=Tanggal archive.activity.messages=Pesan archive.activity.list.none=  Tidak ada aktivitas terarsipkan +archive.header=Arsip + autoreply.enter.keyword=Masukkan kata kunci autoreply.create.message=Masukkan pesan +activity.autoreply.sort.description=Jika pengunjung mengirimkan pesan diawali dengan kata kunci tertentu, FrontlineSMS dapat memprosesnya secara otomatis di dalam sistem anda. +activity.autoreply.disable.sorting.description=Pesan tidak akan dipindahkan secara otomatis ke dalam aktivitas ini dan dibalas autoreply.confirm=Konfirmasi autoreply.name.label=Pesan autoreply.details.label=Konfirmasi detail @@ -247,7 +282,7 @@ autoreply.keyword.label=Kata kunci autoreply.description=Membalas pesan yang masuk secara otomatis autoreply.info= Balasan pesan secara otomatis sudah dibuat, semua pesan yang mengandung kata kunci Anda akan ditambahkan ke dalam aktivitas balasan otomatis ini yang dapat Anda lihat dengan meng-klik di menu sebelah kanan autoreply.info.warning=Balasan otomatis tanpa kata kunci akan dikirimkan ke semua pesan yang masuk -autoreply.info.note=Catatan: Jika Anda mengarsipkan balasan otomatis, pesan yang masuk tidak akan lagi disortir untuk itu +autoreply.info.note=Catatan: Jika Anda mengarsipkan balasan otomatis, pesan yang masuk tidak akan disortir lagi untuk itu autoreply.validation.prompt=Harap isi semua keterangan yang disyaratkan autoreply.message.title=Pesan untuk dikirimkan kembali bagi balasan otomatis ini: autoreply.keyword.title=Sortir pesan secara otomatis menggunakan Kata Kunci: @@ -264,9 +299,35 @@ frontlinesms2.Autoreply.name.validator.error.frontlinesms2.Autoreply.name=Nama b frontlinesms2.Keyword.value.validator.error.frontlinesms2.Autoreply.keyword.value=Keyword "{2}" sudah digunakan frontlinesms2.Autoreply.autoreplyText.nullable.error.frontlinesms2.Autoreply.autoreplyText=Pesan tidak dapat dikosongkan +autoforward.title={0} teruskan otomatis +autoforward.label=Teruskan Otomatis +autoforward.description=Pesan masuk akan diteruskan secara otomatis ke kontak +autoforward.recipientcount.current=Saat ini {0} penerima +autoforward.create.message=Masukkan pesan +autoforward.confirm=Konfirmasi +autoforward.recipients=Penerima +autoforward.name.prompt=Nama Teruskan Otomatis ini +autoforward.details.label=Rincian konfirmasi +autoforward.keyword.label=Kata kunci +autoforward.name.label=Pesan +autoforward.contacts=Kontak +autoforward.groups=Grup +autoforward.info= Teruskan Otomatis sudah dibuat, setiap pesan mengandung kata kunci akan dimasukkan ke aktivitas ini. Silahkan klik kanan di menu untuk melihatnya. +autoforward.info.warning= Apabila Teruskan Otomatis tidak menggunakan kata kunci maka semua pesan masuk akan diteruskan. +autoforward.info.note=Catatan: Jika anda mengarsipkan Teruskan Otomatis, pesan masuk tidak akan disortir lagi. +autoforward.save=Teruskan Otomatis sudah disimpan! +autoforward.save.success=Meneruskan Otomatis sudah disimpan! +autoforward.global.keyword=Tidak ada (semua pesan masuk akan diproses) +autoforward.disabled.keyword=Tidak ada (sortir otomatis dimatikan) +autoforward.keyword.none.generic=Tidak ada +autoforward.groups.none=Tidak ada +autoforward.contacts.none=Tidak ada +autoforward.message.format=Pesan + contact.new=Kontak Baru contact.list.no.contact=Tidak ada kontak di sini! contact.header=Kontak +contact.header.group=Kontak >> {0} contact.all.contacts=Semua kontak contact.create=Buat kontak baru contact.groups.header=Grup @@ -278,16 +339,20 @@ contact.remove.from.group=Keluarkan dari grup contact.customfield.addmoreinformation=Tambahkan informasi... contact.customfield.option.createnew=Buat ... baru contact.name.label=Nama -contact.phonenumber.label=Mobile +contact.phonenumber.label=Nomor telepon contact.phonenumber.international.warning=Nomor ini tidak dalam format internasional. Ini mungkin menyebabkan kesulitan menyampaikan pesan kepada kontak. contact.notes.label=Catatan contact.email.label=Email contact.groups.label=Grup contact.notinanygroup.label=Bukan bagian dari grup manapun contact.messages.label=Pesan -contact.messages.sent={0} pesan terkirim +contact.sent.messages={0} pesan terkirim contact.received.messages={0} pesan diterima contact.search.messages=Cari pesan +contact.select.all=Pilih semua +contact.not.found=Kontak tidak ditemukan +group.not.found=Grup tidak ditemukan +smartgroup.not.found=Grup Pintar tidak ditemukan group.rename=Ubah nama grup group.edit=Sunting grup @@ -295,6 +360,7 @@ group.delete=Hapus grup group.moreactions=Lainnya... customfield.validation.prompt=Harap masukkan sebuah nama +customfield.validation.error=Nama sudah dipakai customfield.name.label=Nama export.contact.info=Untuk mengekspor kontak dari FrontlineSMS, pilih tipe ekspor dan informasi yang perlu disertakan dalam data yang diekspor export.message.info=Untuk mengekspor pesan dari FrontlineSMS, pilih tipe ekspor dan informasi yang perlu disertakan dalam data yang diekspor @@ -302,13 +368,13 @@ export.selectformat=Pilih format output export.csv=Format CSV untuk digunakan pada tabel export.pdf=Format PDF untuk dicetak folder.name.label=Nama -group.delete.prompt=Anda yakin akan menghapus {0}? PERINGATAN: Hal ini tidak dapat dibatalkan +group.delete.prompt=Anda yakin akan menghapus {0}? PERINGATAN: Langkah ini tidak dapat dibatalkan layout.settings.header=Pengaturan activities.header=Aktivitas activities.create=Buat aktivitas baru folder.header=Folder folder.create=Buat folder baru -folder.label=folder +folder.label=Folder message.folder.header={0} Folder fmessage.trash.actions=Tempat sampah... fmessage.trash.empty=Kosongkan tempat sampah @@ -318,22 +384,38 @@ fmessage.responses.total={0} total balasan fmessage.label=Pesan fmessage.label.multiple={0} pesan poll.prompt=Beri nama poll ini -poll.details.label=Konfirmasikan detail +poll.details.label=Konfirmasikan rincian poll.message.label=Pesan poll.choice.validation.error.deleting.response=Pilihan yang disimpan tidak bisa kosong poll.alias=Alias +poll.keywords=Kata kunci poll.aliases.prompt=Masukkan alias dari pilihan korespondensi -poll.aliases.prompt.details=Anda dapat memasukkan beberapa alias untuk setiap pilihan, dipisahkan dengan koma. Alias yang pertama akan dikirimkan di pesan instruksi poll -poll.alias.validation.error=Alias harus unik +poll.keywords.prompt.details=Kata kunci terpopuler akan digunakan untuk menamai poll dan disertakan di dalam instruksi pesan poll. Setiap respon bisa memiliki kata kunci alternatif. +poll.keywords.prompt.more.details=Anda boleh memasukkan beberapa kata kunci terpopuler dipisahkan dengan tanda koma serta balasannya. Jika kata kunci terpopuler dikosongkan, maka kata kunci balasan harus unik disemua aktivitas. +poll.keywords.response.label=Kata kunci balasan +poll.response.keyword=Masukkan kaca kunci balasan +poll.set.keyword=Masukkan kata kunci terpopuler +poll.keywords.validation.error=Kata kunci harus unik poll.sort.label=Sortir secara otomatis poll.autosort.no.description=Pesan tidak akan disortir secara otomatis poll.autosort.description=Sortir pesan berdasarkan kata kunci poll.sort.keyword=kata kunci +poll.sort.toplevel.keyword.label=Kata kunci terpopuler (pilihan) poll.sort.by=Urutkan berdasarkan poll.autoreply.label=Balasan otomatis -poll.autoreply.none=tidak ada +poll.autoreply.none=Tidak ada poll.recipients.label=Penerima poll.recipients.none=Tidak ada +poll.toplevelkeyword=Kata kunci terpopuler +poll.sort.example.toplevel=contoh TIM +poll.sort.example.keywords.A=contoh A, AMAZING +poll.sort.example.keywords.B=contoh B, BEAUTIFUL +poll.sort.example.keywords.C=contoh C, COURAGEOUS +poll.sort.example.keywords.D=contoh D, DELIGHTFUL +poll.sort.example.keywords.E=contoh E, EXEMPLARY +poll.sort.example.keywords.yn.A=contoh YES, YAP +poll.sort.example.keywords.yn.B=contoh No, NOP + #TODO embed javascript values poll.recipients.count=kontak dipilih poll.messages.count=pesan akan dikirimkan @@ -352,6 +434,11 @@ poll.moreactions.rename=Ubah nama poll poll.moreactions.edit=Sunting poll poll.moreactions.export=Ekspor poll +folder.moreactions.delete=Hapus folder +folder.moreactions.rename=Ubah nama folder +folder.moreactions.export=Ekspor folder + + #TODO embed javascript values poll.reply.text=Balas dengan "{0}" untuk Ya, "{1}" untuk Tidak. poll.reply.text1={0} "{1}" untuk {2} @@ -360,7 +447,7 @@ poll.reply.text3= atau poll.reply.text5=Balas poll.reply.text6=Tolong jawab poll.message.send={0} {1} -poll.recipients.validation.error=Pilih kontak yang hendak dikirimkan pesan +poll.recipients.validation.error=Pilih kontak yang hendak dikirimi pesan frontlinesms2.Poll.name.unique.error.frontlinesms2.Poll.name = {1} {0} "{2}" harus unik frontlinesms2.Poll.responses.validator.error.frontlinesms2.Poll.responses=Pilihan balasan tidak bisa sama persis frontlinesms2.Keyword.value.validator.error.frontlinesms2.Poll.keyword.value = Kata kunci "{2}" sudah digunakan @@ -401,6 +488,7 @@ wizard.send=Kirim common.settings=Pengaturan common.help=Bantuan +validation.nospaces.error=Kata kunci tidak boleh menggunakan spasi activity.validation.prompt=Harap isi semua keterangan yang disyaratkan autoreply.blank.keyword=Kata kunci kosong. Balasan akan dikirimkan ke semua pesan yang masuk @@ -415,13 +503,14 @@ poll.replies.description=Ketika pesan masuk diidentifikasi sebagai respon dari p poll.autoreply.send=Kirim balasan otomatis kepada mereka yang mengirim respon poll poll.responses.prompt=Masukkan balasan yang memungkinkan (antara 2 dan 5) poll.sort.header=Sortir pesan secara otomatis menggunakan Kata Kunci (tidak wajib) +poll.sort.enter.keywords=Masukkan kata kunci untuk poll dan jawabannya poll.sort.description=Jika seseorang mengirimkan respon poll menggunakan Kata Kunci, FrontlineSMS dapat menyortir pesan itu secara otomatis pada sistem Anda poll.no.automatic.sort=Jangan menyortir pesan secara otomatis poll.sort.automatically=Sortir pesan yang memiliki Kata Kunci berikut ini secara otomatis poll.validation.prompt=Harap isi semua keterangan yang disyaratkan poll.name.validator.error.name=Nama poll harus unik pollResponse.value.blank.value=Balasan poll tidak bisa dikosongkan -poll.alias.validation.error.invalid.alias=Alias tidak valid. Coba masukkan nama atau kata. +poll.keywords.validation.error.invalid.keyword=Kata kunci salah. Coba masukkan sebuah, nama, kata poll.question=Masukkan Pertanyaan poll.response=Daftar balasan poll.sort=Penyortiran otomatis @@ -430,11 +519,12 @@ poll.edit.message=Sunting Pesan poll.recipients=Pilih penerima poll.confirm=Konfirmasi poll.save=Poll sudah disimpan! +poll.save.success={0} Poll telah disimpan poll.messages.queue=Jika Anda memutuskan mengirim pesan dengan poll ini, pesan sudah ditambahkan ke antrian pesan. poll.messages.queue.status=Akan memakan waktu beberapa lama bagi pesan untuk terkirim, tergantung jumlah pesan dan koneksi jaringan. poll.pending.messages=Untuk melihat status pesan Anda, buka folder pesan 'Tertunda' poll.send.messages.none=Tidak ada pesan yang akan dikirimkan -quickmessage.details.label=Konfirmasi detail +quickmessage.details.label=Konfirmasi rincian quickmessage.message.label=Pesan quickmessage.message.none=Tidak ada quickmessage.recipient.label=Penerima @@ -520,7 +610,7 @@ tab.search=Cari help.info=Ini adalah versi beta sehingga tidak ada keterangan pertolongan di sini. Silakan menuju forum pengguna untuk mendapatkan pertolongan pada tahap ini. # IntelliSms Fconnection -intellismsfconnection.label=Akun IntelliSms +intellismsfconnection.label=Akun Intellisms intellismsfconnection.type.label=Tipe intellismsfconnection.name.label=Nama intellismsfconnection.username.label=Nama Pengguna @@ -533,6 +623,10 @@ intellismsfconnection.serverName.label=Nama Server intellismsfconnection.serverPort.label=Server Port intellismsfconnection.emailUserName.label=Nama Pengguna intellismsfconnection.emailPassword.label=Kata Sandi +intellismsfconnection.description=Kirim dan terima pesan melalui akun Intellisms +intellismsfconnection.global.info=Anda harus mengonfigurasi akun dengan Intellisms (www.intellisms.co.uk). +intelliSmsFconnection.send.validator.invalid =Anda tidak dapat mengonfigurasi koneksi tanpa fungsi KIRIM dan TERIMA +intelliSmsFconnection.receive.validator.invalid =Anda tidak bisa mengonfigurasi koneksi tanda fungsi KIRIM atau TERIMA #Controllers contact.label=Kontak @@ -549,8 +643,10 @@ fconnection.unknown.type=Tipe koneksi tidak dikenali: fconnection.test.message.sent=Tes pesan terkirim! announcement.saved=Pengumuman sudah disimpan dan pesan sudah dalam antrian untuk dikirim announcement.not.saved=Pengumuman tidak dapat disimpan! +announcement.save.success={0} Pengumuman telah disimpan! announcement.id.exist.not=Tidak dapat menemukan pengumuman dengan id {0} -autoreply.saved=Balasan otomatis sudah disimpan! + +autoreply.save.success={0} Balasan otomatis telah disimpan! autoreply.not.saved=Balasan otomatis tidak dapat disimpan! report.creation.error=Ada kesalahan dalam membuat laporan export.message.title=Ekspor Pesan FrontlineSMS @@ -572,13 +668,13 @@ export.messages.name2={0} ({1} pesan) export.contacts.name1={0} grup ({1} kontak) export.contacts.name2={0} grup pintar ({1} kontak) export.contacts.name3=Semua kontak ({0} kontak) -folder.label=Folder +folder.label=folder folder.archived.successfully=Folder berhasil diarsipkan! folder.unarchived.successfully=Folder berhasil dibuka! folder.trashed=Folder sudah dibuang ke tempat sampah! folder.restored=Folder sudah dikembalikan! folder.exist.not=Tidak dapat menemukan folder dengan id {0} -folder.renamed=Folder Sudah Diubah Namanya +folder.renamed=Nama Folder Sudah Diubah group.label=Grup group.name.label=Nama @@ -589,15 +685,15 @@ group.delete.fail=Tidak bisa menghapus grup import.label=Impor import.backup.label=Impor data dari cadangan sebelumnya import.prompt.type=Pilih tipe data yang akan diimpor -import.contacts=Detail kontak -import.messages=Detail pesan +import.contacts=Rincian kontak +import.messages=Rincian pesan import.version1.info=Untuk mengimpor data untuk versi 1, harap ekspor dalam bahasa Inggris -import.prompt=Pilih file data yang akan diimpor -import.upload.failed=Gagal mengunggah file karena satu dan lain hal +import.prompt=Pilih berkas data yang akan diimpor +import.upload.failed=Gagal mengunggah berkas karena satu dan lain hal import.contact.save.error=Menemukan kesalahan dalam menyimpan kontak import.contact.complete={0} kontak sudah diimpor; {1} gagal import.contact.failed.download=Unduh kontak yang gagal (CSV) -import.message.save.error=enemukan kesalahan dalam menyimpan pesan +import.message.save.error=Menemukan kesalahan dalam menyimpan pesan import.message.complete={0} pesan sudah diimpor; {1} gagal many.selected = {0} {1} dipilih @@ -610,7 +706,7 @@ flash.message.fmessages.many={0} pesan SMS flash.message.fmessages.many.one=1 pesan SMS fmessage.exist.not=Tidak dapat menemukan pesan dengan id {0} flash.message.poll.queued=Poll sudah disimpan dan pesan sudah berada dalam antrian untuk dikirim -flash.message.poll.saved=Poll sudah disimpan + flash.message.poll.not.saved=Poll tidak bisa disimpan! system.notification.ok=OK system.notification.fail=GAGAL @@ -620,7 +716,7 @@ flash.smartgroup.save.failed=Gagal menyimpan Grup Pintar. Kesalahan {0} smartgroup.id.exist.not=Tidak dapat menemukan Grup Pintar dengan id {0} smartgroup.save.failed=Gagal menyimpan grup pintar {0}dengan parameter {1}{2}kesalahan: {3} contact.name.label=Nama -contact.phonenumber.label=Nomor telepon +contact.phonenumber.label=Nomor Telepon searchdescriptor.searching=Mencari searchdescriptor.all.messages= semua pesan @@ -637,12 +733,27 @@ folder.title={0} folder frontlinesms.welcome=Selamat datang di FrontlineSMS! \\o/ failed.pending.fmessages={0} pesan tertunda gagal. Pergi ke pesan tertunda untuk melihat. +subscription.title={0} berlangganan +subscription.info.group=Grup: {0} +subscription.info.groupMemberCount={0} anggota +subscription.info.keyword=Kata kunci terpopuler: {0} +subscription.sorting.disable=Matikan fungsi sortir otomatis +subscription.info.joinKeywords=Bergabung: {} +subscription.info.leaveKeywords=Keluar: {0} +subscription.group.goto=Tampilkan Grup +subscription.group.required.error=Berlangganan harus mempunyai sebuah grup +subscription.save.success={0} Berlangganan telah tersimpan! + language.label=Bahasa language.prompt=Ganti bahasa FrontlineSMS di halaman muka pengguna frontlinesms.user.support=Pertolongan Pengguna FrontlineSMS -download.logs.info1=WARNING: Tim FrontlineSMS tidak bisa langsung menjawab log yang didaftarkan. Jika Anda punya permintaan pertolongan bagi pengguna, silakan klik file "Pertolongan" untuk melihat apakah Anda bisa menemukan jawabannya di sana. Jika tidak, laporkan permasalahan Anda lewat forum pertolongan pengguna kami: +download.logs.info1=WARNING: Tim FrontlineSMS tidak bisa langsung menjawab log yang didaftarkan. Jika Anda punya permintaan pertolongan bagi pengguna, silakan klik berkas "Pertolongan" untuk melihat apakah Anda bisa menemukan jawabannya di sana. Jika tidak, laporkan permasalahan Anda lewat forum pertolongan pengguna kami: download.logs.info2=Pengguna lain mungkin sudah melaporkan permasalahan yang sama dan mendapatkan solusinya! Untuk melanjutkan dan memasukkan pertanyaan Anda, silakan klik 'Lanjutkan' +# Configuration location info +configuration.location.title=Konfigurasi Lokasi +configuration.location.instructions=Anda bisa melihat konfigurasi aplikasi anda di {1}. Di dalam berkas ini terdapat basis data dan konfigurasi lainnya, silahkan anda salin untuk cadangan. + dynamicfield.contact_name.label=Nama Kontak dynamicfield.contact_number.label=Nomor Kontak dynamicfield.keyword.label=Kata Kunci @@ -671,6 +782,8 @@ fmessage.footer.show=Perlihatkan fmessage.footer.show.failed=Gagal fmessage.footer.show.all=Semua fmessage.footer.show.starred=Ditandai +fmessage.footer.show.incoming=Masuk +fmessage.footer.show.outgoing=Keluar fmessage.archive.back=Kembali fmessage.activity.sentmessage=({0} pesan terkirim fmessage.failed=gagal @@ -684,8 +797,8 @@ fmessage.resend=Kirim ulang fmessage.retry=Coba lagi fmessage.reply=Balas fmessage.forward=Forward -fmessage.unarchive=Buka Arsip -fmessage.delete=Hapus +fmessage.unarchive=Buka Arsip {0} +fmessage.delete=Hapus {0} fmessage.messages.none=Tidak ada pesan di sini! fmessage.selected.none=Tidak ada pesan dipilih fmessage.move.to.header=Pindahkan pesan ke... @@ -710,6 +823,8 @@ fmessage.hidepolldetails=Sembunyikan grafik fmessage.search.none=Tidak ada pesan ditemukan. fmessage.search.description=Mulai pencarian baru di sebelah kiri +fmessage.connection.receivedon=Diterima pada: + activity.name=Nama activity.delete.prompt=Pindahkan {0} ke tempat sampah. Ini akan memindahkan seluruh pesan yang terkait ke tempat sampah. activity.label=Aktivitas @@ -731,20 +846,192 @@ group.name.validator.error=Nama grup sudah dipakai #Jquery Validation messages jquery.validation.required=Data ini wajib diisi. -jquery.validation.remote=Silakan membenarkan data ini. +jquery.validation.remote=Silahkan membenarkan data ini. jquery.validation.email=Tolong masukkan alamat email yang valid. -jquery.validation.url=Silakan masukkan URL yang valid. -jquery.validation.date=Silakan masukkan tanggal yang valid. -jquery.validation.dateISO=Silakan masukkan tanggal yang valid (ISO). -jquery.validation.number=Silakan masukkan angka yang valid. +jquery.validation.url=Silahkan masukkan URL yang valid. +jquery.validation.date=Silahkan masukkan tanggal yang valid. +jquery.validation.dateISO=Silahkan masukkan tanggal yang valid (ISO). +jquery.validation.number=Silahkan masukkan angka yang valid. jquery.validation.digits=Harap hanya memasukkan angka. -jquery.validation.creditcard=Silakan masukkan nomor kartu kredit yang valid. -jquery.validation.equalto=Silakan masukkan angka yang sama kembali. -jquery.validation.accept=Please enter a value with a valid extension. -jquery.validation.maxlength=Silakan masukkan tidal lebih dari {0} karakter. -jquery.validation.minlength=Silakan masukkan sedikitnya {0} karakter. -jquery.validation.rangelength=Silakan masukkan angka antara {0} dan {1} karakter. -jquery.validation.range=Silakan masukkan angka antara {0} dan {1}. -jquery.validation.max=Silakan masukkan angka yang kurang dari atau sama dengan {0}. -jquery.validation.min=Silakan masukkan angka yang lebih besar atau sama dengan {0}. +jquery.validation.creditcard=Silahkan masukkan nomor kartu kredit yang valid. +jquery.validation.equalto=Silahkan masukkan angka yang sama kembali. +jquery.validation.accept=Silahkan masukkan nilai dengan ekstensi yang valid. +jquery.validation.maxlength=Silahkan masukkan tidak lebih dari {0} karakter. +jquery.validation.minlength=Silahkan masukkan sedikitnya {0} karakter. +jquery.validation.rangelength=Silahkan masukkan angka antara {0} dan {1} karakter. +jquery.validation.range=Silahkan masukkan angka antara {0} dan {1}. +jquery.validation.max=Silahkan masukkan angka yang kurang dari atau sama dengan {0}. +jquery.validation.min=Silahkan masukkan angka yang lebih besar atau sama dengan {0}. + +# Webconnection common +webconnection.select.type=Pilih Web Servis atau aplikasi untuk koneksi ke: +webconnection.type=Pilih Tipe +webconnection.title={0} koneksi web +webconnection.label=Koneksi Web +webconnection.description=Koneksi ke web servis +webconnection.sorting=Sortir otomatis +webconnection.configure=Konfigurasi servis +webconnection.api=Tampilkan API +webconnection.api.info=FrontlineSMS bisa dikonfigurasi untuk menerima permintaan dari remote servis dan mengirimkan pesan keluar. Informasi selengkapnya, lihat di bantuan bagian Koneksi Web. +webconnection.api.enable.label=Aktifkan API +webconnection.api.secret.label=PIN API +webconnection.api.disabled=API dimatikan +webconnection.api.url=URL API + +# Webconnection - generic +webconnection.generic.label=Web servis lain +webconnection.generic.description=Kirim pesan ke web servis lain +webconnection.generic.subtitle=HTTP Koneksi Web + +# Webconnection - Ushahidi/Crowdmap +webconnection.ushahidi.label=Crowdmap / Ushahidi +webconnection.ushahidi.description=Kirim pesan ke server Crowdmap atau Ushahidi. +webconnection.ushahidi.key.description=PIN API untuk Crowdmap atau Ushahidi bisa ditemukan di bagian Pengaturan pada situs Crowdmap atau Ushahidi. +webconnection.ushahidi.url.label=Alamat penempatan Ushahidi: +webconnection.ushahidi.key.label=PIN API Ushahidi: +webconnection.crowdmap.url.label=Alamat penempatan Crowdmap: +webconnection.crowdmap.key.label=PIN API Crowdmap: +webconnection.ushahidi.serviceType.label=Pilih servis +webconnection.ushahidi.serviceType.crowdmap=Crowdmap +webconnection.ushahidi.serviceType.ushahidi=Ushahidi +webconnection.crowdmap.url.suffix.label=.crowdmap.com +webconnection.ushahidi.subtitle=Koneksi Web ke {0} +webconnection.ushahidi.service.label=Servis: +webconnection.ushahidi.url.label=Alamat: +webconnection.ushahidi.fsmskey.label=PIN API FrontlineSMS: +webconnection.ushahidi.crowdmapkey.label=PIN Crowdmap/Ushahidi: +webconnection.ushahidi.keyword.label=Kata kunci: +webconnection.api.disabled=API Dimatikan +frontlinesms2.GenericWebconnection.url.validator.error=Alamat URL tidak valid (harus diawali dengan http:// atau https://) +frontlinesms2.UshahidiWebconnection.url.validator.error=URL tidak valid (harus diawali dengan http:// atau https://) + +webconnection.confirm=Konfirmasi +webconnection.keyword.title=Pindahkan setiap pesan masuk yang mengandung kata kunci berikut: +webconnection.all.messages=Jangan menggunakan kata kunci (Semua pesan masuk akan diteruskan ulang ke Koneksi web ini) +webconnection.httpMethod.label=Pilih Metode HTTP: +webconnection.httpMethod.get=GET +webconnection.httpMethod.post=POST +webconnection.name.prompt=Namai koneksi web ini +webconnection.details.label=Rincian konfirmasi +webconnection.parameters=Informasi konfigurasi telah dikirimkan ke server +webconnection.parameters.confirm=Informasi yang terkonfigurasi telah dikirimkan ke server +webconnection.keyword.label=Kata kunci: +webconnection.none.label=Tidak ada +webconnection.url.label=Url Server: +webconnection.param.name=Nama: +webconnection.param.value=Nilai: +webconnection.add.anotherparam=Masukkan parameter + +dynamicfield.message_body.label=Pesan Teks +dynamicfield.message_body_with_keyword.label=Pesan Teks dengan kata kunci +dynamicfield.message_src_number.label=Nomor kontak +dynamicfield.message_src_name.label=Nama kontak +dynamicfield.message_timestamp.label=Format waktu Pesan + +webconnection.keyword.validation.error=Kata kunci wajib diisi +webconnection.url.validation.error=Url wajib diisi + +webconnection.save=Koneksi Web berhasil disimpan! +webconnection.saved=Koneksi Web telah disimpan! +webconnection.save.success={0} Koneksi Web berhasil disimpan! + +webconnection.generic.service.label=Servis: +webconnection.generic.httpMethod.label=Metode http: +webconnection.generic.url.label=Alamat: +webconnection.generic.keyword.label=Sortir-otomatis: +webconnection.generic.parameters.label=Informasi konfigurasi berhasil dikirim ke server: +webconnection.generic.keyword.label=Kata kunci: +webconnection.generic.key.label=PIN API: +frontlinesms2.Keyword.value.validator.error.frontlinesms2.UshahidiWebconnection.keyword.value=Nilai kata kunci tidak valid + +#Subscription i18n +subscription.label=Berlangganan +subscription.name.prompt=Beri nama Berlangganan ini +subscription.details.label=Rincian konfirmasi +subscription.description=Ijinkan pengunjung untuk bergabung dan keluar dari grup secara otomatis dengan mengirimkan pesan memakai kata kunci +subscription.select.group=Pilih grup untuk berlangganan +subscription.group.none.selected=Pilih grup +subscription.autoreplies=Balasan otomatis +subscription.sorting=Sortir otomatis +subscription.sorting.header=Proses pesan secara otomatis menggunakan kata kunci (pilihan) +subscription.confirm=Konfirmasi +subscription.group.header=Pilih Grup +subscription.group.description=Kontak bisa ditambahkan atau dihapus dari grup secara otomatis ketika FrontlineSMS menerima pesan dengan kata kunci tertentu. +subscription.top.keyword.description=Masukkan kata kunci terpopuler yang akan dipakai pengguna untuk memilih grup ini +subscription.top.keyword.more.description=Anda boleh memasukkan kata kunci terpopuler untuk setiap pilihan, dipisahkan dengan tanda koma. Kata kunci terpopuler ini harus unik untuk semua aktivitas. +subscription.keywords.header=Masukkan kata kunci untuk bergabung atau berhenti dari grup ini. +subscription.keywords.description=Anda boleh memasukkan beberapa kata kunci dipisahkan dengan koma. Jika kata kunci terpopuler dikosongkan, maka kata kunci untuk bergabung dan berhenti harus unik untuk semua aktivitas. +subscription.default.action.header=Pilih aksi apabila tidak ada kata kunci yang terkirim +subscription.default.action.description=Pilih aksi yang ingin dijalankan ketika ada pesan menggunakan kata kunci terpopuler tetapi bukan kata kunci untuk bergabung atau berhenti: +subscription.keywords.leave=Kata kunci untuk berhenti +subscription.keywords.join=Kata kunci untuk bergabung +subscription.default.action.join=Masukkan kontak ke grup +subscription.default.action.leave=Hapus kontak dari grup +subscription.default.action.toggle= Toggle kontak anggota grup +subscription.autoreply.join=Kirim balasan otomatis ketika kontak bergabung dengan grup +subscription.autoreply.leave=Kirim balasan otomatis ketika kontak berhenti dari grup +subscription.confirm.group=Grup +subscription.confirm.keyword=Kata kunci +subscription.confirm.join.alias=Kata kunci untuk bergabung +subscription.confirm.leave.alias=Kata kunci untuk berhenti +subscription.confirm.default.action=Aksi Semula +subscription.confirm.join.autoreply=Balasan otomatis untuk bergabung +subscription.confirm.leave.autoreply=Balasan otomatis untuk berhenti +subscription.info1= Berlangganan sudah disimpan dan aktif +subscription.info2=Pesan masuk yang sesuai dengan kata kunci ini akan mengubah kontak dari anggota grup +subscription.info3=Untuk melihat berlangganan, silahkan klik kiri di menu +subscription.categorise.title=Kategorikan pesan +subscription.categorise.info=Silahkan pilih aksi yang ingin dijalankan untuk pengirim pesan terpilih ketika mereka dimasukkan ke {0} +subscription.categorise.join.label=Masukkan pengirim pesan ke {0} +subscription.categorise.leave.label=Hapus pengirim pesan dari {0} +subscription.categorise.toggle.label= Toggle pengirim' anggota dari {0} +subscription.join=Bergabung +subscription.leave=Berhenti + +subscription.sorting.example.toplevel=contoh SOLUSI +subscription.sorting.example.join=contoh BERLANGGANAN, BERGABUNG +subscription.sorting.example.leave=contoh BERHENTI, KELUAR + +subscription.keyword.required=Kata kunci tidak boleh kosong +subscription.jointext.required=Silahkan tulis balasan otomatis untuk bergabung +subscription.leavetext.required=Silahkan tulis balasan otomatis untuk berhenti + +subscription.moreactions.delete=Hapus berlangganan +subscription.moreactions.rename=Ubah nama berlangganan +subscription.moreactions.edit=Sunting berlangganan +subscription.moreactions.export=Ekspor berlangganan + +# Generic activity sorting +activity.generic.sorting=Pemrosesan otomatis +activity.generic.sorting.subtitle=Memproses pesan otomatis menggunakan kata kunci (pilihan) +activity.generic.sort.header=Memproses pesan otomatis menggunakan kata kunci (pilihan) +activity.generic.sort.description=Jika pengunjung mengirimkan pesan yang diawali dengan kata kunci tertentu, FrontlineSMS dapat secara otomatis memproses pesan tersebut di dalam sistem anda. +activity.generic.keywords.title=Silahkan masukkan kata kunci untuk aktivitas. Anda boleh menggunakan beberapa kata kunci dipisahkan dengan tanda koma: +activity.generic.keywords.subtitle=Silahkan masukkan kata kunci untuk aktivitas +activity.generic.keywords.info=Silahkan masukkan beberapa kata kunci dipisahkan dengan tanda koma: +activity.generic.no.keywords.title=Dilarang menggunakan kata kunci +activity.generic.no.keywords.description=Semua pesan masuk yang tidak sesuai dengan kata kunci yang ada akan memengaruhi aktivitas ini +activity.generic.disable.sorting=Jangan mensortir pesan secara otomatis +activity.generic.disable.sorting.description=Pesan tidak akan diproses secara otomatis oleh aktivitas ini +activity.generic.enable.sorting=Proses balasan yang mengandung kata kunci secara otomatis +activity.generic.sort.validation.unique.error=Kata kunci harus unik +activity.generic.keyword.in.use=Kata kunci {0} sudah digunakan untuk aktivitas {1} +activity.generic.global.keyword.in.use=Aktivitas {0} diatur untuk menerima semua pesan yang tidak sesuai dengan kata kunci. Anda hanya diperbolehkan mempunyai satu aktivitas yang aktif dengan aturan ini. + +#basic authentication +basic.authentication=Otentikasi Dasar +basic.authentication.label=Membutuhkan nama pengguna dan kata sandi untuk mengakses FrontlineSMS melalui jaringan +basic.authentication.enable=Aktifkan Otentikasi Dasar +basic.authentication.username=Nama pengguna +basic.authentication.password=Kata sandi +basic.authentication.confirm.password=Konfirmasi Kata sandi +basic.authentication.password.mismatch=Kata sandi tidak cocok +newfeatures.popup.title=Fitur baru +newfeatures.popup.showinfuture=Tampilkan kembali pesan ini +dynamicfield.message_text.label=Pesan teks +dynamicfield.message_text_with_keyword.label=Pesan Teks dengan Kata kunci +dynamicfield.sender_name.label=Nama pengirim +dynamicfield.sender_number.label=Nomor pengirim +dynamicfield.recipient_number.label=Nomor penerima +dynamicfield.recipient_name.label=Nama penerima From 42b7abf7b31e97b633e131cb3005f7ae9409af1c Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 26 Mar 2013 11:09:28 +0300 Subject: [PATCH 1163/2668] FIX app-startup failure --- .../grails-app/domain/frontlinesms2/Contact.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy index f79de4bdf..8d973dcc6 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Contact.groovy @@ -24,7 +24,7 @@ class Contact { static mapping = { sort name:'asc' - customFields cascade:'all', sort:['name', 'value'] + customFields cascade:'all', sort:'name' } //> EVENT METHODS From 5da9451c005232e7193fa75bfe897840495ced34 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 12:13:40 +0300 Subject: [PATCH 1164/2668] Added do script to simulate jenkins build. --- plugins/frontlinesms-core/do/jenkins/simulate | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 plugins/frontlinesms-core/do/jenkins/simulate diff --git a/plugins/frontlinesms-core/do/jenkins/simulate b/plugins/frontlinesms-core/do/jenkins/simulate new file mode 100755 index 000000000..b41a7a417 --- /dev/null +++ b/plugins/frontlinesms-core/do/jenkins/simulate @@ -0,0 +1,10 @@ +#!/bin/bash +set -e +echo "# Simulating steps of jenkins build on current version..." + +do/jenkins/before +grails test-app -coverage +do/jenkins/after + +echo "# Jenkins build simulation completed successfully." + From 3ef4aade0a6498ae7ce37b7912af9b5d79a3405b Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 26 Mar 2013 12:18:40 +0300 Subject: [PATCH 1165/2668] CORE-1875 FIX There is pre-populated nonsense in the Basic Auth fields on the Settings panel --- .../controllers/frontlinesms2/SettingsController.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index 3047a6643..a125f0747 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -28,8 +28,8 @@ class SettingsController extends ControllerUtils { def general() { def authEnabled = appSettingsService.get("auth.basic.enabled") - def username = new String(appSettingsService.get("auth.basic.username").decodeBase64()) - def password = new String(appSettingsService.get("auth.basic.password").decodeBase64()) + def username = appSettingsService.get("auth.basic.username")? new String(appSettingsService.get("auth.basic.username").decodeBase64()):'' + def password = appSettingsService.get("auth.basic.password")? new String(appSettingsService.get("auth.basic.password").decodeBase64()):'' def appSettings = [:] //TODO Filter out only connections with send enabled From 0457dec108b9c2906f1487eeefedfbc1942702cb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 26 Mar 2013 12:24:04 +0300 Subject: [PATCH 1166/2668] WIP CORE-1963 Fixed Clickatell mapping to table-per-subclass so online extension works --- .../grails-app/domain/frontlinesms2/ClickatellFconnection.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index dfc1c6bff..3246536a6 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -33,6 +33,7 @@ class ClickatellFconnection extends Fconnection { static passwords = ['password'] static mapping = { + tablePerHierarchy false password column: 'clickatell_password' } From b23e492531d8d527e6905a44aeaf863e50123792 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 14:24:52 +0300 Subject: [PATCH 1167/2668] Fixed broken test from codenarc cleanup and reinstated some code. --- .../domain/frontlinesms2/Fmessage.groovy | 16 +++++++++++----- .../frontlinesms2/domain/FmessageISpec.groovy | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 66ba8d009..bf6e43d9b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -255,10 +255,16 @@ class Fmessage { def getHasSent() { areAnyDispatches(DispatchStatus.SENT) } def getHasFailed() { areAnyDispatches(DispatchStatus.FAILED) } def getHasPending() { areAnyDispatches(DispatchStatus.PENDING) } - def getOutboundContactList(){ - def contactlist = [] - dispatches.each{ contactlist << Contact.findByMobile(it.dst)?.name } - contactlist?contactlist:"" + def getOutboundContactList() { + dispatches.collect { Contact.findByMobile(it.dst)?.name } - null + } + + private boolean isMoveAllowed() { + if(this.messageOwner){ + return !(this.messageOwner?.archived) + } else { + return (!this.isDeleted && !this.archived) + } } private def areAnyDispatches(status) { @@ -290,7 +296,7 @@ class Fmessage { } static def countAllMessages() { - ['inbox', 'sent', 'pending', 'deleted'].collect { Fmessage[it].count() } + ['inbox', 'sent', 'pending', 'deleted'].collectEntries { [it, Fmessage[it].count()] } } // TODO should this be in a service? diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index e99343b22..7123a2a65 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -116,7 +116,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { setup: setUpMessages() when: - def messageCounts = Fmessage.countAllMessages(['archived':false, 'starred': false]) + def messageCounts = Fmessage.countAllMessages() then: messageCounts['inbox'] == 2 messageCounts['sent'] == 4 From 89b39ee214dc26a6d9cff8b0edf3212b531a0549 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 15:05:07 +0300 Subject: [PATCH 1168/2668] Cleaned up FmessageISpec and made it a little faster. --- .../frontlinesms2/domain/FmessageISpec.groovy | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index 7123a2a65..078038d74 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -333,14 +333,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { def 'search page should display distinct messages'(){ setup: - def message - (1..60).each{ - message = new Fmessage(src:'me', inbound:false, text:"sample message-${it}") - (0..10).each { num -> - message.addToDispatches(dst:"+25411663${num}", status:DispatchStatus.SENT, dateSent:new Date()).save(failOnError:true, flush:true) - } - message.save(failOnError:true) - } + createMessagesForSearch(60) def controller = new SearchController() controller.params.searchString = "sample" controller.params.max = 50 @@ -351,17 +344,11 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { dataModel.messageInstanceList.size() == dataModel.messageInstanceList*.id.unique().size() && dataModel.messageInstanceList.size() == 50 } -@Unroll + + @Unroll def 'pagination navigation should still work in search page'(){ setup: - def message - (1..80).each{ - message = new Fmessage(src:'me', inbound:false, text:"sample message-${it}") - (0..10).each { num -> - message.addToDispatches(dst:"+25411663${num}", status:DispatchStatus.SENT, dateSent:new Date()).save(failOnError:true, flush:true) - } - message.save(failOnError:true) - } + createMessagesForSearch(80) def controller = new SearchController() controller.params.searchString = "sample" controller.params.max = max @@ -372,9 +359,9 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { dataModel.messageInstanceList.size() == dataModel.messageInstanceList*.id.unique().size() dataModel.messageInstanceList*.id.containsAll(Fmessage.list(offset : offset,max : max,sort:"date", order:"desc")*.id) where: - offset|max - 0|50 - 50|50 + offset | max + 0 | 50 + 50 | 50 } def "if an FMessage's receivedOn connection is deleted, the field should update to null"() { @@ -530,6 +517,17 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { buildWithDispatches(pendingDispatch()) } + private def createMessagesForSearch(int messageCount) { + def message + (1..messageCount).each{ + message = new Fmessage(src:'me', inbound:false, text:"sample message-${it}") + (0..10).each { num -> + message.addToDispatches(dst:"+25411663${num}", status:DispatchStatus.SENT, dateSent:new Date()) + } + message.save(failOnError:true) + } + } + private def dispatch() { sentDispatch() } private def sentDispatch() { new Dispatch(dst:'1234', status:DispatchStatus.SENT, dateSent:TEST_DATE) } private def pendingDispatch() { new Dispatch(dst:'1234', status:DispatchStatus.PENDING) } From d78bd2a4432c012277c6725a4fc7c2380e1a3632 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 15:14:14 +0300 Subject: [PATCH 1169/2668] Minor code cleanup in FmessageISpec --- .../frontlinesms2/domain/FmessageISpec.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy index 078038d74..c76c1803c 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/domain/FmessageISpec.groovy @@ -331,7 +331,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { Fmessage.owned(owner, false, true).list(sort:'date', order:'desc') == [received] } - def 'search page should display distinct messages'(){ + def 'search page should display distinct messages'() { setup: createMessagesForSearch(60) def controller = new SearchController() @@ -346,7 +346,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { } @Unroll - def 'pagination navigation should still work in search page'(){ + def 'pagination navigation should still work in search page'() { setup: createMessagesForSearch(80) def controller = new SearchController() @@ -390,7 +390,7 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { .save(failOnError:true, flush:true) def incomingMessage = Fmessage.build(text:"incoming message", messageOwner: customActivity) - def outgoingMessage = new Fmessage(text:'sending this message', inbound:false, date:new Date(), messageOwner:customActivity) + def outgoingMessage = new Fmessage(text:'sending this message', inbound:false, date:TEST_DATE, messageOwner:customActivity) .addToDispatches(new Dispatch(dst:'234', status:DispatchStatus.PENDING)).save(failOnError:true) outgoingMessage.setMessageDetail(replyStep, incomingMessage.id) then: @@ -450,9 +450,9 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { def "pendingAndNotFailed returns count of dispatches with PENDING status"() { setup: - def m1 = Fmessage.buildWithoutSave(inbound:false, date: new Date() - 10) + def m1 = Fmessage.buildWithoutSave(inbound:false, date: TEST_DATE - 10) 4.times { m1.addToDispatches(Dispatch.build(status: DispatchStatus.PENDING)) } - m1.addToDispatches(Dispatch.build(status: DispatchStatus.SENT, dateSent:new Date())) + m1.addToDispatches(Dispatch.build(status: DispatchStatus.SENT, dateSent:TEST_DATE)) m1.addToDispatches(Dispatch.build(status: DispatchStatus.FAILED)) when: def pendingCount = Fmessage.pendingAndNotFailed.count() @@ -519,10 +519,10 @@ class FmessageISpec extends grails.plugin.spock.IntegrationSpec { private def createMessagesForSearch(int messageCount) { def message - (1..messageCount).each{ + (1..messageCount).each { message = new Fmessage(src:'me', inbound:false, text:"sample message-${it}") (0..10).each { num -> - message.addToDispatches(dst:"+25411663${num}", status:DispatchStatus.SENT, dateSent:new Date()) + message.addToDispatches(dst:"+25411663${num}", status:DispatchStatus.SENT, dateSent:TEST_DATE) } message.save(failOnError:true) } From b3b9a631b44377d947c25b480b6c8d14e8166a4f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 15:21:02 +0300 Subject: [PATCH 1170/2668] Fixed unit test for AutoreplyService --- .../frontlinesms2/services/AutoreplyServiceSpec.groovy | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy index db1da51bd..2f8a0232e 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/AutoreplyServiceSpec.groovy @@ -2,11 +2,9 @@ package frontlinesms2.services import frontlinesms2.* import spock.lang.* -import grails.test.mixin.* @TestFor(AutoreplyService) class AutoreplyServiceSpec extends Specification { - @Unroll def "doReply will create an outgoing message"() { setup: @@ -14,8 +12,7 @@ class AutoreplyServiceSpec extends Specification { def messageSendService = Mock(MessageSendService) def incoming = Mock(Fmessage) def owner = Mock(CustomActivity) - - owner.addToMessages { ms-> return "" } + owner.addToMessages >> { m -> } incoming.messageOwner >> owner incoming.src >> "123" incoming.messageOwner >> Mock(Activity) @@ -34,4 +31,5 @@ class AutoreplyServiceSpec extends Specification { where: invokerType << [Autoreply, ReplyActionStep] } -} \ No newline at end of file +} + From 4a1e17498886e9cf9dd6e001e55d411bb4fcaaaf Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Tue, 26 Mar 2013 15:33:14 +0300 Subject: [PATCH 1171/2668] Fix bug to enable SystemNotificationService to access the exception in kwargs --- .../services/frontlinesms2/SystemNotificationService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy index 2a5444eb2..528513f84 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SystemNotificationService.groovy @@ -3,7 +3,7 @@ package frontlinesms2 class SystemNotificationService { def i18nUtilService def createSystemNotification(code, args, kwargs=[:]) { - if(kwargs.exception) args += [i18nUtilService.getMessage(code:'connection.error.'+exception.class.name.toLowerCase(), args:[exception.message])] + if(kwargs.exception) args += [i18nUtilService.getMessage(code:'connection.error.'+kwargs.exception.class.name.toLowerCase(), args:[kwargs.exception.message])] def text = i18nUtilService.getMessage(code:code, args:args) getOrCreate(text) } From 994dd20e3d9fc4b8f36cfb7a562acf87aff15a88 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 16:00:08 +0300 Subject: [PATCH 1172/2668] CORE-1943 [devclops] Bad values for `default.date.format` cause crashes --- .../do/i18n/check_for_bad_date_formats | 19 +++++++++++++++++++ plugins/frontlinesms-core/do/jenkins/before | 1 + 2 files changed, 20 insertions(+) create mode 100755 plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats diff --git a/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats b/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats new file mode 100755 index 000000000..9b0c63585 --- /dev/null +++ b/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats @@ -0,0 +1,19 @@ +#!/bin/bash +set -e +i18nDirectory=grails-app/i18n +echo "# Checking for bad date formats in $i18nDirectory..." +pushd $i18nDirectory +grep 'default\.date\.format' `ls *.properties` | groovy -e ' + System.in.text.eachLine { + parts = it.split ":default.date.format=" + file = parts[0]; dateFormat = parts[1] + try { + new java.text.SimpleDateFormat(dateFormat) + } catch(IllegalArgumentException) { + println "# Illegal date format in $file" + System.exit(1) + } + } +' +popd + diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before index f9fdc9e0a..bf1a8800f 100755 --- a/plugins/frontlinesms-core/do/jenkins/before +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -3,6 +3,7 @@ set -e do/check_for_ignored_tests do/check_for_bad_template_renders do/check_for_setInterval_calls +do/i18n/check_for_bad_date_formats do/functional_test_unsafe_text_calls_checker do/functional_test_unflushed_saves_checker do/jslint_report From 24dfcb5da2108b793b3350f8f12a344730173a3e Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 16:01:58 +0300 Subject: [PATCH 1173/2668] TOOLS-256 integrate check for bad metaclass calls with jenkins build --- plugins/frontlinesms-core/do/jenkins/before | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before index bf1a8800f..1f97a9a65 100755 --- a/plugins/frontlinesms-core/do/jenkins/before +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -4,6 +4,7 @@ do/check_for_ignored_tests do/check_for_bad_template_renders do/check_for_setInterval_calls do/i18n/check_for_bad_date_formats +do/check_for_metaclass_in_non-unit_tests do/functional_test_unsafe_text_calls_checker do/functional_test_unflushed_saves_checker do/jslint_report From d65c14e90052c97da1f302ad316c7496e182989a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 26 Mar 2013 16:09:41 +0300 Subject: [PATCH 1174/2668] CORE-1942 FIX WEBCONNECTION FAILS TO VALIDATE FOR LOCALHOST URLS --- .../grails-app/domain/frontlinesms2/Webconnection.groovy | 9 ++++++++- .../grails-app/i18n/messages.properties | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index 8c0be1391..b9c0a7a26 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -56,7 +56,14 @@ abstract class Webconnection extends Activity implements FrontlineApi { return true }) secret(nullable:true) - url nullable:false, url:true, validator:{ val, obj -> val ==~ 'http(s?)://.*' } + url nullable:false, url:true, validator:{ val, obj -> + if(!(val ==~ 'http(s?)://.*')) { + return "webconnection.url.error.url.start.with.http" + } + if(val.toLowerCase().contains("http://localhost")) { + return "webconnection.url.error.locahost.invalid.use.ip" + } + } } static mapping = { requestParameters cascade: "all-delete-orphan" diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 965f21d07..3cda3ff31 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -913,6 +913,8 @@ webconnection.api.disabled=API disabled webconnection.api.url=API URL webconnection.moreactions.retryFailed=retry failed uploads webconnection.failed.retried=Failed web connections have been scheduled for resending. +webconnection.url.error.locahost.invalid.use.ip=Please use 127.0.0.1 instead of "locahost" for localhost urls +webconnection.url.error.url.start.with.http=Invalid URL (should start with http:// or https://) # Webconnection - generic webconnection.generic.label=Other web service @@ -938,8 +940,7 @@ webconnection.ushahidi.fsmskey.label=FrontlineSMS API Secret: webconnection.ushahidi.crowdmapkey.label=Crowdmap/Ushahidi API Key: webconnection.ushahidi.keyword.label=Keyword: webconnection.api.disabled=API Disabled -frontlinesms2.GenericWebconnection.url.validator.error=Invalid URL (should start with http:// or https://) -frontlinesms2.UshahidiWebconnection.url.validator.error=Invalid URL (should start with http:// or https://) +url.invalid.url=The Url provided is invalid. webconnection.confirm=Confirm webconnection.keyword.title=Transfer every message received containing the following keyword: From 849ff7f36cb912df6624f2aa66cf6395edfcb112 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 26 Mar 2013 16:38:30 +0300 Subject: [PATCH 1175/2668] TOOLS-312 Added Pause and Resume Fconnection route handlers --- .../grails-app/i18n/messages.properties | 2 + .../frontlinesms2/FconnectionService.groovy | 42 +++++++++++++++++++ .../services/FconnectionServiceSpec.groovy | 24 +++++++++++ 3 files changed, 68 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 965f21d07..fa7a6e312 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -37,6 +37,8 @@ connection.route.disconnecting=Disconnecting... connection.route.successNotification=Successfully created route on {0} connection.route.failNotification=Failed to create route on {1}: {2} [edit] connection.route.destroyNotification=Disconnected route on {0} +connection.route.pauseNotification=Paused route on {0} +connection.route.resumeNotification=Resumed route on {0} connection.test.sent=Test message successfully sent to {0} using {1} connection.route.exception={1} diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index c25ceaafd..7e9aa1bf2 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -119,6 +119,48 @@ class FconnectionService { c.save(failOnError:true) } + def pauseFconnection(Fconnection c) { + pauseFconnection(c.id as long) + createSystemNotification('connection.route.pauseNotification', [c?.name?: c?.id]) + } + + def pauseFconnection(long id) { + println "fconnectionService.pauseFconnection : ENTRY" + println "fconnectionService.pauseFconnection : id=$id" + camelContext.routes.findAll { it.id ==~ /.*-$id$/ }.each { + try { + println "fconnectionService.pauseFconnection : route-id=$it.id" + println "fconnectionService.pauseFconnection : pausing route $it.id..." + camelContext.suspendRoute(it.id) + } catch(Exception ex) { + println "fconnectionService.pauseFconnection : Exception thrown while pausing $it.id: $ex" + ex.printStackTrace() + } + } + println "fconnectionService.pauseFconnection : EXIT" + } + + def resumeFconnection(Fconnection c) { + resumeFconnection(c.id as long) + createSystemNotification('connection.route.resumeNotification', [c?.name?: c?.id]) + } + + def resumeFconnection(long id) { + println "fconnectionService.resumeFconnection : ENTRY" + println "fconnectionService.resumeFconnection : id=$id" + camelContext.routes.findAll { it.id ==~ /.*-$id$/ }.each { + try { + println "fconnectionService.resumeFconnection : route-id=$it.id" + println "fconnectionService.resumeFconnection : resuming route $it.id..." + camelContext.resumeRoute(it.id) + } catch(Exception ex) { + println "fconnectionService.resumeFconnection : Exception thrown while resuming $it.id: $ex" + ex.printStackTrace() + } + } + println "fconnectionService.resumeFconnection : EXIT" + } + private def logFail(c, ex) { ex.printStackTrace() log.warn("Error creating routes to fconnection with id $c?.id", ex) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index 80cc9d267..460210865 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -171,6 +171,30 @@ class FconnectionServiceSpec extends Specification { ['out-internet-1'] | ['in-2', 'out-internet-3'] } + def "pauseFconnection should suspend the enabled route"() { + given: + def c = Mock(Fconnection) + c.id >> 1 + c.enabled >> true + context.routes >> [[id:'in-1']] + when: + service.pauseFconnection(c.id as Long) + then: + 1 * context.suspendRoute('in-1') + } + + def "resumeFconnection should resume a route"() { + given: + def c = Mock(Fconnection) + c.id >> 1 + c.enabled >> true + context.routes >> [[id:'in-1']] + when: + service.resumeFconnection(c.id as Long) + then: + 1 * context.resumeRoute('in-1') + } + private def mockSmslibFconnection(int id, boolean enabled=true) { mockFconnection(SmslibFconnection, id, enabled) } From 8d710d72858a0f69dafd81daf3ebc425a4bccf64 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 16:46:44 +0300 Subject: [PATCH 1176/2668] Made systemNotification.create function public. --- plugins/frontlinesms-core/web-app/js/system_notification.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/system_notification.js b/plugins/frontlinesms-core/web-app/js/system_notification.js index d1d65ac9e..75739651b 100644 --- a/plugins/frontlinesms-core/web-app/js/system_notification.js +++ b/plugins/frontlinesms-core/web-app/js/system_notification.js @@ -4,7 +4,7 @@ var SystemNotification = function() { _getId = function(e) { return e.attr("id").substring(13); }, - _create = function(id, text) { + create = function(id, text) { var elementId = "notification-" + id; return '
            ' + text @@ -36,7 +36,7 @@ var SystemNotification = function() { for(_key in data) { value = data[_key]; if(value) { - $("#notifications").append(_create(_key, value)); + $("#notifications").append(create(_key, value)); } } }, @@ -44,6 +44,7 @@ var SystemNotification = function() { app_info.listen("system_notification", _refresh); }; return { + create:create, hide:hide, init:init }; From 5a46731d1df43b55aa4a73ec8e5d5075c2e41d9f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 17:22:09 +0300 Subject: [PATCH 1177/2668] Removed random printlns. --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index bf6e43d9b..d7565e161 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -347,16 +347,12 @@ class Fmessage { } def getMessageDetailValue(owner) { - println "# Fmessage.getMessageDetailValue # ${owner}" def ownerType = getOwnerType(owner) if(owner && (Activity.get(owner?.id) instanceof CustomActivity)) { - println "Fmessage.getMessageDetailValue # for CustomActivity # " def stepId = this.details.find { it.ownerType == ownerType && it.ownerId == owner.id }?.value def t = this.details.find { (it.ownerType == MessageDetail.OwnerType.STEP) && (it.ownerId == stepId as Long) }?.value - println "Fmessage.getMessageDetailValue # for CustomActivity # and ownerDetail is # ${t}" return t } else { - println "Fmessage.getMessageDetailValue # for Other Activities # " return this.details?.find { it.ownerType == ownerType && it.ownerId == owner?.id }?.value?:'' } } From 9d35d13e6edec40314fd749ef0b55ef595e99b4a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 26 Mar 2013 17:30:34 +0300 Subject: [PATCH 1178/2668] Made an add-system-notification method in JS. --- .../web-app/js/system_notification.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/system_notification.js b/plugins/frontlinesms-core/web-app/js/system_notification.js index 75739651b..6f8f07f4e 100644 --- a/plugins/frontlinesms-core/web-app/js/system_notification.js +++ b/plugins/frontlinesms-core/web-app/js/system_notification.js @@ -4,6 +4,9 @@ var SystemNotification = function() { _getId = function(e) { return e.attr("id").substring(13); }, + add = function(id, text) { + $("#notifications").append(create(id, text)); + }, create = function(id, text) { var elementId = "notification-" + id; return '
            ' @@ -16,7 +19,7 @@ var SystemNotification = function() { }, _refresh = function(data) { // remove any notifications no longer in the list - var _key, value, found; + var _key, value, found, notifications; data = data.system_notification; if(!data) { return; } found = []; @@ -33,10 +36,11 @@ var SystemNotification = function() { }); // add any new notifications to the bottom of the list + notifications = $("#notifications"); for(_key in data) { value = data[_key]; if(value) { - $("#notifications").append(create(_key, value)); + notifications.append(create(_key, value)); } } }, @@ -44,7 +48,7 @@ var SystemNotification = function() { app_info.listen("system_notification", _refresh); }; return { - create:create, + add:add, hide:hide, init:init }; From b77185651879b237d16878df70d8a92acefe0ab8 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Tue, 26 Mar 2013 17:48:50 +0300 Subject: [PATCH 1179/2668] TOOLS-312 WIP pause and resume FconnectionActions now update the Fconnection status --- .../services/frontlinesms2/FconnectionService.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 3c7a735b6..e8e1efa20 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -123,7 +123,8 @@ class FconnectionService { def pauseFconnection(Fconnection c) { pauseFconnection(c.id as long) - createSystemNotification('connection.route.pauseNotification', [c?.name?: c?.id]) + c.enabled = false + c.save(failOnError:true) } def pauseFconnection(long id) { @@ -144,7 +145,8 @@ class FconnectionService { def resumeFconnection(Fconnection c) { resumeFconnection(c.id as long) - createSystemNotification('connection.route.resumeNotification', [c?.name?: c?.id]) + c.enabled = true + c.save(failOnError:true) } def resumeFconnection(long id) { From c3c22ed119e72efc4fbbef77e5d136406e51ea8a Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 27 Mar 2013 11:41:17 +0300 Subject: [PATCH 1180/2668] CORE-1942 FIX WEBCONNECTION FAILS TO VALIDATE FOR LOCALHOST URLS --- .../grails-app/domain/frontlinesms2/Webconnection.groovy | 2 +- .../unit/frontlinesms2/GenericWebconnectionSpec.groovy | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy index b9c0a7a26..a9a5696b7 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Webconnection.groovy @@ -60,7 +60,7 @@ abstract class Webconnection extends Activity implements FrontlineApi { if(!(val ==~ 'http(s?)://.*')) { return "webconnection.url.error.url.start.with.http" } - if(val.toLowerCase().contains("http://localhost")) { + if(val.toLowerCase() ==~ 'http(s?)://localhost(:[0-9]+)?(\\/.*)?') { return "webconnection.url.error.locahost.invalid.use.ip" } } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy index 985071623..02b1e6909 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/GenericWebconnectionSpec.groovy @@ -47,6 +47,14 @@ class GenericWebconnectionSpec extends CamelUnitSpecification { 'htttp:/www.example.com/index.html' | false 'htttp:/www..example.com/index.html' | false 'ftp://www.example.com/home/smith/budget.wk1' | false + 'http://localhost:8080/home' | false + 'http://localhost:2323/asdasd' | false + 'http://localhost:1/sd/sd/' | false + 'http://locahost/sd/sd' | false + 'https://localhost/sd/sd' | false + 'http://www.localhost.com' | true + 'http://localhost.com' | true + 'http://localhost.com/sd/sd' | true } def 'apiProcess should pass call to service'() { From afc98ebbf53154e3195c9086ba5d4ac567fb8dce Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 27 Mar 2013 16:25:44 +0300 Subject: [PATCH 1181/2668] FIX bad date format for french i18n --- .../frontlinesms-core/grails-app/i18n/messages_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties index d212a7b41..3298283ff 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_fr.properties @@ -93,7 +93,7 @@ default.paginate.prev=Précédent default.paginate.next=Suivant default.boolean.true=Vrai default.boolean.false=Faux -default.date.format=jj mm aaaa hh:mm +default.date.format=yy mm aaaa hh:mm default.number.format=0 default.unarchived={0} désarchivé From e376a1b773c5d081c4d23d4bbd8499884bc7397c Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Thu, 28 Mar 2013 10:32:19 +0300 Subject: [PATCH 1182/2668] TOOLS-355 Show text "" in SmsSyncFconnection display --- .../grails-app/views/connection/_connection.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp index 1ee672b4d..1dbab1009 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -6,7 +6,7 @@ for each. TODO 'your-ip-addres' should be 18n'd --> -

            ${"http://"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

            +

            ${"http://<your-ip-address>"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

            From 91ac5249221b72351d1a1d8c8ff3faed401d10b6 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 2 Apr 2013 15:08:29 +0300 Subject: [PATCH 1183/2668] WIP CORE-1963 Fixed reference to SendToUSA broken in extending classes --- .../domain/frontlinesms2/ClickatellFconnection.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index 3246536a6..944652b01 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -54,7 +54,7 @@ class ClickatellFconnection extends Fconnection { 'password=${header.clickatell.password}&' + 'to=${header.clickatell.dst}&' + 'text=${body}' + - (sendToUsa ? '&mo=1&from=${header.clickatell.fromNumber}' : ''))) + (ClickatellFconnection.this.sendToUsa ? '&mo=1&from=${header.clickatell.fromNumber}' : ''))) .to(CLICKATELL_URL) .process(new ClickatellPostProcessor()) .routeId("out-internet-${ClickatellFconnection.this.id}")] From 698781730c2d4701bf6334af17fbc89c3f5aa13f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 3 Apr 2013 13:17:22 +0300 Subject: [PATCH 1184/2668] TOOLS-305 WIP Got the extra help info displayed --- .../ClickatellFconnection.groovy | 2 +- .../domain/frontlinesms2/Fconnection.groovy | 1 - .../grails-app/i18n/messages.properties | 2 + .../taglib/frontlinesms2/FsmsTagLib.groovy | 75 +++++++++++-------- .../grails-app/views/connection/_details.gsp | 4 +- 5 files changed, 48 insertions(+), 36 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy index 3246536a6..0bc09ca2e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/ClickatellFconnection.groovy @@ -9,7 +9,7 @@ import frontlinesms2.camel.exception.* class ClickatellFconnection extends Fconnection { private static final String CLICKATELL_URL = 'http://api.clickatell.com/http/sendmsg?' - static final configFields = [name:null, apiId:null, username:null, password:null, sendToUsa:['fromNumber']] + static final configFields = ['info-local':['name'], 'info-clickatell':['apiId', 'username', 'password'], 'sendToUsa':['fromNumber']] static final defaultValues = [] static String getShortName() { 'clickatell' } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index 03379249a..831a01138 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -79,4 +79,3 @@ class Fconnection { }.routeDefinitions } } - diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index d9e0d8359..6b35d53d5 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -219,6 +219,8 @@ clickatell.fromNumber.label=From Number clickatell.description=Send and receive messages through a Clickatell account clickatell.global.info=You will need to configure an account with Clickatell (www.clickatell.com). clickatellFconnection.fromNumber.validator.invalid=A 'From Number' is required for sending messages to the United States +clickatell.info-local=In order to setup a Clickatell connection you must first have a Clickatell Account. If you do not have one please go to Clickatell site and register for a Developers Central Account. It is free to sign up to test and should take less that 5 minutes. Once you have an activated account you will need to 'Create a Connection (API ID)' from the front page. You will need to create a HTTP/S with the default settings then enter the relevant details below. The Name is just for your \\o/ account and not related to the Clickatell API, e.g. Clickatell HTTP API screen. +clickatell.info-clickatell=The following details should be copy pasted directly from the Clickatell HTTP API screen. #Nexmo Fconnection nexmo.label=Nexmo diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index d98f6c1ed..c73892a2b 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -241,6 +241,7 @@ class FsmsTagLib { def inputs = { att -> if(att.table) out << '' + if(att.list) out << "
              " def fields = getFields(att) if(fields instanceof Map) { generateSection(att, fields) @@ -261,10 +262,13 @@ class FsmsTagLib { } if(att.submit) { if(att.table) out << '
            ' } if(att.table) out << '
            ' + if(att.list) out << "
          • " out << g.submitButton(class:'btn', value:g.message(code:att.submit), name:att.submitName?:'submit') + if(att.list) out << '
            • ' if(att.table) out << '
            ' + if(att.table) out << '
          ' } def input = { att, body -> @@ -276,41 +280,48 @@ class FsmsTagLib { def htmlKey = (att.fieldPrefix!=null? att.fieldPrefix: instanceClass?instanceClass.shortName:'') + att.field def labelKey = (att.labelPrefix!=null? att.labelPrefix: instanceClass?instanceClass.shortName+'.':'') + att.field + '.label' def validationRequired = instanceClass != null - def val - if(att.val) { - val = att.val - } else if(att.instance) { - val = att.instance?."$groovyKey" - } else { - val = instanceClass?.defaultValues?."$groovyKey"?:null - } - ['instance', 'instanceClass'].each { att.remove(it) } - att += [name:htmlKey, value:val] - if(att.table) out << '' + if(att.list) out << "
        • " + else if(att.table) out << '' else out << '
          ' - out << '' - if(att.table) out << '' - if(validationRequired) { - if(att.class) att.class += addValidationCss(instanceClass, att.field) - else att.class = addValidationCss(instanceClass, att.field) + if(!groovyKey.startsWith("info-")) { + def val + if(att.val) { + val = att.val + } else if(att.instance) { + val = att.instance?."$groovyKey" + } else { + val = instanceClass?.defaultValues?."$groovyKey"?:null + } + + ['instance', 'instanceClass'].each { att.remove(it) } + att += [name:htmlKey, value:val] + out << '' + if(att.table) out << '' + if(validationRequired) { + if(att.class) att.class += addValidationCss(instanceClass, att.field) + else att.class = addValidationCss(instanceClass, att.field) + } + + if(att.password || isPassword(instanceClass, groovyKey)) { + out << g.passwordField(att) + } else if(getMetaClassProperty(instanceClass, groovyKey)?.type?.enum) { + out << g.select(att + [from:getMetaClassProperty(instanceClass, groovyKey).type.values(), + noSelection:[null:'- Select -']]) + } else if(att.isBoolean || isBooleanField(instanceClass, groovyKey)) { + out << g.checkBox(att) + } else out << g.textField(att) + out << body() + } else { + out << "
          ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
          " } - - if(att.password || isPassword(instanceClass, groovyKey)) { - out << g.passwordField(att) - } else if(getMetaClassProperty(instanceClass, groovyKey)?.type?.enum) { - out << g.select(att + [from:getMetaClassProperty(instanceClass, groovyKey).type.values(), - noSelection:[null:'- Select -']]) - } else if(att.isBoolean || isBooleanField(instanceClass, groovyKey)) { - out << g.checkBox(att) - } else out << g.textField(att) - out << body() - if(att.table) { + if(att.list) out << "
          • " + else if(att.table) { out << '' } else { out << '
          ' diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_details.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_details.gsp index 92951aa68..a3feed207 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_details.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_details.gsp @@ -2,14 +2,14 @@

          - +

          - +
          From 5e8dd422f812d079a11f11dbbbfada6c70351583 Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 3 Apr 2013 14:28:14 +0300 Subject: [PATCH 1185/2668] FIX TOOLS-327 number on message tab at the top of the page now displays a global unread count --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 12 ++++++++++++ plugins/frontlinesms-core/grails-app/views/_head.gsp | 2 +- .../groovy/frontlinesms2/CoreAppInfoProviders.groovy | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index d7565e161..866d0a459 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -160,6 +160,14 @@ class Fmessage { eq("messageOwner", owner) } } + totalUnread { + and { + eq("isDeleted", false) + eq("archived", false) + eq("inbound", true) + eq("read", false) + } + } search { search -> def ids = Fmessage.withCriteria { @@ -294,6 +302,10 @@ class Fmessage { static def countUnreadMessages(owner) { Fmessage.unread(owner).count() } + + static def countTotalUnreadMessages() { + Fmessage.totalUnread.count() + } static def countAllMessages() { ['inbox', 'sent', 'pending', 'deleted'].collectEntries { [it, Fmessage[it].count()] } diff --git a/plugins/frontlinesms-core/grails-app/views/_head.gsp b/plugins/frontlinesms-core/grails-app/views/_head.gsp index e50c342c8..9686833b9 100644 --- a/plugins/frontlinesms-core/grails-app/views/_head.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_head.gsp @@ -3,7 +3,7 @@ ' } def input = { att, body -> @@ -281,7 +281,7 @@ class FsmsTagLib { def labelKey = (att.labelPrefix!=null? att.labelPrefix: instanceClass?instanceClass.shortName+'.':'') + att.field + '.label' def validationRequired = instanceClass != null - if(att.list) out << "
        • " + if(att.list) out << "
          " else if(att.table) out << '' else out << '
          ' if(!groovyKey.startsWith("info-")) { @@ -320,7 +320,7 @@ class FsmsTagLib { } else { out << "
          ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
          " } - if(att.list) out << "
          • " + if(att.list) out << "
        " else if(att.table) { out << '' } else { @@ -541,7 +541,8 @@ class FsmsTagLib { keys.each { key -> if(fields[key]) { out << "
        " - out << "
        " + if(att.list) out << "
        " + else out << "
        " out << "" out << input(att + [field:key]) out << "" @@ -552,7 +553,7 @@ class FsmsTagLib { } else { fields[key].each {field -> if(field instanceof String) { - out << input(att + [field:field] + [class:"$key-subsection-member"]) + out << input(att + [field:field] + [class:"$key-subsection-member"]) } } } diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index 9d13630a2..fadcd8770 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -76,3 +76,7 @@ div.sorting-option input#keywords { display: block; margin-top:5px; } #connectionForm label[for=connectionType] { font-weight: bold } #connectionForm td label:first-child { font-weight: bold } #connectionForm .connection-field-info { padding-left:10px; padding-bottom:3px;} + +fieldset.table { display:table; } +.input-item { display:table-row; } +.input-item label { display:table-cell; width:100px; } diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index 36840e389..bfa763884 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -28,6 +28,7 @@ fconnection = (function() { }; isSubsection = function(fieldName) { + if(new RegExp(/info\-.*/).test(fieldName)) { return false; } return $('#' + fieldName + '-subsection').length > 0; }; From 91424ff8df51200e41e071770a829e57930f9e0f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 4 Apr 2013 11:31:31 +0300 Subject: [PATCH 1188/2668] TOOLS-305 As a cloud user, when I can't register in-app for an SMS aggregator service, I need clear instructions in the UI on how to register and return to \o/ --- .../frontlinesms-core/grails-app/conf/CoreResources.groovy | 1 + .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 4 ++-- plugins/frontlinesms-core/web-app/css/unreviewed-core.css | 7 +++++++ plugins/frontlinesms-core/web-app/css/wizard.css | 4 +--- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/css/unreviewed-core.css diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index bb2f06cb3..6d9867c45 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -18,6 +18,7 @@ modules = { resource url:[dir:'css', file:'wizard.css'] resource url:[dir:'css', file:'chosen.css'] resource url:[dir:'css', file:'color.css'] + resource url:[dir:'css', file:'unreviewed-core.css'] resource url:[dir:'js/layout', file:'resizer.js'], disposition:'head' diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 8504fee5d..efb3f246b 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -318,7 +318,7 @@ class FsmsTagLib { } else out << g.textField(att) out << body() } else { - out << "
        ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
        " + out << "
        ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
        " } if(att.list) out << "
        " else if(att.table) { @@ -571,7 +571,7 @@ class FsmsTagLib { keys.each { key -> if(fields[key]) { out << "
        " - out << confirmTableRow(att + [field:key]) + if(!key.startsWith("info-")) out << confirmTableRow(att + [field:key]) //handle subsections within a subsection if(fields[key] instanceof LinkedHashMap) { diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css new file mode 100644 index 000000000..c4524ab46 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -0,0 +1,7 @@ +fieldset.table { display:table; } +.input-item { display:table-row; } +.input-item label { display:table-cell; font-weight:bold; width:100px; } +.input-item input,select { margin-bottom:5px; } + +.connection-info { padding:7px 0px 7px 0px; } +.connection-info a { color:blue; } diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index fadcd8770..761e78040 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -77,6 +77,4 @@ div.sorting-option input#keywords { display: block; margin-top:5px; } #connectionForm td label:first-child { font-weight: bold } #connectionForm .connection-field-info { padding-left:10px; padding-bottom:3px;} -fieldset.table { display:table; } -.input-item { display:table-row; } -.input-item label { display:table-cell; width:100px; } + From 7606ec101cca7b71eb6f10a6f7f8d6e69ffde24a Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 5 Apr 2013 15:08:41 +0300 Subject: [PATCH 1189/2668] Modified application.properties file : made changes suggested by Pitkin --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 89014cd83..4b13e92d4 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -219,7 +219,7 @@ clickatell.fromNumber.label=From Number clickatell.description=Send and receive messages through a Clickatell account clickatell.global.info=You will need to configure an account with Clickatell (www.clickatell.com). clickatellFconnection.fromNumber.validator.invalid=A 'From Number' is required for sending messages to the United States -clickatell.info-local=In order to setup a Clickatell connection you must first have a Clickatell Account. If you do not have one please go to the Clickatell site and register for a Developers Central Account. Sign up id and testing is free and it should take less that 5 minutes.

        Once you have an activated account you will need to 'Create a Connection (API ID)' from the front page. You will need to create a HTTP/S with the default settings then enter the relevant details below.

        The Name is just for your \\o/ account and not related to the Clickatell API, e.g. Clickatell HTTP API screen. +clickatell.info-local=In order to setup a Clickatell connection you must first have a Clickatell Account. If you do not have one please go to the Clickatell site and register for a Developers Central Account. It is free to sign up to test and should take less that 5 minutes..

        Once you have an activated account you will need to 'Create a Connection (API ID)' from the front page. You will need to create a HTTP/S with the default settings then enter the relevant details below.

        The Name is just for your \\o/ account and not related to the Clickatell API, e.g. 'My local message connection'. clickatell.info-clickatell=The following details should be copy pasted directly from the Clickatell HTTP API screen. #Nexmo Fconnection From b12baa9cc6ad0e95cd7c21ae3b1a1d311c13c985 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 5 Apr 2013 15:34:41 +0300 Subject: [PATCH 1190/2668] Removed code for suspending and resuming Fconnections --- .../frontlinesms2/FconnectionService.groovy | 44 ------------------- .../services/FconnectionServiceSpec.groovy | 24 ---------- 2 files changed, 68 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index e8e1efa20..3e6267b17 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -121,50 +121,6 @@ class FconnectionService { c.save(failOnError:true) } - def pauseFconnection(Fconnection c) { - pauseFconnection(c.id as long) - c.enabled = false - c.save(failOnError:true) - } - - def pauseFconnection(long id) { - println "fconnectionService.pauseFconnection : ENTRY" - println "fconnectionService.pauseFconnection : id=$id" - camelContext.routes.findAll { it.id ==~ /.*-$id$/ }.each { - try { - println "fconnectionService.pauseFconnection : route-id=$it.id" - println "fconnectionService.pauseFconnection : pausing route $it.id..." - camelContext.suspendRoute(it.id) - } catch(Exception ex) { - println "fconnectionService.pauseFconnection : Exception thrown while pausing $it.id: $ex" - ex.printStackTrace() - } - } - println "fconnectionService.pauseFconnection : EXIT" - } - - def resumeFconnection(Fconnection c) { - resumeFconnection(c.id as long) - c.enabled = true - c.save(failOnError:true) - } - - def resumeFconnection(long id) { - println "fconnectionService.resumeFconnection : ENTRY" - println "fconnectionService.resumeFconnection : id=$id" - camelContext.routes.findAll { it.id ==~ /.*-$id$/ }.each { - try { - println "fconnectionService.resumeFconnection : route-id=$it.id" - println "fconnectionService.resumeFconnection : resuming route $it.id..." - camelContext.resumeRoute(it.id) - } catch(Exception ex) { - println "fconnectionService.resumeFconnection : Exception thrown while resuming $it.id: $ex" - ex.printStackTrace() - } - } - println "fconnectionService.resumeFconnection : EXIT" - } - private def logFail(c, ex) { ex.printStackTrace() log.warn("Error creating routes to fconnection with id $c?.id", ex) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy index 3ae5bb973..c9578bd00 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FconnectionServiceSpec.groovy @@ -177,30 +177,6 @@ class FconnectionServiceSpec extends Specification { ['out-internet-1'] | ['in-2', 'out-internet-3'] } - def "pauseFconnection should suspend the enabled route"() { - given: - def c = Mock(Fconnection) - c.id >> 1 - c.enabled >> true - context.routes >> [[id:'in-1']] - when: - service.pauseFconnection(c.id as Long) - then: - 1 * context.suspendRoute('in-1') - } - - def "resumeFconnection should resume a route"() { - given: - def c = Mock(Fconnection) - c.id >> 1 - c.enabled >> true - context.routes >> [[id:'in-1']] - when: - service.resumeFconnection(c.id as Long) - then: - 1 * context.resumeRoute('in-1') - } - private def mockSmslibFconnection(int id, boolean enabled=true) { mockFconnection(SmslibFconnection, id, enabled) } From b2854690ed5f8df7b925f3eefc4189d4aaeadd92 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 9 Apr 2013 10:13:45 +0300 Subject: [PATCH 1191/2668] FIX TOOLS-256 Search for metaClass in integration and functional tests fixed --- .../frontlinesms-core/do/check_for_metaclass_in_non-unit_tests | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests b/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests index f3b8bd071..55794be80 100755 --- a/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests +++ b/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests @@ -1,5 +1,4 @@ #!/bin/bash -set -e echo "# Checking for calls to metaclass on non-instance variables..." grep -r '\s[A-Z][a-zA-Z]*\.metaClass' test/integration/ test/functional/ if [ $? -eq 1 ]; then From e722095d34774c06577604284d781b5f85e62580 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 9 Apr 2013 14:19:13 +0300 Subject: [PATCH 1192/2668] FIX TOOLS-376 Fmessage.listPending() breaks with MySQL data source --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 866d0a459..926e577ce 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -284,7 +284,8 @@ class Fmessage { } static def listPending(onlyFailed, params=[:]) { - Fmessage.getAll(pending(onlyFailed).list(params) as List) + def ids = pending(onlyFailed).list(params) as List + (!ids) ? [] : Fmessage.getAll(ids) } static def countPending(onlyFailed) { From 53ba8917070b2668820ae1debf3161fce9b93323 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 9 Apr 2013 16:11:32 +0300 Subject: [PATCH 1193/2668] FIX TOOLS-385 Connection lost overlay not displayed --- plugins/frontlinesms-core/web-app/js/app_info.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/app_info.js b/plugins/frontlinesms-core/web-app/js/app_info.js index 1e7e310c7..02331dfd6 100644 --- a/plugins/frontlinesms-core/web-app/js/app_info.js +++ b/plugins/frontlinesms-core/web-app/js/app_info.js @@ -24,8 +24,8 @@ app_info = (function() { } }, failureProcessor = function(data) { - if(typeof failureProcessor !== "undefined") { - failureProcessor.call(); + if(typeof failCallback !== "undefined") { + failCallback.call(); } }, requester = function() { @@ -52,8 +52,8 @@ app_info = (function() { contentType:"application/json", data:JSON.stringify(requestData), processData:false, - success:callbackProcessor, - fail:failureProcessor }); + success:callbackProcessor }) + .fail(failureProcessor); } }, listen = function(interest, f, data, callback) { From 64348a7cab972367e4b3b1188a2a291836ee551d Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 9 Apr 2013 16:30:39 +0300 Subject: [PATCH 1194/2668] added _language template in grails/views/settings/sections --- .../grails-app/views/settings/general.gsp | 13 +------------ .../views/settings/sections/_language.gsp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/settings/sections/_language.gsp diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index 34d6bfddf..29c7e8e88 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -10,18 +10,7 @@

        -
        -

        - - - - -
        -
        +

        diff --git a/plugins/frontlinesms-core/grails-app/views/settings/sections/_language.gsp b/plugins/frontlinesms-core/grails-app/views/settings/sections/_language.gsp new file mode 100644 index 000000000..8b4c8d35a --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/settings/sections/_language.gsp @@ -0,0 +1,12 @@ +
        +

        + + + + +
        +
        \ No newline at end of file From b8c05a7bbce599fd40718e7dc8a99dab83a86345 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 10 Apr 2013 10:51:34 +0300 Subject: [PATCH 1195/2668] FIX TOOLS-399 Should be able to delete failed, not_connected and disabled connections without error --- .../controllers/frontlinesms2/ConnectionController.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 1758e21f0..afec89e33 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -51,11 +51,13 @@ class ConnectionController extends ControllerUtils { def delete() { def connection = Fconnection.get(params.id) - if(connection.status == ConnectionStatus.DISABLED) { + if(connection.status != ConnectionStatus.CONNECTING && connection.status != ConnectionStatus.CONNECTED) { connection.delete() flash.message = message code:'connection.deleted', args:[connection.name] redirect action:'list' - } else throw new RuntimeException() + } + else + redirect action:'list' } def update() { From 56b62afe8c056d25fbaf3b77742604097c209a38 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 10 Apr 2013 15:42:44 +0300 Subject: [PATCH 1196/2668] CORE-1966 WIP Make import/export tab in settings --- .../frontlinesms2/SettingsController.groovy | 2 + .../grails-app/i18n/messages.properties | 10 ++- .../grails-app/views/settings/_menu.gsp | 1 + .../grails-app/views/settings/general.gsp | 14 ---- .../grails-app/views/settings/porting.gsp | 70 +++++++++++++++++++ 5 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/settings/porting.gsp diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy index a125f0747..b9d22c522 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SettingsController.groovy @@ -48,6 +48,8 @@ class SettingsController extends ControllerUtils { appSettings:appSettings] } + def porting() { } + def selectLocale() { i18nUtilService.setLocale(request, response, params.language?:'en') redirect view:'general' diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 4b13e92d4..5bf11b929 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -598,6 +598,7 @@ search.contact.name=Contact name search.result.header=Results search.moreoptions.label=More options settings.general=General +settings.porting=Import/Export settings.connections=Phones & connections settings.logs=System settings.general.header=Settings > General @@ -724,7 +725,7 @@ import.backup.label=Import data from a previous backup import.prompt.type=Select type of data to import import.contacts=Contact details import.messages=Message details -import.version1.info=To import data from version 1, please export them in English +import.version1.info=To import data from FrontlineSMS v1, please export them in English import.prompt=Select a data file to import import.upload.failed=File upload has failed for some reason. import.contact.save.error=Encountered error saving contact @@ -733,6 +734,13 @@ import.contact.failed.download=Download failed contacts (CSV) import.message.save.error=Encountered error saving message import.message.complete={0} messages were imported; {1} failed +export.label=Export +export.backup.label=Export data as CSV or PDF +export.prompt.type=Select type of data to export +export.allcontacts=All the contacts +export.inboxmessages=Inbox messages +export.submit.label=Export + many.selected = {0} {1}s selected flash.message.activity.found.not=Activity could not be found diff --git a/plugins/frontlinesms-core/grails-app/views/settings/_menu.gsp b/plugins/frontlinesms-core/grails-app/views/settings/_menu.gsp index fd548a362..4c8904828 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/_menu.gsp @@ -1,6 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8" %> + diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index 29c7e8e88..668892277 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -11,20 +11,6 @@
        -
        -

        - - - - - - - -
        - diff --git a/plugins/frontlinesms-core/grails-app/views/settings/porting.gsp b/plugins/frontlinesms-core/grails-app/views/settings/porting.gsp new file mode 100644 index 000000000..85fc8e515 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/settings/porting.gsp @@ -0,0 +1,70 @@ +<%@ page contentType="text/html;charset=UTF-8" %> + + + + <g:message code="settings.general.header"/> + + + +
        +

        +
        +
        +
        +

        + + + + + + + +
        +
        +

        + + + + + +
        +
        + + + + $("#exportSubmit").click(function(e){ + var exportData = $("input[name=exportData]:checked"); + switch(exportData.val()) { + case "allcontacts": + $.ajax({ + type: "POST", + url : url_root + "export/contactWizard", + beforeSend : function() { showThinking(); }, + success : function(data){ + hideThinking(); + launchSmallPopup(i18n('smallpopup.contact.export.title'), data, i18n('action.export')); + } + }); + break; + case "inboxmessages": + $.ajax({ + type: "POST", + url : url_root +"export/messageWizard", + beforeSend : function() { showThinking(); }, + data : { 'messageSection':'inbox' }, + success : function(data){ + hideThinking(); + launchSmallPopup(i18n("smallpopup.fmessage.export.title"), data, i18n("action.export")); + } + }); + + break; + default: + } + e.preventDefault(); + }); + + From f4a7949eb70cc9ffe5a0163be91557cb77a488ef Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 10 Apr 2013 16:51:51 +0300 Subject: [PATCH 1197/2668] CORE-1966 FIX Added functional tests --- .../settings/ImportExportSettingsSpec.groovy | 25 +++++++++++++++++++ .../settings/PageImportExportSettings.groovy | 15 +++++++++++ 2 files changed, 40 insertions(+) create mode 100644 plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ImportExportSettingsSpec.groovy create mode 100644 plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageImportExportSettings.groovy diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ImportExportSettingsSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ImportExportSettingsSpec.groovy new file mode 100644 index 000000000..da7d421a3 --- /dev/null +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/ImportExportSettingsSpec.groovy @@ -0,0 +1,25 @@ +package frontlinesms2.settings + +import frontlinesms2.* +import frontlinesms2.popup.ExportDialog + +class ImportExportSettingsSpec extends grails.plugin.geb.GebSpec { + + def "all contacts popup should appear when export button is clicked"(){ + when: + to PageImportExportSettings + exportOption("allcontacts").click() + exportButton.click() + then: + waitFor { at ExportDialog } + } + + def 'inbox export popup shoulld appear when export button is clicked'(){ + when: + to PageImportExportSettings + exportOption("inboxmessages").click() + exportButton.click() + then: + waitFor { at ExportDialog } + } +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageImportExportSettings.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageImportExportSettings.groovy new file mode 100644 index 000000000..faecb629e --- /dev/null +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageImportExportSettings.groovy @@ -0,0 +1,15 @@ +package frontlinesms2.settings + +import frontlinesms2.* + +class PageImportExportSettings extends PageSettings { + static url = 'settings/porting' + + static content = { + exportOption { option-> $("input[name=exportData]", value:option) } + exportButton { $("input#exportSubmit")} + } + static at = { + title.contains('Settings') || title.contains('Mazingira') + } +} From 8e5024bb5963dd38fe2102720a9f0426d8a82554 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 11 Apr 2013 10:56:02 +0300 Subject: [PATCH 1198/2668] Updated selenium version. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 3ca8712d9..41d48a0a4 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -50,7 +50,7 @@ grails.project.dependency.resolution = { // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg. // runtime 'mysql:mysql-connector-java:5.1.16' - def seleniumVersion = '2.30.0' + def seleniumVersion = '2.32.0' def camel = { def camelVersion = "2.9.4" "org.apache.camel:camel-$it:$camelVersion" From f60eccd049599fad62002319d1e073e70f00756a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 11 Apr 2013 16:48:16 +0300 Subject: [PATCH 1199/2668] Fixed bad groovy syntax in check_for_bad_date_formats. --- plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats b/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats index 9b0c63585..64930cf46 100755 --- a/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats +++ b/plugins/frontlinesms-core/do/i18n/check_for_bad_date_formats @@ -5,7 +5,7 @@ echo "# Checking for bad date formats in $i18nDirectory..." pushd $i18nDirectory grep 'default\.date\.format' `ls *.properties` | groovy -e ' System.in.text.eachLine { - parts = it.split ":default.date.format=" + parts = it.split(":default.date.format=") file = parts[0]; dateFormat = parts[1] try { new java.text.SimpleDateFormat(dateFormat) From b8de2e01f48534f302a941d22ef7058a9649c3a1 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 11 Apr 2013 16:53:50 +0300 Subject: [PATCH 1200/2668] Removed bad metaclass call from KeywordProcessorServiceISpec --- .../service/KeywordProcessorServiceISpec.groovy | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy index 310fe8d0e..6b2fabd46 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/KeywordProcessorServiceISpec.groovy @@ -71,11 +71,6 @@ class KeywordProcessorServiceISpec extends grails.plugin.spock.IntegrationSpec { given: Autoreply a = new Autoreply(name:"test", autoreplyText:"testing") a.addToKeywords(new Keyword(value:"", isTopLevel:true)) - Autoreply.metaClass.processKeyword = { Fmessage m, Keyword k -> - println "processing keyword $k, value: ${k.value}" - k.ownerDetail = "PROCESSED" - k.save(failOnError:true) - } a.save(failOnError:true) when: keywordProcessorService.process(createFmessage("I'm just an innocent FMessage")) From cbd0480b0d99b7ca40d8700ed3264421d8fcb13b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 11 Apr 2013 16:55:00 +0300 Subject: [PATCH 1201/2668] Removed metaclass calls from integration tests. --- .../frontlinesms2/controller/MessageControllerISpec.groovy | 2 -- .../frontlinesms2/service/WebconnectionServiceISpec.groovy | 1 - 2 files changed, 3 deletions(-) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy index ee8cd091e..e48d533c3 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy @@ -23,8 +23,6 @@ class MessageControllerISpec extends grails.plugin.spock.IntegrationSpec { new Group(name: "Sahara").save(flush: true) new Group(name: "Thar").save(flush: true) - - controller.metaClass.getPaginationCount = { -> return 10 } } def "should send a message to the given address"() { diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy index 9ec6e58ab..4a239292d 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy @@ -107,7 +107,6 @@ class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ def camelContext = Mock(CamelContext) def webconnection = Webconnection.findByName("Sync") webconnection.camelContext = camelContext - webconnectionService.metaClass.getStatusOf = {Webconnection w -> ConnectionStatus.CONNECTED} webconnection.save(failOnError:true) when: webconnection.activate() From a58cf57f22fd8b656ab616cb01a2250cb4494340 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 11 Apr 2013 17:04:24 +0300 Subject: [PATCH 1202/2668] Unfixed OK metaclass calls. --- .../frontlinesms2/controller/MessageControllerISpec.groovy | 2 ++ .../frontlinesms2/service/WebconnectionServiceISpec.groovy | 1 + 2 files changed, 3 insertions(+) diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy index e48d533c3..ee8cd091e 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/controller/MessageControllerISpec.groovy @@ -23,6 +23,8 @@ class MessageControllerISpec extends grails.plugin.spock.IntegrationSpec { new Group(name: "Sahara").save(flush: true) new Group(name: "Thar").save(flush: true) + + controller.metaClass.getPaginationCount = { -> return 10 } } def "should send a message to the given address"() { diff --git a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy index 4a239292d..9ec6e58ab 100644 --- a/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy +++ b/plugins/frontlinesms-core/test/integration/frontlinesms2/service/WebconnectionServiceISpec.groovy @@ -107,6 +107,7 @@ class WebconnectionServiceISpec extends grails.plugin.spock.IntegrationSpec{ def camelContext = Mock(CamelContext) def webconnection = Webconnection.findByName("Sync") webconnection.camelContext = camelContext + webconnectionService.metaClass.getStatusOf = {Webconnection w -> ConnectionStatus.CONNECTED} webconnection.save(failOnError:true) when: webconnection.activate() From e83b8a46aec6ac672d1367036a6be7882b1f04e2 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 11 Apr 2013 17:04:59 +0300 Subject: [PATCH 1203/2668] Fixed regex bug in do/check_for_metaclass_in_non-unit_tests which occurred on jenkins (debian) --- .../frontlinesms-core/do/check_for_metaclass_in_non-unit_tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests b/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests index 55794be80..9c4a67d5f 100755 --- a/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests +++ b/plugins/frontlinesms-core/do/check_for_metaclass_in_non-unit_tests @@ -1,6 +1,6 @@ #!/bin/bash echo "# Checking for calls to metaclass on non-instance variables..." -grep -r '\s[A-Z][a-zA-Z]*\.metaClass' test/integration/ test/functional/ +grep -r '\s[A-Z]([a-zA-Z]*)\.metaClass' test/integration/ test/functional/ if [ $? -eq 1 ]; then echo "# No bad metaclass calls found." exit 0 From d2ae94aa000a281b4e5cf1acd4f3767343dfd403 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 15 Apr 2013 16:02:45 +0300 Subject: [PATCH 1204/2668] TOOLS-319 Add input override by use of custom template --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 64 ++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index efb3f246b..16da89bc6 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -193,15 +193,17 @@ class FsmsTagLib { } def confirmTable = { att -> - out << '' - out << confirmTypeRow(att) def fields = getFields(att) - if(fields instanceof Map) { - generateConfirmSection(att, fields) - } else { - fields.each { out << confirmTableRow(att + [field:it.trim()]) } + if (fields) { + out << '
        ' + out << confirmTypeRow(att) + if(fields instanceof Map) { + generateConfirmSection(att, fields) + } else { + fields.each { out << confirmTableRow(att + [field:it.trim()]) } + } + out << '
        ' } - out << '' } def confirmTypeRow = { att -> @@ -243,29 +245,33 @@ class FsmsTagLib { if(att.table) out << '' if(att.list) out << "
        " def fields = getFields(att) - if(fields instanceof Map) { - generateSection(att, fields) - } else { - def values = att.values - def types = att.types - ['values', 'types'].each { att.remove(it) } - fields.eachWithIndex { field, i -> - def extraAttributes = [field:field] - if(values) { - extraAttributes.val = values[i] - if(types && types[i]) { - extraAttributes[types[i]] = true + if(fields) { + if(fields instanceof Map) { + generateSection(att, fields) + } else { + def values = att.values + def types = att.types + ['values', 'types'].each { att.remove(it) } + fields.eachWithIndex { field, i -> + def extraAttributes = [field:field] + if(values) { + extraAttributes.val = values[i] + if(types && types[i]) { + extraAttributes[types[i]] = true + } } + out << input(att + extraAttributes) } - out << input(att + extraAttributes) } - } - if(att.submit) { - if(att.table) out << '
        ' + if(att.submit) { + if(att.table) out << '' + } + } else { + out << render(template: "/fconnection/${att.instanceClass?.shortName}/custom") } if(att.table) out << '
        ' - if(att.list) out << "
        " - out << g.submitButton(class:'btn', value:g.message(code:att.submit), name:att.submitName?:'submit') - if(att.list) out << '
        ' - if(att.table) out << '
        ' + if(att.list) out << "
        " + out << g.submitButton(class:'btn', value:g.message(code:att.submit), name:att.submitName?:'submit') + if(att.list) out << '
        ' + if(att.table) out << '
        ' if(att.list) out << '
        ' @@ -284,7 +290,7 @@ class FsmsTagLib { if(att.list) out << "
        " else if(att.table) out << '' else out << '
        ' - if(!groovyKey.startsWith("info-")) { + if(att.instanceClass.configFields && !groovyKey.startsWith("info-")) { def val if(att.val) { val = att.val @@ -317,7 +323,7 @@ class FsmsTagLib { out << g.checkBox(att) } else out << g.textField(att) out << body() - } else { + } else if(att.instanceClass.configFields) { out << "
        ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
        " } if(att.list) out << "
        " From 7c00e249f2a20e198e6578ecb00d66af303703c0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 15 Apr 2013 16:26:21 +0300 Subject: [PATCH 1205/2668] WIP TOOLS-287 Refactored _includes to externalise i18n --- .../frontlinesms-core/grails-app/views/_i18n.gsp | 13 +++++++++++++ .../grails-app/views/_includes.gsp | 15 ++------------- 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/views/_i18n.gsp diff --git a/plugins/frontlinesms-core/grails-app/views/_i18n.gsp b/plugins/frontlinesms-core/grails-app/views/_i18n.gsp new file mode 100644 index 000000000..8d28893c5 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/views/_i18n.gsp @@ -0,0 +1,13 @@ +var i18nStrings = i18nStrings || {}; +function i18n(key) { + var translated = + + (typeof(i18nStrings["${plugin}"])!=="undefined"? i18nStrings["${plugin}"][key]: null) || + + key; + if(typeof(translated) == 'undefined') return key; // FIXME this line looks unnecessary + for(i=arguments.length-1; i>0; --i) { + translated = translated.replace("{"+(i-1)+"}", arguments[i]); + } + return translated; +} diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 13c284aa8..c735c67be 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -13,21 +13,10 @@ action = "${params?.action}"; refresh_rate = ${params.rRate ?: 30000}; grailsEnvironment = "${grails.util.GrailsUtil.environment}"; - var i18nStrings = i18nStrings || {}; var console = console || {}; console.log = console.log || function() {}; - function i18n(key) { - var translated = - - (typeof(i18nStrings["${plugin}"])!=="undefined"? i18nStrings["${plugin}"][key]: null) || - - key; - if(typeof(translated) == 'undefined') return key; // FIXME this line looks unnecessary - for(i=arguments.length-1; i>0; --i) { - translated = translated.replace("{"+(i-1)+"}", arguments[i]); - } - return translated; - } + + app_info.init(3000); From bfeba313132adcb6cec561151697880b09bcae46 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 16 Apr 2013 11:03:45 +0300 Subject: [PATCH 1206/2668] Revert "Updated install4j-maven-plugin to allow for code-signing." This reverts commit 152bd99606be11c68736ae5587bc53ac4ccfe3ce. --- plugins/frontlinesms-core/install/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/install/pom.xml b/plugins/frontlinesms-core/install/pom.xml index be0de6e7d..7d8c4bd5d 100644 --- a/plugins/frontlinesms-core/install/pom.xml +++ b/plugins/frontlinesms-core/install/pom.xml @@ -63,7 +63,7 @@ com.google.code.maven-install4j maven-install4j-plugin - 0.2-frontlinesms-SNAPSHOT + 0.1.1 package From ac0306887ca5547ad6902ee22e626d57b70f442f Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 16 Apr 2013 11:20:06 +0300 Subject: [PATCH 1207/2668] Added check for static SimpleDateFormat instances and removed bad usage. --- .../do/check_for_static_simple_date_format | 10 ++++++++++ plugins/frontlinesms-core/do/jenkins/before | 1 + .../controllers/frontlinesms2/ErrorController.groovy | 2 +- .../controllers/frontlinesms2/ImportController.groovy | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 plugins/frontlinesms-core/do/check_for_static_simple_date_format diff --git a/plugins/frontlinesms-core/do/check_for_static_simple_date_format b/plugins/frontlinesms-core/do/check_for_static_simple_date_format new file mode 100755 index 000000000..9b5ab0955 --- /dev/null +++ b/plugins/frontlinesms-core/do/check_for_static_simple_date_format @@ -0,0 +1,10 @@ +#!/bin/bash +echo "# Checking for non-thread-safe use of SimpleDateFormat..." +grep -r 'static.*SimpleDateFormat' grails-app/ src/ +if [[ "$?" != "1" ]]; then + echo "# Static instances of SimpleDateFormat found. This class is not thread-safe." + echo "# Either make the instances ThreadLocal or per-instance." + exit 1 +fi +echo "# No bad SimpleDateFormat use found." + diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before index 1f97a9a65..312c3da1b 100755 --- a/plugins/frontlinesms-core/do/jenkins/before +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -3,6 +3,7 @@ set -e do/check_for_ignored_tests do/check_for_bad_template_renders do/check_for_setInterval_calls +do/check_for_static_simple_date_format do/i18n/check_for_bad_date_formats do/check_for_metaclass_in_non-unit_tests do/functional_test_unsafe_text_calls_checker diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ErrorController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ErrorController.groovy index e1367f12c..2ec1c06ab 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ErrorController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ErrorController.groovy @@ -4,7 +4,7 @@ import java.text.DateFormat import java.text.SimpleDateFormat class ErrorController extends ControllerUtils { - static final def DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd") + private final def DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd") def logs() { supplyDownload('log') } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ImportController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ImportController.groovy index 565e8652b..3f2089327 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ImportController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ImportController.groovy @@ -6,7 +6,7 @@ import java.text.SimpleDateFormat import au.com.bytecode.opencsv.CSVWriter class ImportController extends ControllerUtils { - private static final def MESSAGE_DATE = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") + private final def MESSAGE_DATE = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") def importData() { if (params.data == 'contacts') importContacts() From 6a6979e0e666452cb3e0d65b35fce3e8a85bd9e3 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 16 Apr 2013 16:20:43 +0300 Subject: [PATCH 1208/2668] TOOLS-410 WIP Show the domain name in the SMSSync URL instead of your-IP-address, because it isn't --- plugins/frontlinesms-core/grails-app/conf/Config.groovy | 3 ++- .../grails-app/views/connection/_connection.gsp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/Config.groovy b/plugins/frontlinesms-core/grails-app/conf/Config.groovy index cd2b86907..ca53ab31e 100644 --- a/plugins/frontlinesms-core/grails-app/conf/Config.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/Config.groovy @@ -69,10 +69,11 @@ grails.plugin.databasemigration.updateOnStart = System.properties['db.migrations environments { development { grails.logging.jul.usebridge = true - + server.url = "http://<your-ip-address>" } production { grails.logging.jul.usebridge = false + server.url = "http://<your-ip-address>" } } diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp index 1dbab1009..d3ff04d5d 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -6,7 +6,7 @@ for each. TODO 'your-ip-addres' should be 18n'd --> -

        ${"http://<your-ip-address>"+createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

        +

        ${serverUrl + createLink(uri: '/')+"api/1/smssync/"+c.id+"/"}

        From 17368437c608aa1ceb4c566a26af2a6c8e765950 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 16 Apr 2013 16:32:03 +0300 Subject: [PATCH 1209/2668] TOOLS-410 WIP serverUrl value is returned by ConnectionController.list action --- .../controllers/frontlinesms2/ConnectionController.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index afec89e33..125de84c0 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -7,17 +7,20 @@ class ConnectionController extends ControllerUtils { def fconnectionService def messageSendService def smssyncService + def grailsApplication def index() { redirect action:'list' } def list() { + def url = grailsApplication.config.server.url def fconnectionInstanceList = Fconnection.list(params) def fconnectionInstanceTotal = Fconnection.count() def model = [connectionInstanceList:fconnectionInstanceList, - fconnectionInstanceTotal:fconnectionInstanceTotal] + fconnectionInstanceTotal:fconnectionInstanceTotal + serverUrl:"${url}"] if(params?.id) { model << show() render view:'show', model:model From e8f6048f438d3b0cc38334153d9a3fbc466c8bc5 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 16 Apr 2013 16:36:06 +0300 Subject: [PATCH 1210/2668] TOOLS-410 WIP Added missing comma --- .../controllers/frontlinesms2/ConnectionController.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 125de84c0..53e1d27d1 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -19,7 +19,7 @@ class ConnectionController extends ControllerUtils { def fconnectionInstanceTotal = Fconnection.count() def model = [connectionInstanceList:fconnectionInstanceList, - fconnectionInstanceTotal:fconnectionInstanceTotal + fconnectionInstanceTotal:fconnectionInstanceTotal, serverUrl:"${url}"] if(params?.id) { model << show() From 343a0cbdd6d7b1e03bc7e64c8ffbf55da1816d9c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 17 Apr 2013 11:35:18 +0300 Subject: [PATCH 1211/2668] Added String.startsWith and endsWith implementations to frontlinesms-core Javascript. --- .../web-app/js/frontlinesms_core.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js index 8c9715dbf..3c140a78c 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js @@ -14,6 +14,18 @@ if(!String.prototype.trim) { }; } +if(!String.prototype.startsWith) { + String.prototype.startsWith = function(prefix) { + return this.slice(0, prefix.length) === prefix; + }; +} + +if(!String.prototype.endsWith) { + String.prototype.endsWith = function(suffix) { + return this.indexOf(suffix, this.length - suffix.length) !== -1; + }; +} + if(!String.prototype.htmlEncode) { String.prototype.htmlEncode = function() { return this From 6a3a04637276bffdef4f4af545517428a5ed897b Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 17 Apr 2013 14:13:02 +0300 Subject: [PATCH 1212/2668] Added TODOs to fix smssync disconnection timeout. --- .../services/frontlinesms2/FconnectionService.groovy | 4 +--- .../grails-app/services/frontlinesms2/SmssyncService.groovy | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 3e6267b17..3e2526f26 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -65,9 +65,7 @@ class FconnectionService { ex.printStackTrace() } } - def connection = Fconnection.get(id) - if (connection.shortName == 'smssync') - smssyncService.handleRouteDestroyed(connection) + // TODO fire event to announce that route was destroyed println "fconnectionService.destroyRoutes : EXIT" } diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 62564da02..871de3942 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -6,6 +6,7 @@ import grails.plugin.quartz2.TriggerHelper import org.apache.camel.Exchange import frontlinesms2.api.* +// TODO handle unscheduling of ReportSmssyncTimeoutJob as an event listener. class SmssyncService { def i18nUtilService def processSend(Exchange x) { From 9d093257274959ef9d5acd7404da509e6a5cd82c Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Wed, 17 Apr 2013 14:45:13 +0300 Subject: [PATCH 1213/2668] TOOLS-410 FIX Show the domain name in the SMSSync URL instead of your-IP-address, because it isn't --- plugins/frontlinesms-core/grails-app/conf/Config.groovy | 2 -- .../controllers/frontlinesms2/ConnectionController.groovy | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/Config.groovy b/plugins/frontlinesms-core/grails-app/conf/Config.groovy index ca53ab31e..dbbcf35e0 100644 --- a/plugins/frontlinesms-core/grails-app/conf/Config.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/Config.groovy @@ -69,11 +69,9 @@ grails.plugin.databasemigration.updateOnStart = System.properties['db.migrations environments { development { grails.logging.jul.usebridge = true - server.url = "http://<your-ip-address>" } production { grails.logging.jul.usebridge = false - server.url = "http://<your-ip-address>" } } diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 53e1d27d1..5e55cacd9 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -14,7 +14,7 @@ class ConnectionController extends ControllerUtils { } def list() { - def url = grailsApplication.config.server.url + def url = request.serverPort? "http://${request.serverName}:${request.serverPort}" : request.serverName def fconnectionInstanceList = Fconnection.list(params) def fconnectionInstanceTotal = Fconnection.count() From 563a15bcef7eb85758763069bf185c0781c81685 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 17 Apr 2013 16:44:05 +0300 Subject: [PATCH 1214/2668] FIX TOOLS-391 Added Markdown support to info in wizards; added SMSSync info --- .../domain/frontlinesms2/SmssyncFconnection.groovy | 4 ++-- .../grails-app/i18n/messages.properties | 11 ++++++++++- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 3 ++- plugins/frontlinesms-core/web-app/css/wizard.css | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy index f1f90f80c..f806e993f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy @@ -8,9 +8,9 @@ import frontlinesms2.api.* @FrontlineApiAnnotations(apiUrl="smssync") class SmssyncFconnection extends Fconnection implements FrontlineApi { static String getShortName() { 'smssync' } - static final configFields = ['name', 'receiveEnabled', 'sendEnabled', 'secret', 'timeout'] + static final configFields = ['info-setup': ['secret'], 'info-send_receive':['receiveEnabled', 'sendEnabled'], 'info-timeout':['timeout'], 'info-name':['name']] static final passwords = ['secret'] - static final defaultValues = [sendEnabled:true, receiveEnabled:true] + static final defaultValues = [sendEnabled:true, receiveEnabled:true, timeout:60] def smssyncService def appSettingsService diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 5bf11b929..db895fa6c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -219,6 +219,7 @@ clickatell.fromNumber.label=From Number clickatell.description=Send and receive messages through a Clickatell account clickatell.global.info=You will need to configure an account with Clickatell (www.clickatell.com). clickatellFconnection.fromNumber.validator.invalid=A 'From Number' is required for sending messages to the United States +# TODO: Change markup below to markdown clickatell.info-local=In order to setup a Clickatell connection you must first have a Clickatell Account. If you do not have one please go to the Clickatell site and register for a Developers Central Account. It is free to sign up to test and should take less that 5 minutes..

        Once you have an activated account you will need to 'Create a Connection (API ID)' from the front page. You will need to create a HTTP/S with the default settings then enter the relevant details below.

        The Name is just for your \\o/ account and not related to the Clickatell API, e.g. 'My local message connection'. clickatell.info-clickatell=The following details should be copy pasted directly from the Clickatell HTTP API screen. @@ -241,11 +242,19 @@ smssync.type.label=Type smssync.receiveEnabled.label=Receive enabled smssync.sendEnabled.label=Send enabled smssync.secret.label=Secret -smssync.timeout.label=Time (in minutes) to wait before warning about SMSSync not connecting +smssync.timeout.label=Timeout (in minutes) smssync.description=Use an Android phone with the Smssync app installed to send and receive SMS with FrontlineSMS smssync.field.secret.info=On your app, set the secret to match this field smssync.global.info=Download the SMSSync app from smssync.ushahidi.com smssync.timeout=The Android phone associated with "{0}" has not contacted FrontlineSMS for {1} minute(s) [edit] +smssync.info-setup=FrontlineCloud enables you to send messages through your Android phone. In order to do this you will need to:\n\n\ +1. Complete this form to ceate a connection here in FrontlineCloud\n\ +2. Download and install [SMSSync from the Android App store](https://play.google.com/store/apps/details?id=org.addhen.smssync&hl=en) to your desired Android phone\n\ +3. Create a new Sync URL within the SMSSync app on your Android phone entering the connection URL and secret. See [The SMSSync Site](http://smssync.ushahidi.com/howto) for more help on this step.\n\n\ +SMSSync connects to your FrontlineCloud connection using a URL and a secret key. The URL will be created when you create the connection (submit this form) and will need to be entered into SMSSync. The Secret key is chosen by you here: +smssync.info-send_receive=These options will specify whether you want to both send and receive from your Android phone. If you are unsure, leave both options selected. +smssync.info-timeout=If SMSSync does not contact FrontlineCloud for a certain duration, all messages queued to send on it will be failed. You will be notified if this happens. The default value for this is 60 minutes. +smssync.info-name=Finally you should now name your SMSSync connection, for example ‘Bob’s work Android’. # Messages Tab message.create.prompt=Enter message diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index efb3f246b..4d681784a 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -318,7 +318,8 @@ class FsmsTagLib { } else out << g.textField(att) out << body() } else { - out << "
        ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
        " + def val = g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}").markdownToHtml() + out << "
        ${val}
        " } if(att.list) out << "
        " else if(att.table) { diff --git a/plugins/frontlinesms-core/web-app/css/wizard.css b/plugins/frontlinesms-core/web-app/css/wizard.css index 761e78040..a625b4bfe 100644 --- a/plugins/frontlinesms-core/web-app/css/wizard.css +++ b/plugins/frontlinesms-core/web-app/css/wizard.css @@ -77,4 +77,4 @@ div.sorting-option input#keywords { display: block; margin-top:5px; } #connectionForm td label:first-child { font-weight: bold } #connectionForm .connection-field-info { padding-left:10px; padding-bottom:3px;} - +#modalBox ol { list-style: decimal; list-style-position: inside; padding:5px 0;} From b03ccec7f3959853f1b1bcef918bf1402e44fee8 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 17 Apr 2013 16:45:23 +0300 Subject: [PATCH 1215/2668] FIX TOOLS-391 Changed references to app to 'FrontlineSMS' --- .../frontlinesms-core/grails-app/i18n/messages.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index db895fa6c..09d0ee906 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -247,13 +247,13 @@ smssync.description=Use an Android phone with the Smssync app installed to send smssync.field.secret.info=On your app, set the secret to match this field smssync.global.info=Download the SMSSync app from smssync.ushahidi.com smssync.timeout=The Android phone associated with "{0}" has not contacted FrontlineSMS for {1} minute(s) [edit] -smssync.info-setup=FrontlineCloud enables you to send messages through your Android phone. In order to do this you will need to:\n\n\ -1. Complete this form to ceate a connection here in FrontlineCloud\n\ +smssync.info-setup=FrontlineSMS enables you to send messages through your Android phone. In order to do this you will need to:\n\n\ +1. Complete this form to ceate a connection here in FrontlineSMS\n\ 2. Download and install [SMSSync from the Android App store](https://play.google.com/store/apps/details?id=org.addhen.smssync&hl=en) to your desired Android phone\n\ 3. Create a new Sync URL within the SMSSync app on your Android phone entering the connection URL and secret. See [The SMSSync Site](http://smssync.ushahidi.com/howto) for more help on this step.\n\n\ -SMSSync connects to your FrontlineCloud connection using a URL and a secret key. The URL will be created when you create the connection (submit this form) and will need to be entered into SMSSync. The Secret key is chosen by you here: +SMSSync connects to your FrontlineSMS connection using a URL and a secret key. The URL will be created when you create the connection (submit this form) and will need to be entered into SMSSync. The Secret key is chosen by you here: smssync.info-send_receive=These options will specify whether you want to both send and receive from your Android phone. If you are unsure, leave both options selected. -smssync.info-timeout=If SMSSync does not contact FrontlineCloud for a certain duration, all messages queued to send on it will be failed. You will be notified if this happens. The default value for this is 60 minutes. +smssync.info-timeout=If SMSSync does not contact FrontlineSMS for a certain duration, all messages queued to send on it will be failed. You will be notified if this happens. The default value for this is 60 minutes. smssync.info-name=Finally you should now name your SMSSync connection, for example ‘Bob’s work Android’. # Messages Tab From 4f4d3a3f0fed7132c96d45788b31fa646e93b6ef Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 17 Apr 2013 17:12:17 +0300 Subject: [PATCH 1216/2668] FIX TOOLS-410 Sitati|Vaneyck : proper display of smssync connection domain name --- .../controllers/frontlinesms2/ConnectionController.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 5e55cacd9..645fc390a 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -14,7 +14,7 @@ class ConnectionController extends ControllerUtils { } def list() { - def url = request.serverPort? "http://${request.serverName}:${request.serverPort}" : request.serverName + def url = "http://${request.serverName == 'localhost' ? '<your-ip-address>' : request.serverName}${request.serverPort? (':' + request.serverPort) : ''}" def fconnectionInstanceList = Fconnection.list(params) def fconnectionInstanceTotal = Fconnection.count() From 93b310d5becd50ce4e4fe6030df8d857196f6a9f Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Thu, 18 Apr 2013 10:23:44 +0300 Subject: [PATCH 1217/2668] TOOLS-319 Return false in getNonNullableFields if configFields is false --- .../domain/frontlinesms2/Fconnection.groovy | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index 831a01138..a872c493c 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -25,11 +25,16 @@ class Fconnection { static getNonnullableConfigFields = { clazz -> def fields = clazz.configFields - if(fields instanceof Map) return fields.getAllValues()?.findAll { field -> !clazz.constraints[field].blank } - else return fields.findAll { field -> - if(!(clazz.metaClass.hasProperty(null, field).type in [Boolean, boolean])) { - !clazz.constraints[field].nullable + if (fields) { + if(fields instanceof Map) return fields.getAllValues()?.findAll { field -> !clazz.constraints[field].blank } + else return fields.findAll { field -> + "beep".execute() + if(!(clazz.metaClass.hasProperty(null, field).type in [Boolean, boolean])) { + !clazz.constraints[field].nullable + } } + } else { + return fields } } From d9ad3ae6c4217656e55982897fc76ce91afc4169 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 18 Apr 2013 11:24:30 +0300 Subject: [PATCH 1218/2668] TOOLS-374 FIX added allowedMethods map to AppInfoController to prevent GET requests from returning a value --- .../controllers/frontlinesms2/AppInfoController.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy index 3279f6a24..3624e77d2 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy @@ -3,6 +3,7 @@ package frontlinesms2 import grails.converters.JSON class AppInfoController { + static allowedMethods = [index: "POST"] def appInfoService def index() { From ef758275029f9d3f81be9e5e00b637b1c86cda04 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 18 Apr 2013 14:21:57 +0300 Subject: [PATCH 1219/2668] Added deploy to local maven repo for do/build_deploy_plugin --- plugins/frontlinesms-core/do/build_deploy_plugin | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 5db90c859..88556e48e 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -30,12 +30,18 @@ mkdir -p $IVY_CACHE_DIR IVY_CACHED_ZIP=$IVY_CACHE_DIR/$NEW_PLUGIN_ZIP_NAME echo "# Removing old plugin from local ivy cache at $IVY_CACHED_ZIP..." rm $IVY_CACHED_ZIP || echo "# Old plugin was not found in ivy cache." - echo "# Deploying to local ivy cache..." cp $NEW_PLUGIN_ZIP_NAME $IVY_CACHED_ZIP - echo "# Plugin built and deployed to local ivy cache." +echo "# Deploying to local maven repository..." +mavenRepoDir=~/.m2/repository/org/grails/plugins/$PLUGIN_NAME/$PLUGIN_VERSION/ +echo "# Creating maven repo dir at $mavenRepoDir..." +mkdir -p $mavenRepoDir +echo "# Deploying to ${mavenRepoDir}$NEW_PLUGIN_ZIP_NAME..." +cp $NEW_PLUGIN_ZIP_NAME $mavenRepoDir +echo "# Deployed to local maven repository." + if [ -n "$M2_DEPLOY" ]; then echo "# deploy core plugin to remote plugin repo" echo "# TODO skip maven deploy for non-SNAPSHOT builds" From 99bc0015725207012e564012af0a2994539a06df Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 18 Apr 2013 15:05:28 +0300 Subject: [PATCH 1220/2668] TOOLS-374 Added TODO to fix hack that prevents GET requests from accessing the AppInfoController --- .../controllers/frontlinesms2/AppInfoController.groovy | 3 ++- plugins/frontlinesms-core/web-app/js/app_info.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy index 3624e77d2..e3886967e 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/AppInfoController.groovy @@ -3,7 +3,8 @@ package frontlinesms2 import grails.converters.JSON class AppInfoController { - static allowedMethods = [index: "POST"] + //FIXME index method should only accept GET requests but POST is set to prevent rendering of blank pages + static allowedMethods = [index: "POST"] def appInfoService def index() { diff --git a/plugins/frontlinesms-core/web-app/js/app_info.js b/plugins/frontlinesms-core/web-app/js/app_info.js index 02331dfd6..6888432a0 100644 --- a/plugins/frontlinesms-core/web-app/js/app_info.js +++ b/plugins/frontlinesms-core/web-app/js/app_info.js @@ -46,6 +46,7 @@ app_info = (function() { } if(!jQuery.isEmptyObject(requestData)) { console.log("requester() :: requestData=" + JSON.stringify(requestData)); + //FIXME Should fix type to GET but POST is set to prevent rendering of blank pages jQuery.ajax({ type:"POST", url:url_root + "appInfo", cache:false, From c19f2d97da0285a52e1fd07417b53284c1126c18 Mon Sep 17 00:00:00 2001 From: ivermac Date: Thu, 18 Apr 2013 15:29:55 +0300 Subject: [PATCH 1221/2668] FIX TOOLS-382 refactored the g:remoteLinks that trigger pop-ups to fsms:popup which have a 'showThinking' image before the modal dialog pops up --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 5 +++++ .../grails-app/views/_system_menu.gsp | 4 ++-- .../views/connection/_connection_list.gsp | 4 ++-- .../views/connection/_selected_connection.gsp | 20 ++++++++----------- .../grails-app/views/contact/_header.gsp | 4 ++-- .../grails-app/views/contact/_menu.gsp | 8 ++++---- .../grails-app/views/message/_menu.gsp | 10 +++++----- .../grails-app/views/search/_header.gsp | 6 +++--- .../grails-app/views/settings/logs.gsp | 4 ++-- 9 files changed, 33 insertions(+), 32 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index efb3f246b..6e67f241d 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -506,6 +506,11 @@ class FsmsTagLib { out << render(template:'/customactivity/step', model:[stepId:att.stepId, type:att.type, body:body]) } + def popup = { att, body -> + att << [onLoading:"showThinking();",onSuccess:"hideThinking(); ${att.method}"] + att.remove('method') + out << g.remoteLink(att,body) + } private def getFields(att) { def fields = att.remove('fields') if(!fields) fields = att.instanceClass?.configFields diff --git a/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp b/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp index 5b697cf2d..0374279a2 100644 --- a/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp @@ -6,9 +6,9 @@
      • - + - +
      diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index da7d4d450..5dd06b5be 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -3,9 +3,9 @@

      • - + - +
      diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp index d2dd239cb..9611cc892 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp @@ -6,10 +6,9 @@ - + - + @@ -17,10 +16,9 @@ - - - - - - - - +<%@ page import="frontlinesms2.ConnectionStatus" %> +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      $(function() { - fconnection_show.update("${c.status}", ${c.id}); + //fconnection_show.update("${c.status}", ${c.id}); }); diff --git a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp index 668892277..b3b7d98d8 100644 --- a/plugins/frontlinesms-core/grails-app/views/settings/general.gsp +++ b/plugins/frontlinesms-core/grails-app/views/settings/general.gsp @@ -13,72 +13,15 @@ - -
      -

      - -

      - - - - - -
    • - -
      • -       -       -       - - - -
    • - -
      • -       -       -       - -       -
      $(function() { - var checkedValues, warningObject, chkboxSelector; basicAuthValidation.enable(); $("#basic-authentication input[name=enabled]").attr("onchange", "basicAuthValidation.toggleFields(this)"); $("#basic-authentication input[type=submit]").attr("onclick", "basicAuthValidation.showErrors()"); - - checkedValues = 0; - chkboxSelector = 'input[name^="routeRule"]'; - warningObject = $(".warning_message"); - warningObject.hide(); - - $(chkboxSelector).each(function() { - if ($(this).is(':checked')) { checkedValues++; } - }); - checkboxChecker(checkedValues, warningObject); - $(chkboxSelector).change(function() { - $($(this)).each(function() { - if ($(this).is(':checked')) { checkedValues++; } - else { checkedValues--; } - }); - checkboxChecker(checkedValues, warningObject); - }); - - function checkboxChecker(checkedValues, warningObject){ - if (checkedValues === 0) { warningObject.html("Warning: You have no rules or phone numbers selected.No messages will be sent. If you wish to send messages, please enable one of the above options").show( "drop", { direction: "up" }, "slow"); - } else { warningObject.html("").hide(); } -} }); diff --git a/plugins/frontlinesms-core/web-app/css/settings.css b/plugins/frontlinesms-core/web-app/css/settings.css index 142338973..7a4ee2c8e 100644 --- a/plugins/frontlinesms-core/web-app/css/settings.css +++ b/plugins/frontlinesms-core/web-app/css/settings.css @@ -20,19 +20,17 @@ #body.settings #body-content #import label[for='importCsvFile'] { font-style:italic; } #body.settings #body-content-container { background-color:white; border-left:1px solid #9e9e9e; } -#body-content.connections .connection { display:table; width:100%; border-bottom:1px solid #9e9e9e; } -#body-content.connections .connection h2 { font-weight:bold; - background-image:url("../images/icons/toggle_plus.png"); background-position:17px center; - background-repeat:no-repeat; padding-left:38px; } -#body-content.connections .connection.selected h2 { background-image:none; } -#body-content.connections .connection.selected .controls { padding:0 17px 17px 17px; text-align:right; } -#body-content.connections .connection .connection-status { font-style:italic; } -#body-content.connections .connection.selected { background-color:#d8e8ef; } +#body-content.connections .connection { width:100%; height:34px; border-bottom:1px solid #dedede; } +#body-content.connections .connection:last-child { border-bottom:0px; } +#body-content.connections .connection-list { width:100%; border-bottom: 1px solid #9e9e9e; } +#body-content.connections .connection h2 { font-weight:bold; line-height: 24px; } #body-content.connections .connection:hover { background-color:#e5eff3; } -#body-content.connections .connection-header { display:table-row; } -#body-content.connections .connection-header > * { display:table-cell; white-space:nowrap; padding:17px; } -#body-content.connections .connection-header > .connection-type { width:100%; } -#body-content.connections .controls { padding:17px; } +#body-content.connections .connection > * { white-space:nowrap; padding:5px 10px 5px 10px; } +#body-content.connections .connection .connection-status { background-repeat:no-repeat; background-position:center; padding-left:30px; } +#body-content.connections .connection .connection-name p { font-size:10px; } +#body-content.connections .controls-container { width:100%; } +#body-content.connections .controls { display:none; text-align:right; } +#body-content.connections .connection:hover > .controls-container .controls { display:block; } #body-content.connections p.no-content { border-bottom:1px solid #9e9e9e; } #body-content.logs th.content { width:100%; } @@ -50,4 +48,10 @@ ul.select.sortable.checklist.no-description.ui-sortable li label { margin: 2px; .grabber { background-image:url("../images/icons/draggable.png"); background-repeat: no-repeat; background-position: 3px 7px; } .warning_message { color:#a61b1b; padding:8px; background-color:#FEF1EC; border:1px solid #CD0A0A; -moz-border-radius: 5px 5px 5px 5px; -ms-border-radius: 5px 5px 5px 5px; -o-border-radius: 5px 5px 5px 5px; -webkit-border-radius: 5px 5px 5px 5px; border-radius: 5px 5px 5px 5px; margin-left: 27px; margin-right: 27px;} -#routing-preferences div.input ul.select.checklist label input[type="checkbox"] { top: 8px; vertical-align: middle; } \ No newline at end of file +#routing-preferences div.input ul.select.checklist label input[type="checkbox"] { top: 8px; vertical-align: middle; } + +.connection-status.CONNECTED { background-image:url('../images/status/green.png'); } +.connection-status.FAILED { background-image: url('../images/status/red.png'); } +.connection-status.NOT_CONNECTED { background-image: url('../images/status/red.png'); } +.connection-status.CONNECTING { background-image: url('../images/status/orange.png'); } +.connection-status.DISABLED { background-image: url('../images/status/grey.png'); } \ No newline at end of file From d531e93b21a0663a89510e6f369625ea68dd99d4 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 18 Apr 2013 17:12:26 +0300 Subject: [PATCH 1224/2668] Fixed binary plugin building in build_deploy_plugin --- .../frontlinesms-core/do/build_deploy_plugin | 67 ++++++++++++------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index c1371286f..a1f77685e 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -3,51 +3,66 @@ set -e # Extract flags binaryFlag="" +buildBinary=false while [[ $1 == "--"* ]]; do if [ "$1" == "--m2-deploy" ]; then echo "# Maven deployment enabled." - M2_DEPLOY=true + m2deploy=true fi if [[ "$1" == "--binary" ]]; then echo "# Building plugin as binary." binaryFlag="--binary" + buildBinary=true fi shift done echo "# extract app name from application.properties..." -PLUGIN_NAME=`ls *GrailsPlugin.groovy | cut -d. -f1 | sed -E -e 's/^(.*)GrailsPlugin$/\1/' | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` -echo "# Extracted plugin name as $PLUGIN_NAME" +pluginName=`ls *GrailsPlugin.groovy | cut -d. -f1 | sed -E -e 's/^(.*)GrailsPlugin$/\1/' | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` +echo "# Extracted plugin name as $pluginName" echo "# extract version from application.properties..." -PLUGIN_VERSION=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") -echo "# Extracted plugin version as $PLUGIN_VERSION" +pluginVersion=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") +echo "# Extracted plugin version as $pluginVersion" rm plugin.xml || echo "# no plugin.xml present" grails --non-interactive clean grails --non-interactive --stacktrace $binaryFlag package-plugin -NEW_PLUGIN_ZIP_NAME=$PLUGIN_NAME-$PLUGIN_VERSION.zip -OLD_PLUGIN_ZIP_NAME=grails-$NEW_PLUGIN_ZIP_NAME -echo "# renaming $OLD_PLUGIN_ZIP_NAME to $NEW_PLUGIN_ZIP_NAME" -mv $OLD_PLUGIN_ZIP_NAME $NEW_PLUGIN_ZIP_NAME -IVY_CACHE_DIR=~/.grails/ivy-cache/org.grails.plugins/$PLUGIN_NAME/zips -mkdir -p $IVY_CACHE_DIR -IVY_CACHED_ZIP=$IVY_CACHE_DIR/$NEW_PLUGIN_ZIP_NAME -echo "# Removing old plugin from local ivy cache at $IVY_CACHED_ZIP..." -rm $IVY_CACHED_ZIP || echo "# Old plugin was not found in ivy cache." -echo "# Deploying to local ivy cache..." -cp $NEW_PLUGIN_ZIP_NAME $IVY_CACHED_ZIP -echo "# Plugin built and deployed to local ivy cache." +if $buildBinary; then + oldPackageName=target/grails-plugin-$pluginName-$pluginVersion.jar + newPackageName=$pluginName-$pluginVersion.jar +else + newPackageName=$pluginName-$pluginVersion.zip + oldPackageName=grails-$newPackageName +fi + +echo "# renaming $oldPackageName to $newPackageName" +mv $oldPackageName $newPackageName + +if $buildBinary; then + echo "..." +else + ivyCacheDir=~/.grails/ivy-cache/org.grails.plugins/$pluginName/zips + mkdir -p $ivyCacheDir + ivyCachedZip=$ivyCacheDir/$newPackageName + echo "# Removing old plugin from local ivy cache at $ivyCachedZip..." + rm $ivyCachedZip || echo "# Old plugin was not found in ivy cache." + echo "# Deploying to local ivy cache..." + cp $newPackageName $ivyCachedZip + echo "# Plugin built and deployed to local ivy cache." + +fi +mavenFileName="$newPackageName" echo "# Deploying to local maven repository..." -mavenRepoDir=~/.m2/repository/org/grails/plugins/$PLUGIN_NAME/$PLUGIN_VERSION/ +mavenRepoDir=~/.m2/repository/org/grails/plugins/$pluginName/$pluginVersion/ echo "# Creating maven repo dir at $mavenRepoDir..." mkdir -p $mavenRepoDir -echo "# Deploying to ${mavenRepoDir}$NEW_PLUGIN_ZIP_NAME..." -cp $NEW_PLUGIN_ZIP_NAME $mavenRepoDir +echo "# Deploying to ${mavenRepoDir}$mavenFileName" +cp $mavenFileName $mavenRepoDir echo "# Deployed to local maven repository." -if [ -n "$M2_DEPLOY" ]; then +if [ -n "$m2deploy" ]; then echo "# deploy core plugin to remote plugin repo" echo "# TODO skip maven deploy for non-SNAPSHOT builds" echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" @@ -56,11 +71,11 @@ hash user m2repo $FRONTLINESMS_MAVEN_PASSWORD mkdir org mkdir org/grails/plugins -mkdir org/grails/plugins/$PLUGIN_NAME -cd org/grails/plugins/$PLUGIN_NAME -mkdir $PLUGIN_VERSION -cd $PLUGIN_VERSION -put $NEW_PLUGIN_ZIP_NAME +mkdir org/grails/plugins/$pluginName +cd org/grails/plugins/$pluginName +mkdir $pluginVersion +cd $pluginVersion +put $mavenFileName exit EOF echo "# Plugin deployed to remote maven repo." From 1f3edafcc2aee1ba726896df6b826ed8a592f285 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Thu, 18 Apr 2013 17:41:10 +0300 Subject: [PATCH 1225/2668] CORE-1965 Updated tests --- .../settings/GeneralSettingsSpec.groovy | 13 ----- .../settings/PageConnectionSettings.groovy | 13 +++++ .../settings/PageGeneralSettings.groovy | 13 ----- .../settings/PhonesAndConnectionsFSpec.groovy | 15 +++++- .../ConnectionControllerSpec.groovy | 52 ++++++++++++++++++- .../controllers/SettingsControllerSpec.groovy | 45 +--------------- 6 files changed, 79 insertions(+), 72 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy index 8aeeb158e..259b215e6 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/GeneralSettingsSpec.groovy @@ -12,17 +12,4 @@ class GeneralSettingsSpec extends grails.plugin.geb.GebSpec { databaseBackup.title == 'configuration location' databaseBackup.instruction.contains('database') } - - def 'Saving routing preferences persists the changes'(){ - when: - to PageGeneralSettings - then: - routing.useLastReceivedConnection.@checked - when: - routing.useLastReceivedConnection.click() - routing.save.click() - then: - waitFor { at PageGeneralSettings } - !routing.useLastReceivedConnection.@checked - } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy index b13b98ec0..8a20cfcc6 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy @@ -12,5 +12,18 @@ class PageConnectionSettings extends PageSettings { btnNewConnection { $('a', name:'addConnection') } connectionNames { $('.connection-header').find('h2') } connections { $('.connection') } + routing { module RoutingConnections } } } + +class RoutingConnections extends geb.Module { + static base = { $('#routing-preferences') } + + static content = { + routingForm { $('form#routing-form') } + useLastReceivedConnection { $('input[type=checkbox]', value:'uselastreceiver') } + useAnyAvailableConnection { $('input[name=otherwise]', value:'any') } + dontSend { $('input[name=otherwise]', value:'dontsend') } + save { $("input#saveRoutingDetails") } + } +} \ No newline at end of file diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy index 718a8fbd8..75ff39b3b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageGeneralSettings.groovy @@ -15,7 +15,6 @@ class PageGeneralSettings extends PageSettings { errors(required:false) { $('label.error') } basicAuthentication { module BasicAuthentication } databaseBackup { module DatabaseBackup } - routing { module RoutingConnections } } static at = { title.contains('Settings') || title.contains('Mazingira') @@ -38,15 +37,3 @@ class BasicAuthentication extends geb.Module { save { $('input#submit') } } } - -class RoutingConnections extends geb.Module { - static base = { $('#routing-preferences') } - - static content = { - routingForm { $('form#routing-form') } - useLastReceivedConnection { $('input[type=checkbox]', value:'uselastreceiver') } - useAnyAvailableConnection { $('input[name=otherwise]', value:'any') } - dontSend { $('input[name=otherwise]', value:'dontsend') } - save { $("input#saveRoutingDetails") } - } -} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy index 7c34b41b5..8446ff806 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy @@ -32,7 +32,20 @@ class PhonesAndConnectionsFSpec extends grails.plugin.geb.GebSpec { go 'connection/list' then: at PageConnectionSettings - (/http:\/\/you-ip-address\/frontlinesms-core\/api\/.*\/smssync\// =~ connections[2].children().text()[2]) + connections[2].text().contains("http:///frontlinesms-core/api/1") + } + + def 'Saving routing preferences persists the changes'(){ + when: + to PageConnectionSettings + then: + routing.useLastReceivedConnection.@checked + when: + routing.useLastReceivedConnection.click() + routing.save.click() + then: + waitFor { at PageConnectionSettings } + !routing.useLastReceivedConnection.@checked } def createTestConnections() { diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy index 737deb255..c6cecea4c 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy @@ -5,8 +5,15 @@ import frontlinesms2.* import spock.lang.* @TestFor(ConnectionController) -@Mock([Fconnection, FconnectionService, SystemNotification]) +@Mock([Fconnection, FconnectionService, SystemNotification, AppSettingsService, Fconnection, SmslibFconnection]) class ConnectionControllerSpec extends Specification { + def appSettingsService + + def setup() { + appSettingsService = Mock(AppSettingsService) + controller.appSettingsService = appSettingsService + } + def "test that createRoute actually calls FconnectionService"() { setup: def routesTriggered = [] @@ -44,6 +51,49 @@ class ConnectionControllerSpec extends Specification { ConnectionStatus.CONNECTING, ConnectionStatus.FAILED] } + def 'can set the routing preferences'(){ + given: + params.routingUseOrder = "uselastreceiver" + when: + controller.changeRoutingPreferences() + then: + 1 * appSettingsService.set('routing.use','uselastreceiver') + 0 * appSettingsService.set(_, _) + } + + def "can set routing rules available connections"() { + given: + params.routingUseOrder = "uselastreceiver,fconnection-1,fconnection-3,fconnection-5" + when: + controller.changeRoutingPreferences() + then: + 1 * appSettingsService.set('routing.use','uselastreceiver,fconnection-1,fconnection-3,fconnection-5') + } + + def "can retrieve routing rules defined for connections with send enabled"() { + given: + def conn1 = new SmslibFconnection(name:"Huawei Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) + def conn2 = new SmslibFconnection(name:"COM4", port:'COM4', baud:9600).save(failOnError:true) + new SmslibFconnection(name:"COM5", port:'COM5', baud:9600, sendEnabled:false).save(failOnError:true) + controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-${conn1.id}"] + when: + def model = controller.list() + then: + model.fconnectionRoutingMap*.key*.toString() == ["uselastreceiver", conn2, conn1]*.toString() + model.fconnectionRoutingMap*.value == [true,true,true] + } + + def "should not display routing rules for devices that have been deleted from the system"() { + given: + def conn1 = new SmslibFconnection(name:"Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) + def conn2 = new SmslibFconnection(name:"COM5", port:'COM4', baud:9600).save(failOnError:true) + controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-3,fconnection-${conn1.id}"] + when: + def model = controller.list() + then: + model.fconnectionRoutingMap*.key*.toString() == ['uselastreceiver', conn2, conn1]*.toString() + } + private def buildTestConnection(status) { def c = new Fconnection(name:'test').save(failOnError:true) def fconnectionService = Mock(FconnectionService) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy index 477513b07..8c9daca73 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/SettingsControllerSpec.groovy @@ -7,7 +7,7 @@ import grails.test.mixin.* import org.codehaus.groovy.grails.orm.hibernate.cfg.* @TestFor(SettingsController) -@Mock([LogEntry, AppSettingsService, Fconnection, SmslibFconnection]) +@Mock([LogEntry, AppSettingsService]) class SettingsControllerSpec extends Specification { def TEST_DATE = new Date() @@ -78,49 +78,6 @@ class SettingsControllerSpec extends Specification { 0 * appSettingsService.set(_, _) } - def 'can set the routing preferences'(){ - given: - params.routingUseOrder = "uselastreceiver" - when: - controller.changeRoutingPreferences() - then: - 1 * appSettingsService.set('routing.use','uselastreceiver') - 0 * appSettingsService.set(_, _) - } - - def "can set routing rules available connections"() { - given: - params.routingUseOrder = "uselastreceiver,fconnection-1,fconnection-3,fconnection-5" - when: - controller.changeRoutingPreferences() - then: - 1 * appSettingsService.set('routing.use','uselastreceiver,fconnection-1,fconnection-3,fconnection-5') - } - - def "can retrieve routing rules defined for connections with send enabled"() { - given: - def conn1 = new SmslibFconnection(name:"Huawei Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) - def conn2 = new SmslibFconnection(name:"COM4", port:'COM4', baud:9600).save(failOnError:true) - new SmslibFconnection(name:"COM5", port:'COM5', baud:9600, sendEnabled:false).save(failOnError:true) - controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-${conn1.id}"] - when: - def model = controller.general() - then: - model.fconnectionRoutingMap*.key*.toString() == ["uselastreceiver", conn2, conn1]*.toString() - model.fconnectionRoutingMap*.value == [true,true,true] - } - - def "should not display routing rules for devices that have been deleted from the system"() { - given: - def conn1 = new SmslibFconnection(name:"Modem", port:'/dev/cu.HUAWEIMobile-Modem', baud:9600, pin:'1234').save(failOnError:true) - def conn2 = new SmslibFconnection(name:"COM5", port:'COM4', baud:9600).save(failOnError:true) - controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-3,fconnection-${conn1.id}"] - when: - def model = controller.general() - then: - model.fconnectionRoutingMap*.key*.toString() == ['uselastreceiver', conn2, conn1]*.toString() - } - private def mockAppSettings(Map s) { s.each { k, v -> appSettingsService.get(k, _) >> { v instanceof String? v.bytes.encodeBase64().toString(): v } From 64d1e76ada85fe1f17b6bf9ef92444cd8ebdbd88 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 19 Apr 2013 10:38:31 +0300 Subject: [PATCH 1226/2668] TOOLS-319 Rename read field to viewed and create accessors to keep backward compatibility --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 926e577ce..3ee0de68b 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -18,7 +18,7 @@ class Fmessage { String inboundContactName String outboundContactName - boolean read + boolean viewed boolean starred boolean archived boolean isDeleted @@ -405,5 +405,13 @@ class Fmessage { def clearAllDetails() { this.details?.clear() } + + def getRead() { + return viewed + } + + def setRead(boolean read) { + viewed = read + } } From 481d1f4bbf50c4a45b807c8985a2f58a6f6db34b Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 19 Apr 2013 11:08:09 +0300 Subject: [PATCH 1227/2668] TOOLS-319 Revert to read from viewed field --- .../grails-app/domain/frontlinesms2/Fmessage.groovy | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy index 3ee0de68b..926e577ce 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fmessage.groovy @@ -18,7 +18,7 @@ class Fmessage { String inboundContactName String outboundContactName - boolean viewed + boolean read boolean starred boolean archived boolean isDeleted @@ -405,13 +405,5 @@ class Fmessage { def clearAllDetails() { this.details?.clear() } - - def getRead() { - return viewed - } - - def setRead(boolean read) { - viewed = read - } } From ad21332171391ce7187cecee68afa7b38185c358 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 19 Apr 2013 16:24:49 +0300 Subject: [PATCH 1228/2668] CORE-1965 Fixed functional test ConnectionFSpec --- .../views/connection/_connection.gsp | 2 +- .../views/connection/_selected_connection.gsp | 52 ++++++++++++++- .../connection/ConnectionDialog.groovy | 2 +- .../connection/ConnectionFSpec.groovy | 63 ++++++++----------- .../connection/PageConnection.groovy | 21 ++++--- .../web-app/css/settings.css | 2 +- .../web-app/js/fconnection.js | 3 +- 7 files changed, 95 insertions(+), 50 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp index 56c4168e1..aab5586a7 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -1,4 +1,4 @@ - + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp index 4e5af7ff6..6ec4d2963 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp @@ -33,9 +33,59 @@ + + + + + + + + + + + $(function() { - //fconnection_show.update("${c.status}", ${c.id}); + fconnection_show.update("${c.status}", ${c.id}); }); diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy index 439f991fc..157e8d7eb 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionDialog.groovy @@ -4,7 +4,7 @@ import frontlinesms2.popup.MediumPopup class ConnectionDialog extends MediumPopup { static at = { - popupTitle.contains('connection') + popupTitle.contains('connection') || popupTitle.contains("edit") } static content = { connectionType { $("input[name=connectionType]") } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy index 43ed5009e..5cdfb4990 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy @@ -8,68 +8,66 @@ import frontlinesms2.dev.MockModemUtils import serial.mock.MockSerial import serial.mock.CommPortIdentifier +import spock.lang.* class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'When there are no connections, this is explained to the user'() { when: to PageConnection then: - connectionList.displayed - connectionList.text()?.contains('You have no connections configured.') + btnNewConnection.displayed + noContent?.text().contains('You have no connections configured.') } def 'There is a Failed label shown for failed connection'() { when: to PageConnection, createSecondTestEmailConnection() then: - connectionList.status == "Failed" + connectionList.status(0).jquery.hasClass("FAILED") } def 'There is a Disabled label shown for disabled connection'() { when: to PageConnection, createTestEmailConnection() then: - connectionList.status == "Disabled" + connectionList.status(0).jquery.hasClass("DISABLED") } def 'there is a DELETE button shown for inactive connection'() { when: to PageConnection, createTestEmailConnection() then: - connectionList.btnDelete.displayed + connectionList.btnDelete(0).displayed } def 'should show "create route" button for inactive connection'() { when: to PageConnection, createTestEmailConnection() then: - connectionList.btnEnableRoute.displayed + connectionList.btnEnableRoute(0).displayed } def 'DELETE button should remove selected fconnection from the list'() { given: to PageConnection, createTestEmailConnection() when: - connectionList.btnDelete.click() + connectionList.btnDelete(0).click() then: waitFor { notifications.flashMessageText.contains("Connection test email connection was deleted.") } - connectionList.text()?.contains('You have no connections configured.') + noContent.displayed + noContent.text().contains('You have no connections configured.') } def 'Send test message button for particular connection displayed on a successfully created route'() { given: def testConnection = createTestSmsConnection() - SmslibFconnection.build(name:"test modem", port:"COM2", baud:11200) when: to PageConnection, testConnection - waitFor { connectionList.btnEnableRoute.displayed } - then: - !connectionList.btnTestRoute.displayed - when: - connectionList.btnEnableRoute.click() + waitFor { connectionList.displayed } + connectionList.btnEnableRoute(0).click() then: - waitFor('very slow') { connectionList.status == "Connected" } - waitFor { connectionList.btnTestRoute.displayed } + waitFor('slow') { connectionList.btnTestRoute(0).displayed } + waitFor { connectionList.status(0).jquery.hasClass("CONNECTED") } } def 'delete button is not displayed for a connected Fconnection'() { @@ -77,23 +75,16 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { def c = createTestEmailConnection() when: to PageConnection, c - connectionList.btnEnableRoute.click() - then: - waitFor('very slow') { connectionList.status == "Connected" } - !connectionList.btnDelete.displayed - } - - def 'The first connection in the connection list page is selected'() { - when: - to PageConnection, createTestEmailConnection() + connectionList.btnEnableRoute(0).click() then: - connectionList.selectedConnection.size() == 1 + waitFor('very slow') { connectionList.status(0).jquery.hasClass("CONNECTED") } + !connectionList.btnDelete(0).displayed } def 'creating a new fconnection adds the connection to the connections list'() { given: to PageConnection - assert connectionList.connection.size() == 0 + assert noContent.displayed when: launchCreateWizard() next.click() @@ -109,8 +100,8 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { submit.click() then: at PageConnection - waitFor { connectionList.selectedConnection.text()?.contains('name') } - connectionList.connection.size() == 1 + waitFor { connectionList.connectionName(0).contains('name') } + connectionList.listSize() == 1 } /* FIXME TODO FIXME TODO make this work reliably. Prizes on offer. @@ -173,7 +164,7 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { then: at PageConnection and: - waitFor { connectionList.selectedConnection.text()?.contains('Henry') } + waitFor { connectionList.connectionName(0).contains('Henry') } } def 'can set up a new IntelliSMS account'() { @@ -192,18 +183,18 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { submit.click() then: at PageConnection - waitFor { connectionList.selectedConnection.text()?.contains('New IntelliSMS Connection') } + waitFor { connectionList.connectionName(0).contains('New IntelliSMS Connection') } } def 'clicking Send test message displays a popup with a default message and empty address field'() { given: to PageConnection, createTestEmailConnection() when: - connectionList.btnEnableRoute.click() + connectionList.btnEnableRoute(0).click() then: - waitFor('slow') {connectionList.btnTestRoute.displayed} + waitFor('slow') { connectionList.btnTestRoute(0).displayed } when: - connectionList.btnTestRoute.click() + connectionList.btnTestRoute(0).click() then: waitFor { at TestMessagePopup } addresses == '' @@ -241,8 +232,8 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { private def startBadConnection() { def connectionId = SmslibFconnection.findByName('Bad Port').id to PageConnection, connectionId - waitFor { connectionList.btnEnableRoute.displayed } - connectionList.btnEnableRoute.click() + waitFor { connectionList.btnEnableRoute(0).displayed } + connectionList.btnEnableRoute(0).click() } private def launchCreateWizard(def type=null) { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index e1a01769e..3009dbb21 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -14,6 +14,7 @@ class PageConnection extends PageBase { static content = { connectionList { module ConnectionList } + noContent { $("div#body-content p.no-content") } btnNewConnection(wait:true) { $(".btn", text: 'Add new connection') } connectionFailedFlashMessageEditButton { // technically not tied to this page - could be defined elsewhere if useful notifications.systemNotification.find('a', text:'edit') @@ -22,16 +23,18 @@ class PageConnection extends PageBase { } class ConnectionList extends Module { - static base = { $('div#body-content.connections') } + static base = { $('div#body-content .connection-list') } static content = { - connection(required:false) { $("li.connection") } - selectedConnection(required:false) { $("li.connection.selected") } - btnEnableRoute(wait:true) { $(".btn", text:'Enable') } - btnRetryConnection(wait:true) { $(".btn", text:'Retry Connection') } - btnDisableRoute(wait:true) { $(".btn", text:'Disable') } - btnDelete(required:false) { $('.btn', text:'Delete Connection') } - btnTestRoute(required:false) { $('.btn', text:'Send test message') } - status { $('p.connection-status').text() } + listSize { $("tbody tr.connection").size() } + connection { i=0 -> $('tbody tr.connection', i) } + hoverOn { i -> connection(i).find(".controls").jquery.show() } + connectionName { i-> connection(i).find("td.connection-name").text() } + btnEnableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'Enable') } + btnRetryConnection(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'Retry') } + btnDisableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'Disable') } + btnDelete(required:false) { i -> hoverOn(i) ; connection(i).find('.btn', text:'Delete') } + btnTestRoute(required:false) { i -> hoverOn(i) ; connection(i).find('.btn', text:'Send test message') } + status { i -> connection(i).find('td.connection-status') } } } diff --git a/plugins/frontlinesms-core/web-app/css/settings.css b/plugins/frontlinesms-core/web-app/css/settings.css index 7a4ee2c8e..f42e9152e 100644 --- a/plugins/frontlinesms-core/web-app/css/settings.css +++ b/plugins/frontlinesms-core/web-app/css/settings.css @@ -54,4 +54,4 @@ ul.select.sortable.checklist.no-description.ui-sortable li label { margin: 2px; .connection-status.FAILED { background-image: url('../images/status/red.png'); } .connection-status.NOT_CONNECTED { background-image: url('../images/status/red.png'); } .connection-status.CONNECTING { background-image: url('../images/status/orange.png'); } -.connection-status.DISABLED { background-image: url('../images/status/grey.png'); } \ No newline at end of file +.connection-status.DISABLED { background-image: url('../images/status/grey.png'); } diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index bfa763884..04b1c61cd 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -1,6 +1,7 @@ fconnection_show = (function() { var update = function(status, id) { - $("#body-content.connections .selected .connection-status").text(i18n("connectionstatus." + status.toLowerCase())); + $("#body-content.connections .selected .connection-status").attr("class", "connection-status "+status); + console.log($("#body-content.connections .selected .connection-status").attr("class")); sanchez.replaceContent("#body-content.connections .selected .controls", "fconnection-controls-" + status, { connectionId:id }); }; return { From 7117aea4e0f1b26e1de75ef75d7dc35eca06e557 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 19 Apr 2013 16:42:24 +0300 Subject: [PATCH 1229/2668] okal | TOOLS-319 Remove beep.execute from Fconnection --- .../grails-app/domain/frontlinesms2/Fconnection.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index a872c493c..a1c461c51 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -28,7 +28,6 @@ class Fconnection { if (fields) { if(fields instanceof Map) return fields.getAllValues()?.findAll { field -> !clazz.constraints[field].blank } else return fields.findAll { field -> - "beep".execute() if(!(clazz.metaClass.hasProperty(null, field).type in [Boolean, boolean])) { !clazz.constraints[field].nullable } From cc78294b777abc357781a569e08a55cc4218c6f2 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 19 Apr 2013 16:58:23 +0300 Subject: [PATCH 1230/2668] CORE-1965 WIP Fixed unit tests --- .../controllers/frontlinesms2/ConnectionController.groovy | 1 - .../frontlinesms2/controllers/ConnectionControllerSpec.groovy | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index e329e1e03..a3e9f3570 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -27,7 +27,6 @@ class ConnectionController extends ControllerUtils { fconnectionRoutingMap:fconnectionRoutingMap, appSettings:appSettings] if(params?.id) { - model << show() render view:'show', model:model } else { params.id = fconnectionInstanceList[0]?.id diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy index c6cecea4c..465381e9d 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy @@ -77,7 +77,7 @@ class ConnectionControllerSpec extends Specification { new SmslibFconnection(name:"COM5", port:'COM5', baud:9600, sendEnabled:false).save(failOnError:true) controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-${conn1.id}"] when: - def model = controller.list() + controller.list() then: model.fconnectionRoutingMap*.key*.toString() == ["uselastreceiver", conn2, conn1]*.toString() model.fconnectionRoutingMap*.value == [true,true,true] @@ -89,7 +89,7 @@ class ConnectionControllerSpec extends Specification { def conn2 = new SmslibFconnection(name:"COM5", port:'COM4', baud:9600).save(failOnError:true) controller.appSettingsService = ['routing.use':"uselastreceiver,fconnection-${conn2.id},fconnection-3,fconnection-${conn1.id}"] when: - def model = controller.list() + controller.list() then: model.fconnectionRoutingMap*.key*.toString() == ['uselastreceiver', conn2, conn1]*.toString() } From 29032bfca24ddaeb38e600878c12d9525ba2a2a4 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 19 Apr 2013 17:51:35 +0300 Subject: [PATCH 1231/2668] Updated plugin version to 3.0 for deployment --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 029d40960..803804be8 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,4 +3,4 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=3.0-SNAPSHOT +app.version=3.0 From 1a25f944f8db3d45a549e48ffcb6776e362532b8 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 19 Apr 2013 18:10:58 +0300 Subject: [PATCH 1232/2668] Removed bad commit references from FsmsTagLib --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index fd86b6491..e43c9e4ef 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -323,14 +323,11 @@ class FsmsTagLib { out << g.checkBox(att) } else out << g.textField(att) out << body() -<<<<<<< HEAD } else if(att.instanceClass.configFields) { out << "
      ${g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}")}
      " -======= } else { def val = g.message(code:"${att.instance?.class?.shortName?:instanceClass?.shortName?:'connection'}.${groovyKey}").markdownToHtml() out << "
      ${val}
      " ->>>>>>> master } if(att.list) out << "" else if(att.table) { From 40233a5bf77b5c0c361fe8586e7cd948385987a3 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Sat, 20 Apr 2013 21:11:12 +0300 Subject: [PATCH 1233/2668] Removed git conflict markers in swahili translation file --- .../frontlinesms-core/grails-app/i18n/messages_sw.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties index 5a017c10a..3711b21b5 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_sw.properties @@ -379,10 +379,6 @@ layout.settings.header=Mazingira activities.header=Vitendo activities.create=Chagua kitendo kipya folder.header=Folda -<<<<<<< HEAD - -======= ->>>>>>> master folder.create=Chagua folda mpya folder.label=Folda message.folder.header=Folda ya {0} From 162c787b03f1aff703615a7c67ac317fde084ac9 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 24 Apr 2013 17:08:56 +0300 Subject: [PATCH 1234/2668] Updated build_deploy_plugin to allow for binary builds with grails version marked. --- plugins/frontlinesms-core/do/build_deploy_plugin | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index a1f77685e..1fc5d55ad 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -17,11 +17,19 @@ while [[ $1 == "--"* ]]; do shift done +echo "# Extracting grails version from application.properties..." +grailsVersion=$(grep 'app\.grails\.version=' application.properties | cut -d= -f2) +echo "# Grails version is $grailsVersion" + echo "# extract app name from application.properties..." pluginName=`ls *GrailsPlugin.groovy | cut -d. -f1 | sed -E -e 's/^(.*)GrailsPlugin$/\1/' | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` echo "# Extracted plugin name as $pluginName" echo "# extract version from application.properties..." +if $buildBinary; then + echo "# Changing plugin version to include binary and grails version in the name." + sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-SNAPSHOT)['\"]\s*$/\tdef version = \"\1-binary-$grailsVersion\2\"/g" *GrailsPlugin.groovy +fi pluginVersion=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") echo "# Extracted plugin version as $pluginVersion" rm plugin.xml || echo "# no plugin.xml present" From 63bcf55042fad67efbd275449eec4abebe504bf0 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 26 Apr 2013 14:45:22 +0300 Subject: [PATCH 1235/2668] FIX TOOLS-438 added a script to check if there are g:remoteLinks that trigger popups, when cliked editing connection in button now displays the a loading image and refactored fsms:popup taglib to use attribute popupCall instead of method --- .../do/check_for_loading_image_in_popups | 13 +++++++++++++ .../taglib/frontlinesms2/FsmsTagLib.groovy | 4 ++-- .../grails-app/views/_system_menu.gsp | 2 +- .../views/connection/_connection_list.gsp | 2 +- .../views/connection/_selected_connection.gsp | 18 +++++++++--------- .../grails-app/views/contact/_header.gsp | 4 ++-- .../grails-app/views/contact/_menu.gsp | 4 ++-- .../views/contact/_multiple_contact_view.gsp | 4 ++-- .../views/contact/_single_contact_view.gsp | 8 ++++---- .../grails-app/views/message/_menu.gsp | 4 ++-- .../views/message/_single_message_details.gsp | 4 ++-- .../grails-app/views/search/_header.gsp | 2 +- .../grails-app/views/settings/logs.gsp | 2 +- 13 files changed, 42 insertions(+), 29 deletions(-) create mode 100755 plugins/frontlinesms-core/do/check_for_loading_image_in_popups diff --git a/plugins/frontlinesms-core/do/check_for_loading_image_in_popups b/plugins/frontlinesms-core/do/check_for_loading_image_in_popups new file mode 100755 index 000000000..2ac155cd7 --- /dev/null +++ b/plugins/frontlinesms-core/do/check_for_loading_image_in_popups @@ -0,0 +1,13 @@ +#!/bin/bash + +#check for onSuccess attributes whose values are the popups; any results being printed means fsms:popup isn't being used +echo "# Checking for popups that dont have loading image" +grep -r "onSuccess=" grails-app/views/ | grep -vn "formRemote\|fsms:wizard" | grep -r "launch.*Popup\|launch.*Wizard" +VIEW_OUTPUT=$? +if [ "$VIEW_OUTPUT" -eq 1 ]; then + echo "# Popups above have a loading image" + exit 0 +else + echo "# Popups above DON'T have a loading image" + exit 1 +fi diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index c17fe581e..165c08a0e 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -513,8 +513,8 @@ class FsmsTagLib { } def popup = { att, body -> - att << [onLoading:"showThinking();",onSuccess:"hideThinking(); ${att.method}"] - att.remove('method') + att << [onLoading:"showThinking();",onSuccess:"hideThinking(); ${att.popupCall}"] + att.remove('popupCall') out << g.remoteLink(att,body) } private def getFields(att) { diff --git a/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp b/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp index 0374279a2..e0604d356 100644 --- a/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_system_menu.gsp @@ -6,7 +6,7 @@
    • - +
      • diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp index f1cb14d6f..936d79982 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp @@ -3,7 +3,7 @@

      • - +
        • diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp index 78f960001..570050505 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp @@ -11,9 +11,9 @@ - + - + @@ -21,10 +21,10 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -48,7 +48,7 @@ + + + + + + + + + + + +$(function() { + + fconnection_show.update("${c.status}", ${c.id}); + +}); + + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp deleted file mode 100644 index 570050505..000000000 --- a/plugins/frontlinesms-core/grails-app/views/connection/_selected_connection.gsp +++ /dev/null @@ -1,87 +0,0 @@ -<%@ page import="frontlinesms2.ConnectionStatus" %> -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        - - - - - - - - - - - - - -$(function() { - fconnection_show.update("${c.status}", ${c.id}); -}); - - diff --git a/plugins/frontlinesms-core/web-app/css/settings.css b/plugins/frontlinesms-core/web-app/css/settings.css index f42e9152e..a585c0672 100644 --- a/plugins/frontlinesms-core/web-app/css/settings.css +++ b/plugins/frontlinesms-core/web-app/css/settings.css @@ -28,9 +28,8 @@ #body-content.connections .connection > * { white-space:nowrap; padding:5px 10px 5px 10px; } #body-content.connections .connection .connection-status { background-repeat:no-repeat; background-position:center; padding-left:30px; } #body-content.connections .connection .connection-name p { font-size:10px; } -#body-content.connections .controls-container { width:100%; } -#body-content.connections .controls { display:none; text-align:right; } -#body-content.connections .connection:hover > .controls-container .controls { display:block; } +#body-content.connections .controls { visibility:hidden; text-align:right; } +#body-content.connections .connection:hover > .controls { visibility:visible; } #body-content.connections p.no-content { border-bottom:1px solid #9e9e9e; } #body-content.logs th.content { width:100%; } diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index 04b1c61cd..809e417d5 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -1,8 +1,8 @@ fconnection_show = (function() { var update = function(status, id) { - $("#body-content.connections .selected .connection-status").attr("class", "connection-status "+status); - console.log($("#body-content.connections .selected .connection-status").attr("class")); - sanchez.replaceContent("#body-content.connections .selected .controls", "fconnection-controls-" + status, { connectionId:id }); + var containerSelecter = "#connection-" + id; + $(containerSelecter + " .connection-status").attr("class", "connection-status " + status); + sanchez.replaceContent(containerSelecter + " .controls", "fconnection-controls-" + status, { connectionId:id }); }; return { update:update From 26f69d00d17ae32a38a668918ea2a5396f19fb97 Mon Sep 17 00:00:00 2001 From: ivermac Date: Tue, 7 May 2013 17:40:11 +0300 Subject: [PATCH 1280/2668] FIX TOOLS-400 The colored dot in the status tab disappears and re-appears, seemingly at random. --- .../frontlinesms-core/grails-app/views/_includes.gsp | 3 +++ .../frontlinesms-core/web-app/js/status_indicator.js | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 0c9348a72..5c887d0b5 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -16,6 +16,9 @@ var console = console || {}; console.log = console.log || function() {}; + var nextImage = new Image(); + nextImage.src = "${resource(dir:'images', file:'status/red.png')}"; + diff --git a/plugins/frontlinesms-core/web-app/js/status_indicator.js b/plugins/frontlinesms-core/web-app/js/status_indicator.js index 1108d03f5..6b7518df8 100644 --- a/plugins/frontlinesms-core/web-app/js/status_indicator.js +++ b/plugins/frontlinesms-core/web-app/js/status_indicator.js @@ -2,13 +2,9 @@ var StatusIndicator = function() { var _failureCount = 0, _updateLight = function(color) { var statusIndicator = $('#status-indicator'); - if (color) { - statusIndicator.removeClass('green'); - statusIndicator.removeClass('red'); - statusIndicator.addClass(color); - } else { - statusIndicator.removeClass().addClass('indicator red'); - } + statusIndicator.removeClass('green'); + statusIndicator.removeClass('red'); + statusIndicator.addClass(color); statusIndicator.show(); }, _getConnectionLostNotification = function() { From 16d77483d75144fea7b71dbaed757ac2f2b9a92c Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Tue, 7 May 2013 17:55:32 +0300 Subject: [PATCH 1281/2668] TOOLS-486 fixed appinfo updating of connections list. --- .../frontlinesms2/ConnectionController.groovy | 8 +----- .../{_connection_list.gsp => list.gsp} | 18 +++++++++++- .../grails-app/views/connection/show.gsp | 28 ------------------- .../frontlinesms2/CoreAppInfoProviders.groovy | 7 +++-- .../web-app/js/fconnection.js | 2 +- 5 files changed, 23 insertions(+), 40 deletions(-) rename plugins/frontlinesms-core/grails-app/views/connection/{_connection_list.gsp => list.gsp} (89%) delete mode 100644 plugins/frontlinesms-core/grails-app/views/connection/show.gsp diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 4f5df4e96..39814ad64 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -28,17 +28,11 @@ class ConnectionController extends ControllerUtils { withFconnection { model << [connectionInstance: it] } - model << [connectionInstanceList:fconnectionInstanceList, + [connectionInstanceList:fconnectionInstanceList, fconnectionInstanceTotal:fconnectionInstanceTotal, fconnectionRoutingMap:fconnectionRoutingMap, appSettings:appSettings, serverUrl:"${url}"] - if(params?.id) { - render view:'show', model:model - } else { - params.id = fconnectionInstanceList[0]?.id - render view:'show', model:model - } } def wizard() { diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp b/plugins/frontlinesms-core/grails-app/views/connection/list.gsp similarity index 89% rename from plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp rename to plugins/frontlinesms-core/grails-app/views/connection/list.gsp index 4c7858cf5..e88d7a3a6 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection_list.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/list.gsp @@ -1,4 +1,10 @@ <%@ page import="frontlinesms2.ConnectionStatus" %> + + + + <g:message code="connection.header"/> ${connectionInstance?.name} + +

        @@ -77,8 +83,18 @@ $(function() { - fconnection_show.update("${c.status}", ${c.id}); + fconnection_list.update("${c.status}", ${c.id}); + app_info.listen("fconnection_statuses", function(data) { + var i; + data = data.fconnection_statuses; + if(!data) { return; } + for(i=data.length-1; i>=0; --i) { + fconnection_list.update(data[i].status, data[i].id); + } + }); }); + + diff --git a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp b/plugins/frontlinesms-core/grails-app/views/connection/show.gsp deleted file mode 100644 index 90ae761ae..000000000 --- a/plugins/frontlinesms-core/grails-app/views/connection/show.gsp +++ /dev/null @@ -1,28 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"; import="frontlinesms2.ConnectionStatus"%> - - - - <g:message code="connection.header"/> ${connectionInstance?.name} - - <%-- Could just replace params.createRoute and params.connecting with a check for connectionInstance.status --%> - - $(function() { - app_info.listen("connection_show", { id:${params.id} }, function(data) { - console.log("connection_show.callback :: data=" + JSON.stringify(data)); - data = data.connection_show; - if(!data) { return; } - if(data.status !== "CONNECTING") { - app_info.stopListening("connection_show"); - $("div.flash").hide(); - fconnection_show.update(data.status, data.id); - } - }); - }); - - - - - - - - diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index 69459d125..6c2ebc821 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -28,9 +28,10 @@ class CoreAppInfoProviders { app.mainContext.deviceDetectionService.detected } - s.registerProvider('connection_show') { app, controller, data -> - def c = Fconnection.get(data.id) - if(c) [id:c.id , status:c.status.toString()] + s.registerProvider('fconnection_statuses') { app, controller, data -> + Fconnection.findAll().collect { c -> + [id:c.id, status:c.status.toString()] + } } s.registerProvider 'contact_message_stats', contactMessageStats diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index 809e417d5..82fc872fc 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -1,4 +1,4 @@ -fconnection_show = (function() { +fconnection_list = (function() { var update = function(status, id) { var containerSelecter = "#connection-" + id; $(containerSelecter + " .connection-status").attr("class", "connection-status " + status); From 8f3b3164716393d74a51a2c1777831d8a0210f57 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 8 May 2013 11:17:54 +0300 Subject: [PATCH 1282/2668] Fixed build_deploy_plugin binary mode to work with non-snapshots --- plugins/frontlinesms-core/do/build_deploy_plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 1fc5d55ad..d5715bf6f 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -28,7 +28,7 @@ echo "# Extracted plugin name as $pluginName" echo "# extract version from application.properties..." if $buildBinary; then echo "# Changing plugin version to include binary and grails version in the name." - sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-SNAPSHOT)['\"]\s*$/\tdef version = \"\1-binary-$grailsVersion\2\"/g" *GrailsPlugin.groovy + sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-SNAPSHOT)?['\"]\s*$/\tdef version = \"\1-binary-$grailsVersion\2\"/g" *GrailsPlugin.groovy fi pluginVersion=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") echo "# Extracted plugin version as $pluginVersion" From de6dc347db6bce8b8249c7f37bf73dbc48a19acf Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Wed, 8 May 2013 11:57:29 +0300 Subject: [PATCH 1283/2668] CORE-1971 fixed passing of params in webconnection with POST --- .../frontlinesms2/WebconnectionService.groovy | 4 ++-- .../services/WebconnectionServiceSpec.groovy | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy index a98d21b99..c486b4cc1 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/WebconnectionService.groovy @@ -64,7 +64,7 @@ class WebconnectionService { return val } - def preProcess(Exchange x) { + void preProcess(Exchange x) { println "x: ${x}" println "x.in: ${x.in}" println "x.in.headers: ${x.in.headers}" @@ -72,7 +72,7 @@ class WebconnectionService { webConn.preProcess(x) } - def postProcess(Exchange x) { + void postProcess(Exchange x) { println "x: ${x}" println "x.in: ${x.in}" println "x.in.headers: ${x.in.headers}" diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy index e37f809fe..437b9afa4 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/WebconnectionServiceSpec.groovy @@ -217,6 +217,16 @@ class WebconnectionServiceSpec extends Specification { [secret:"secret", message:"test", recipients: [[type:'address', value:'+123457890'], [type:'address', value:'213']]] | ['+123457890', '213'] } + def 'preProcess should have no return type'() { + expect: + service.class.getMethod('preProcess', [Exchange] as Class[]).returnType == void.class + } + + def 'postProcess should have no return type'() { + expect: + service.class.getMethod('postProcess', [Exchange] as Class[]).returnType == void.class + } + Exchange mockExchange(body, Map headers) { Exchange x = Mock() def inMessage = Mock(Message) @@ -226,3 +236,4 @@ class WebconnectionServiceSpec extends Specification { return x } } + From a3c415234fa3b9d7d8b18fdfd90ae088ce798456 Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 8 May 2013 14:33:47 +0300 Subject: [PATCH 1284/2668] FIX TOOLS-400 removed the unnecessary assigning of a variable --- plugins/frontlinesms-core/grails-app/views/_includes.gsp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 5c887d0b5..87e1aee6e 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -16,8 +16,7 @@ var console = console || {}; console.log = console.log || function() {}; - var nextImage = new Image(); - nextImage.src = "${resource(dir:'images', file:'status/red.png')}"; + new Image().src= "${resource(dir:'images', file:'status/red.png')}"; From 00cef277c8103b3d15e169fe1b58afc3fea69480 Mon Sep 17 00:00:00 2001 From: ivermac Date: Wed, 8 May 2013 14:58:35 +0300 Subject: [PATCH 1285/2668] FIX TOOLS-400 formatted the code in views/_includes.gsp --- plugins/frontlinesms-core/grails-app/views/_includes.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/_includes.gsp b/plugins/frontlinesms-core/grails-app/views/_includes.gsp index 87e1aee6e..2502fe8fa 100644 --- a/plugins/frontlinesms-core/grails-app/views/_includes.gsp +++ b/plugins/frontlinesms-core/grails-app/views/_includes.gsp @@ -16,7 +16,7 @@ var console = console || {}; console.log = console.log || function() {}; - new Image().src= "${resource(dir:'images', file:'status/red.png')}"; + new Image().src = "${resource(dir:'images', file:'status/red.png')}"; From 417742dd232700f1163eacea549bf16a8f3de75f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 8 May 2013 15:14:36 +0300 Subject: [PATCH 1286/2668] FIX TOOLS-486 Border for connection is displayed across entire row --- .../grails-app/views/connection/_connection.gsp | 2 +- plugins/frontlinesms-core/web-app/css/settings.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp index e1b86124f..da7672468 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -7,6 +7,6 @@

        ${serverUrl + createLink(uri: '/') + "api/1/smssync/" + c.id + "/"}

        - +
        diff --git a/plugins/frontlinesms-core/web-app/css/settings.css b/plugins/frontlinesms-core/web-app/css/settings.css index a585c0672..1b35b0ce4 100644 --- a/plugins/frontlinesms-core/web-app/css/settings.css +++ b/plugins/frontlinesms-core/web-app/css/settings.css @@ -29,7 +29,7 @@ #body-content.connections .connection .connection-status { background-repeat:no-repeat; background-position:center; padding-left:30px; } #body-content.connections .connection .connection-name p { font-size:10px; } #body-content.connections .controls { visibility:hidden; text-align:right; } -#body-content.connections .connection:hover > .controls { visibility:visible; } +#body-content.connections .connection:hover .controls { visibility:visible; } #body-content.connections p.no-content { border-bottom:1px solid #9e9e9e; } #body-content.logs th.content { width:100%; } From df3e5361c5cc9b932973f404db7bdb6758e1e5a5 Mon Sep 17 00:00:00 2001 From: ivermac Date: Thu, 9 May 2013 09:42:05 +0300 Subject: [PATCH 1287/2668] FIX TOOLS-438 formatted code in of quickMessage in FsmsTagLib.groovy --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 13351c0c3..09cf13a11 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -400,7 +400,12 @@ class FsmsTagLib { } def quickMessage = { att -> - att << [controller:"quickMessage", action:"create", id:"quick_message", popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, i18n('wizard.send'), true); mediumPopup.selectSubscriptionGroup(${att.groupId});"] + att << [ controller:"quickMessage", + action:"create", + id:"quick_message", + popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), + data, + mediumPopup.selectSubscriptionGroup(${att.groupId});" ] def body = "${g.message(code:'fmessage.quickmessage')}" out << fsms.popup(att,body) } From 7988d7e9170940ccb1c66d5a492c665ed7ac0565 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 9 May 2013 11:38:45 +0300 Subject: [PATCH 1288/2668] Updated build_deploy_plugin to handle bainry POMs and dependencies properly. --- .../frontlinesms-core/do/build_deploy_plugin | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index d5715bf6f..fdd0b9959 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -21,14 +21,24 @@ echo "# Extracting grails version from application.properties..." grailsVersion=$(grep 'app\.grails\.version=' application.properties | cut -d= -f2) echo "# Grails version is $grailsVersion" -echo "# extract app name from application.properties..." +echo "# Extracting app name from application.properties..." pluginName=`ls *GrailsPlugin.groovy | cut -d. -f1 | sed -E -e 's/^(.*)GrailsPlugin$/\1/' | sed -E 's/(([^^])([A-Z]))/\2-\3/g' | tr [:upper:] [:lower:]` echo "# Extracted plugin name as $pluginName" -echo "# extract version from application.properties..." +echo "# Extracting version from application.properties..." if $buildBinary; then - echo "# Changing plugin version to include binary and grails version in the name." - sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-SNAPSHOT)?['\"]\s*$/\tdef version = \"\1-binary-$grailsVersion\2\"/g" *GrailsPlugin.groovy + set +e; grep -q 'version.*binary' *GrailsPlugin.groovy + binaryVersionSet=$? + set -e + if [[ "$binaryVersionSet" == "1" ]]; then + echo "# Changing plugin version to include binary and grails version in the name." + sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-SNAPSHOT)?['\"]\s*$/\tdef version = \"\1-binary-$grailsVersion\2\"/g" *GrailsPlugin.groovy + elif [[ "$binaryVersionSet" == "0" ]]; then + echo "# Version is already set for binary." + else + echo "# Error checking if binary version set." + exit 1 + fi fi pluginVersion=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") echo "# Extracted plugin version as $pluginVersion" @@ -48,7 +58,8 @@ echo "# renaming $oldPackageName to $newPackageName" mv $oldPackageName $newPackageName if $buildBinary; then - echo "..." + echo "# Building pom file..." + grails generate-pom $binaryFlag else ivyCacheDir=~/.grails/ivy-cache/org.grails.plugins/$pluginName/zips mkdir -p $ivyCacheDir @@ -70,9 +81,17 @@ echo "# Deploying to ${mavenRepoDir}$mavenFileName" cp $mavenFileName $mavenRepoDir echo "# Deployed to local maven repository." +if $buildBinary; then + echo "# Deploying POM file to local maven repository..." + pomFileName="$pluginName-$pluginVersion.pom" + cp target/pom.xml $pomFileName + echo "# Deploying to ${mavenRepoDir}$pomFileName" + cp $pomFileName ${mavenRepoDir}$pomFileName + echo "# POM deployed" +fi + if [ -n "$m2deploy" ]; then - echo "# deploy core plugin to remote plugin repo" - echo "# TODO skip maven deploy for non-SNAPSHOT builds" + echo "# Deploy core plugin to remote plugin repo..." echo "# Using maven password: $FRONTLINESMS_MAVEN_PASSWORD" ftp -nv dev.frontlinesms.com << EOF hash @@ -84,8 +103,11 @@ cd org/grails/plugins/$pluginName mkdir $pluginVersion cd $pluginVersion put $mavenFileName +put $pomFileName exit EOF echo "# Plugin deployed to remote maven repo." fi +echo "# Deployment complete." + From 6e2b81e213a253402dc29dde35663e03163a7c1a Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 9 May 2013 11:40:08 +0300 Subject: [PATCH 1289/2668] Allowed POM for non-binary plugins. --- .../frontlinesms-core/do/build_deploy_plugin | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index fdd0b9959..6da8c23c6 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -58,8 +58,7 @@ echo "# renaming $oldPackageName to $newPackageName" mv $oldPackageName $newPackageName if $buildBinary; then - echo "# Building pom file..." - grails generate-pom $binaryFlag + echo "..." else ivyCacheDir=~/.grails/ivy-cache/org.grails.plugins/$pluginName/zips mkdir -p $ivyCacheDir @@ -81,14 +80,14 @@ echo "# Deploying to ${mavenRepoDir}$mavenFileName" cp $mavenFileName $mavenRepoDir echo "# Deployed to local maven repository." -if $buildBinary; then - echo "# Deploying POM file to local maven repository..." - pomFileName="$pluginName-$pluginVersion.pom" - cp target/pom.xml $pomFileName - echo "# Deploying to ${mavenRepoDir}$pomFileName" - cp $pomFileName ${mavenRepoDir}$pomFileName - echo "# POM deployed" -fi +echo "# Building pom file..." +grails generate-pom $binaryFlag +echo "# Deploying POM file to local maven repository..." +pomFileName="$pluginName-$pluginVersion.pom" +cp target/pom.xml $pomFileName +echo "# Deploying to ${mavenRepoDir}$pomFileName" +cp $pomFileName ${mavenRepoDir}$pomFileName +echo "# POM deployed" if [ -n "$m2deploy" ]; then echo "# Deploy core plugin to remote plugin repo..." From 85b11f1680e9a6388fc8677b7884460b1351b1fd Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 9 May 2013 11:50:32 +0300 Subject: [PATCH 1290/2668] Allowed build_deploy_plugin script to remove binary version info when building non-binary plugins. --- plugins/frontlinesms-core/do/build_deploy_plugin | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/do/build_deploy_plugin b/plugins/frontlinesms-core/do/build_deploy_plugin index 6da8c23c6..d9975bc39 100755 --- a/plugins/frontlinesms-core/do/build_deploy_plugin +++ b/plugins/frontlinesms-core/do/build_deploy_plugin @@ -26,10 +26,10 @@ pluginName=`ls *GrailsPlugin.groovy | cut -d. -f1 | sed -E -e 's/^(.*)GrailsPlug echo "# Extracted plugin name as $pluginName" echo "# Extracting version from application.properties..." +set +e; grep -q 'version.*binary' *GrailsPlugin.groovy +binaryVersionSet=$? +set -e if $buildBinary; then - set +e; grep -q 'version.*binary' *GrailsPlugin.groovy - binaryVersionSet=$? - set -e if [[ "$binaryVersionSet" == "1" ]]; then echo "# Changing plugin version to include binary and grails version in the name." sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-SNAPSHOT)?['\"]\s*$/\tdef version = \"\1-binary-$grailsVersion\2\"/g" *GrailsPlugin.groovy @@ -39,6 +39,14 @@ if $buildBinary; then echo "# Error checking if binary version set." exit 1 fi +else + if [[ "$binaryVersionSet" == "0" ]]; then + echo "# Removing binary info from plugin version..." + sed -E -i -e "s/^\s*def\s+version\s*=\s*['\"](.*?)(-binary-$grailsVersion)(-SNAPSHOT)?['\"]\s*$/\tdef version = '\1\3'/" *GrailsPlugin.groovy + elif [[ "$binaryVersionSet" != "1" ]]; then + echo "# Error checking if binary version set." + exit 1 + fi fi pluginVersion=$(env groovy -e "`grep -E '^\s*def\s+version' *GrailsPlugin.groovy`; println version") echo "# Extracted plugin version as $pluginVersion" From b36b60dfcc286e12a806b1cea3ad0be221a78fb6 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Thu, 9 May 2013 12:04:21 +0300 Subject: [PATCH 1291/2668] WIP TOOLS-460 Remote test fixes on ContactAddGroupSpec; Rolled up version of remote control plugin --- .../grails-app/conf/BuildConfig.groovy | 4 +- .../contact/ContactAddGroupSpec.groovy | 78 +++++++++++-------- .../contact/ContactBaseSpec.groovy | 51 +++++++----- 3 files changed, 79 insertions(+), 54 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 887a6e8d4..99b46cad9 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -101,8 +101,8 @@ grails.project.dependency.resolution = { test ":spock:0.6" test ":geb:$gebVersion" - test ':build-test-data:2.0.2' - compile ':remote-control:1.3' + test ':build-test-data:2.0.3' + compile ':remote-control:1.4' compile(':functional-test-development:0.9.3') { exclude 'hibernate' } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy index a19cee7c1..e0383f5c6 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy @@ -12,18 +12,21 @@ class ContactAddGroupSpec extends ContactBaseSpec { def 'groups that selected contact belongs to are shown in contact details'() { when: - to PageContactShow, Contact.findByName('Bob') + to PageContactShow, remote { Contact.findByName('Bob') } then: singleContactDetails.groupList == ['Test', 'three'] } def 'existing groups that contact is not a member of can be selected from dropdown and are then added to list'() { + setup: + def bob = remote { Contact.findByName('Bob') } + def otherGroup = remote { Group.findByName('Others') } when: - to PageContactShow, Contact.findByName('Bob') + to PageContactShow, bob then: singleContactDetails.otherGroupOptions == ['Add to group...', 'Others', 'four'] when: - singleContactDetails.addToGroup Group.findByName('Others').id.toString() + singleContactDetails.addToGroup otherGroup.id.toString() then: waitFor { singleContactDetails.groupList.sort() == ['Others', 'Test', 'three'] } singleContactDetails.otherGroupOptions == ['Add to group...', 'four'] @@ -32,32 +35,36 @@ class ContactAddGroupSpec extends ContactBaseSpec { def 'clicking X next to group in list removes group from visible list, but does not change database if no other action is taken'() { given: - def bob = Contact.findByName("Bob") + def bob = remote { Contact.findByName("Bob") } def bobsGroups + def testGroup = remote { Group.findByName('Test')} when: - to PageContactShow, Contact.findByName('Bob') + to PageContactShow, bob then: singleContactDetails.groupList.size() == 2 singleContactDetails.groupList.containsAll(['Test', 'three']) when: - singleContactDetails.removeGroup Group.findByName('Test').id.toString() + singleContactDetails.removeGroup testGroup.id.toString() bobsGroups = bob.groups then: waitFor { singleContactDetails.groupList.size() == 1 } when: - to PageContactShow, Contact.findByName('Bob') + to PageContactShow, bob.refresh() then: waitFor { singleContactDetails.groupList.size() == 2 } } def 'clicking save actually adds contact to newly selected groups'() { + setup: + def bob = remote { Contact.findByName('Bob')} + def otherGroup = remote { Group.findByName('Others')} when: - to PageContactShow, Contact.findByName('Bob') - singleContactDetails.addToGroup Group.findByName('Others').id.toString() + to PageContactShow, bob + singleContactDetails.addToGroup otherGroup.id.toString() singleContactDetails.save.click() then: at PageContactShow - Contact.findByName('Bob') in Group.findByName('Others').members + bob.refresh() in otherGroup.refresh().members } def 'clicking save actually adds multiple contacts to newly selected groups'() { @@ -71,21 +78,28 @@ class ContactAddGroupSpec extends ContactBaseSpec { then: waitFor { multipleContactDetails.otherMultiGroupOptions.size() > 1 } when: - multipleContactDetails.addToGroup Group.findByName('Others').id.toString() - multipleContactDetails.update.click() + multipleContactDetails.addToGroup remote { Group.findByName('Others').id.toString() } + multipleContactDetails.update.jquery.trigger("click") then: - waitFor {Group.findByName('Others').members*.name.containsAll(['Bob', 'Alice'])} + waitFor { + remote { + Group.findByName('Others').members*.name.containsAll(['Bob', 'Alice']) + } + } + } def 'clicking save removes multiple contacts from selected groups'() { given: - def bob = Contact.findByName("Bob") - def alice = Contact.findByName('Alice') - def otherGroup = Group.findByName('Others') - bob.addToGroups(otherGroup,true) - alice.addToGroups(otherGroup,true) - assert bob.isMemberOf(otherGroup) - assert alice.isMemberOf(otherGroup) + remote { + def bob = Contact.findByName("Bob") + def alice = Contact.findByName('Alice') + def otherGroup = Group.findByName('Others') + bob.addToGroups(otherGroup,true) + alice.addToGroups(otherGroup,true) + assert bob.isMemberOf(otherGroup) + assert alice.isMemberOf(otherGroup) + } when: to PageContactShow contactList.selectContact 1 @@ -96,28 +110,28 @@ class ContactAddGroupSpec extends ContactBaseSpec { then: waitFor { multipleContactDetails.multiGroupList.contains('Others') } when: - multipleContactDetails.removeMultiGroup otherGroup.id.toString() - multipleContactDetails.update.click() + multipleContactDetails.removeMultiGroup remote { Group.findByName('Others').id.toString()} + multipleContactDetails.update.jquery.trigger("click") then: waitFor { notifications.flashMessage.displayed } - when: - otherGroup.refresh() - then: - otherGroup.members == [] + remote { Group.findByName('Others').members == [] } } def 'clicking save removes contact from newly removed groups'() { when: - def testGroup = Group.findByName('Test') - to PageContactShow, Contact.findByName('Bob') - GroupMembership.countMembers(testGroup) == 1 - + to PageContactShow, remote { Contact.findByName('Bob')} + println "TEST:::::: GROUP::" + remote { Group.findByName('Test')} + remote { + GroupMembership.countMembers(Group.findByName('Test')) == 1 + } singleContactDetails.removeGroup testGroup.id.toString() singleContactDetails.save.click() then: at PageContactShow - testGroup.refresh() - GroupMembership.countMembers(testGroup) == 0 + remote { + testGroup.refresh() + GroupMembership.countMembers(testGroup) == 0 + } } def "should enable save and cancel buttons when new group is added"() { diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy index 3b05ea142..58ea06952 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactBaseSpec.groovy @@ -4,35 +4,44 @@ import frontlinesms2.* class ContactBaseSpec extends grails.plugin.geb.GebSpec { static createTestContacts() { - Contact.build(name:'Alice', mobile:'2541234567', notes:'notes') - Contact.build(name:'Bob', mobile:'+254987654', email:"bob@bob.com") + remote { + Contact.build(name:'Alice', mobile:'2541234567', notes:'notes') + Contact.build(name:'Bob', mobile:'+254987654', email:"bob@bob.com") + } } static createTestMessages() { - Fmessage.build(src:'Bob', dst:'MyNumber', text:'hi Bob') - Fmessage.build(src:'Alice', dst:'MyNumber', text:'hi Alice') + remote { + Fmessage.build(src:'Bob', dst:'MyNumber', text:'hi Bob') + Fmessage.build(src:'Alice', dst:'MyNumber', text:'hi Alice') + } } static createTestGroups() { - def bob = Contact.findByName('Bob') - def groupThree = Group.build(name:'three') - def groupTest = Group.build(name:'Test') - ['Others', 'four'].each { Group.build(name:it) } + remote { + def bob = Contact.findByName('Bob') + def groupThree = Group.build(name:'three') + def groupTest = Group.build(name:'Test') + ['Others', 'four'].each { Group.build(name:it) } - groupTest.addToMembers(bob) - groupThree.addToMembers(bob) - groupTest.save(failOnError:true, flush:true) - groupThree.save(failOnError:true, flush:true) + groupTest.addToMembers(bob) + groupThree.addToMembers(bob) + groupTest.save(failOnError:true, flush:true) + groupThree.save(failOnError:true, flush:true) + bob.save(failOnError:true, flush:true) + } } static createTestCustomFields() { - Contact.findByName('Bob') - .addToCustomFields(name:'town', value:'Kusumu') - .save(failOnError:true, flush:true) + remote { + Contact.findByName('Bob') + .addToCustomFields(name:'town', value:'Kusumu') + .save(failOnError:true, flush:true) - Contact.findByName('Alice') - .addToCustomFields(name:'lake', value:'Victoria') - .save(failOnError:true, flush:true) + Contact.findByName('Alice') + .addToCustomFields(name:'lake', value:'Victoria') + .save(failOnError:true, flush:true) + } } def assertFieldDetailsCorrect(fieldName, labelText, expectedValue) { @@ -46,8 +55,10 @@ class ContactBaseSpec extends grails.plugin.geb.GebSpec { } def createManyContacts() { - (11..90).each { - Contact.build(name:"Contact${it}", mobile:"987654321${it}", notes:'notes') + remote { + (11..90).each { + Contact.build(name:"Contact${it}", mobile:"987654321${it}", notes:'notes') + } } } } \ No newline at end of file From df731800617803e732bcb8b2074292486fa18a47 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 9 May 2013 12:13:29 +0300 Subject: [PATCH 1292/2668] Changed jQuery references from $ in frontlinesms_core --- .../web-app/js/frontlinesms_core.js | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js index 37512af83..ba77a0f0d 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesms_core.js @@ -39,22 +39,22 @@ if(!String.prototype.htmlEncode) { // Standardise the onclick/onchange firing in IE before IE9 function addChangeHandlersForRadiosAndCheckboxes() { - $('input:radio, input:checkbox').click(function() { + jQuery('input:radio, input:checkbox').click(function() { this.blur(); this.focus(); }); } -if(jQuery.browser.msie) { $(function() { +if(jQuery.browser.msie) { jQuery(function() { addChangeHandlersForRadiosAndCheckboxes(); });} -(function($) { - $.fn.disableField = function(){ +(function(jQuery) { + jQuery.fn.disableField = function(){ return this.each(function(){ this.disabled = true; }); }; - $.fn.enableField = function(){ + jQuery.fn.enableField = function(){ return this.each(function(){ this.disabled = false; }); @@ -62,35 +62,35 @@ if(jQuery.browser.msie) { $(function() { }(jQuery)); function getSelectedGroupElements(groupName) { - return $('input[name=' + groupName + ']:checked'); + return jQuery('input[name=' + groupName + ']:checked'); } function isGroupChecked(groupName) { return getSelectedGroupElements(groupName).length > 0; } -$('.check-bound-text-area').live('focus', function() { - var checkBoxId = $(this).attr('checkbox_id'); - $('#' + checkBoxId).attr('checked', true); +jQuery('.check-bound-text-area').live('focus', function() { + var checkBoxId = jQuery(this).attr('checkbox_id'); + jQuery('#' + checkBoxId).attr('checked', true); }); -$.fn.renderDefaultText = function() { +jQuery.fn.renderDefaultText = function() { return this.focus(function() { - $(this).toggleClass('default-text-input', false); - var element = $(this).val(); - $(this).val(element === this.defaultValue ? '' : element); + jQuery(this).toggleClass('default-text-input', false); + var element = jQuery(this).val(); + jQuery(this).val(element === this.defaultValue ? '' : element); }).blur(function() { - var element = $(this).val(); - $(this).val(element.match(/^\s+$|^$/) ? this.defaultValue : element); - $(this).toggleClass('default-text-input', $(this).val() === this.defaultValue); }); + var element = jQuery(this).val(); + jQuery(this).val(element.match(/^\s+$|^$/) ? this.defaultValue : element); + jQuery(this).toggleClass('default-text-input', jQuery(this).val() === this.defaultValue); }); }; function showThinking() { - $('#thinking').fadeIn(); + jQuery('#thinking').fadeIn(); } function hideThinking() { - $('#thinking').fadeOut(); + jQuery('#thinking').fadeOut(); } function insertAtCaret(areaId, text) { @@ -140,8 +140,8 @@ jQuery(document).ajaxError(function(request, data, settings, error) { } }); -$(function() { - $.extend($.validator.messages, { +jQuery(function() { + jQuery.extend(jQuery.validator.messages, { required: i18n("jquery.validation.required"), remote: i18n("jquery.validation.remote"), email: i18n("jquery.validation.email"), From ddfa0566fa9a70a411717e2943d62256161fd252 Mon Sep 17 00:00:00 2001 From: Alex Anderson Date: Thu, 9 May 2013 15:13:14 +0300 Subject: [PATCH 1293/2668] Added release plugin to allow bundling of core as a grails plugin. --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 887a6e8d4..b0ff94ebd 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -112,7 +112,7 @@ grails.project.dependency.resolution = { //runtime ":cached-resources:1.0" //runtime ":yui-minify-resources:0.1.4" - build(":tomcat:$grailsVersion") { + build ":tomcat:$grailsVersion", ':release:2.0.0', { export = false } } From e89957138cc6d1df36230ca8f5d31242bb5aead0 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 10 May 2013 10:28:29 +0300 Subject: [PATCH 1294/2668] FIX TOOLS-438 formartted quickMessage closure in FsmsTagLib.groovy --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 09cf13a11..b7d38d4c9 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -400,10 +400,10 @@ class FsmsTagLib { } def quickMessage = { att -> - att << [ controller:"quickMessage", - action:"create", - id:"quick_message", - popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), + att << [ controller:"quickMessage" ] + att << [ action:"create" ] + att << [ id:"quick_message" ] + att << [ popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, mediumPopup.selectSubscriptionGroup(${att.groupId});" ] def body = "${g.message(code:'fmessage.quickmessage')}" From 25209fc4c2aecc734a59918d44b2c246fe58e22d Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 10 May 2013 10:34:35 +0300 Subject: [PATCH 1295/2668] TOOLS-460 Wrap GORM calls in remote closure --- .../smartgroup/SmartGroupListSpec.groovy | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy index 3daee7476..a9bb20bce 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy @@ -31,7 +31,9 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { def 'CREATE NEW SMARTGROUP button is available when there are smart groups'() { given: - new SmartGroup(name:'Test Group 1', contactName:'Jeremiah').save(failOnError:true, flush:true) + remote { + new SmartGroup(name:'Test Group 1', contactName:'Jeremiah').save(failOnError:true, flush:true) + } when: to PageSmartGroup then: @@ -40,10 +42,10 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { def 'selected smartgroup should be highlighted in the smartgroup menu'() { given: - def a = new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) - def b = new SmartGroup(name:'Test Group B', contactName:'B').save(failOnError:true, flush:true) + def a = remote { new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) } + def b = remote { new SmartGroup(name:'Test Group B', contactName:'B').save(failOnError:true, flush:true) } when: - goToSmartGroupPage(a) + remote { goToSmartGroupPage(a) } then: menuItemHighlighted(a) !menuItemHighlighted(b) @@ -56,9 +58,9 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { def "renaming a smart group displays a confirmation popup"() { given: - def a = new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) + def a = remote { new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) } when: - goToSmartGroupPage(a) + remote { goToSmartGroupPage(a) } then: header.moreGroupActions.displayed when: @@ -71,10 +73,11 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { then: !SmartGroup.findByName("Test Group A") } - + + @spock.lang.IgnoreRest def "deleting a smart group displays a confirmation popup"() { given: - def a = new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) + def a = remote { new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) } when: goToSmartGroupPage(a) then: @@ -90,6 +93,6 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { } private def goToSmartGroupPage(SmartGroup g) { - to PageSmartGroupShow, g + to PageSmartGroupShow, remote g } -} \ No newline at end of file +} From e1c4becf5101d247a11e1b510717d5081a5f1f10 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 10 May 2013 10:47:20 +0300 Subject: [PATCH 1296/2668] TOOLS-460 Remove println statement in ContactAddGroupSpec --- .../functional/frontlinesms2/contact/ContactAddGroupSpec.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy index e0383f5c6..2ad841164 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/contact/ContactAddGroupSpec.groovy @@ -120,7 +120,6 @@ class ContactAddGroupSpec extends ContactBaseSpec { def 'clicking save removes contact from newly removed groups'() { when: to PageContactShow, remote { Contact.findByName('Bob')} - println "TEST:::::: GROUP::" + remote { Group.findByName('Test')} remote { GroupMembership.countMembers(Group.findByName('Test')) == 1 } From 5402855c3d877fc2ea4f50257b902fca3d808f8c Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 10 May 2013 11:36:30 +0300 Subject: [PATCH 1297/2668] TOOLS-247 Update selenium version --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index b2c0c1388..36b31f750 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -49,7 +49,7 @@ grails.project.dependency.resolution = { // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg. // runtime 'mysql:mysql-connector-java:5.1.16' - def seleniumVersion = '2.30.0' + def seleniumVersion = '2.32.0' def camel = { def camelVersion = "2.9.4" "org.apache.camel:camel-$it:$camelVersion" From a439a1f3e0d08b56e97e5b7e55436fd57c70d36c Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 10 May 2013 11:37:02 +0300 Subject: [PATCH 1298/2668] TOOLS-247 Add remote closure to GebSpec class. --- .../test/functional/grails/plugin/geb/GebSpec.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy b/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy index 806638d3e..586547807 100644 --- a/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/grails/plugin/geb/GebSpec.groovy @@ -1,8 +1,18 @@ package grails.plugin.geb +import grails.plugin.remotecontrol.RemoteControl + /** TODO you should directly extend geb.spock.GebReportingSpec instead of this class */ @Deprecated class GebSpec extends geb.spock.GebReportingSpec { + static final remote + static final vanillaRemote + static { + remote = new RemoteControl() + remote.useNullIfResultWasUnserializable = true + vanillaRemote = remote + } + def cleanupSpec() { // CLearing the hibernate session should improve performance of tests over time frontlinesms2.Contact.withSession { s -> From e79f6f34c2503df28d64db1ea0ff268b4c33b0c2 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 10 May 2013 12:30:17 +0300 Subject: [PATCH 1299/2668] formatted the quickMessage closure in FsmsTagLib.groovy --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index b7d38d4c9..e448c7a28 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -400,16 +400,20 @@ class FsmsTagLib { } def quickMessage = { att -> - att << [ controller:"quickMessage" ] - att << [ action:"create" ] - att << [ id:"quick_message" ] - att << [ popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), - data, - mediumPopup.selectSubscriptionGroup(${att.groupId});" ] + att.controller = "quickMessage" + att.action = "create" + att.id = "quick_message" + att.popupCall = "mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, i18n('wizard.send'), true); mediumPopup.selectSubscriptionGroup(${att.groupId});" def body = "${g.message(code:'fmessage.quickmessage')}" out << fsms.popup(att,body) } + def popup = { att, body -> + att << [onLoading:"showThinking();", onSuccess:"hideThinking(); ${att.popupCall}"] + att.remove('popupCall') + out << g.remoteLink(att, body) + } + def menu = { att, body -> out << '
        ' out << '
          ' @@ -512,12 +516,6 @@ class FsmsTagLib { out << render(template:'/customactivity/step', model:[stepId:att.stepId, type:att.type, body:body]) } - def popup = { att, body -> - att << [onLoading:"showThinking();", onSuccess:"hideThinking(); ${att.popupCall}"] - att.remove('popupCall') - out << g.remoteLink(att, body) - } - private def getFields(att) { def fields = att.remove('fields') if(!fields) fields = att.instanceClass?.configFields From 024de88547a93738f221dc35b93cd6a380556657 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 10 May 2013 12:32:43 +0300 Subject: [PATCH 1300/2668] Remove 'remote' calls in SmartGroupListSpec --- .../smartgroup/SmartGroupListSpec.groovy | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy index a9bb20bce..d2763bc3a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/smartgroup/SmartGroupListSpec.groovy @@ -31,9 +31,7 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { def 'CREATE NEW SMARTGROUP button is available when there are smart groups'() { given: - remote { - new SmartGroup(name:'Test Group 1', contactName:'Jeremiah').save(failOnError:true, flush:true) - } + new SmartGroup(name:'Test Group 1', contactName:'Jeremiah').save(failOnError:true, flush:true) when: to PageSmartGroup then: @@ -42,10 +40,10 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { def 'selected smartgroup should be highlighted in the smartgroup menu'() { given: - def a = remote { new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) } - def b = remote { new SmartGroup(name:'Test Group B', contactName:'B').save(failOnError:true, flush:true) } + def a = new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) + def b = new SmartGroup(name:'Test Group B', contactName:'B').save(failOnError:true, flush:true) when: - remote { goToSmartGroupPage(a) } + goToSmartGroupPage(a) then: menuItemHighlighted(a) !menuItemHighlighted(b) @@ -58,9 +56,9 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { def "renaming a smart group displays a confirmation popup"() { given: - def a = remote { new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) } + def a = new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) when: - remote { goToSmartGroupPage(a) } + goToSmartGroupPage(a) then: header.moreGroupActions.displayed when: @@ -74,10 +72,9 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { !SmartGroup.findByName("Test Group A") } - @spock.lang.IgnoreRest def "deleting a smart group displays a confirmation popup"() { given: - def a = remote { new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) } + def a = new SmartGroup(name:'Test Group A', contactName:'A').save(failOnError:true, flush:true) when: goToSmartGroupPage(a) then: @@ -93,6 +90,6 @@ class SmartGroupListSpec extends SmartGroupBaseSpec { } private def goToSmartGroupPage(SmartGroup g) { - to PageSmartGroupShow, remote g + to PageSmartGroupShow, g } } From 3ac8e05aab915060b751f7f3d72427bc091626af Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 10 May 2013 14:00:21 +0300 Subject: [PATCH 1301/2668] FIX TOOLS-438 map redefined to previous key-value notation --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index e448c7a28..5a77e9aa2 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -400,12 +400,13 @@ class FsmsTagLib { } def quickMessage = { att -> - att.controller = "quickMessage" - att.action = "create" - att.id = "quick_message" - att.popupCall = "mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, i18n('wizard.send'), true); mediumPopup.selectSubscriptionGroup(${att.groupId});" + att << [ controller:"quickMessage", + action:"create", + id:"quick_message", + popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, i18n('wizard.send'), true); mediumPopup.selectSubscriptionGroup(${att.groupId});" ] def body = "${g.message(code:'fmessage.quickmessage')}" out << fsms.popup(att,body) + } def popup = { att, body -> From 2901357ddb812e54c8370506b90671ecc3089173 Mon Sep 17 00:00:00 2001 From: geoffreymuchai Date: Fri, 10 May 2013 16:23:13 +0300 Subject: [PATCH 1302/2668] WIP TOOLS-401 Refactored the SmartGroup domain object to add the configField variable for configuring search parameters --- .../frontlinesms2/SmartGroupController.groovy | 23 ++++++++----------- .../domain/frontlinesms2/SmartGroup.groovy | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SmartGroupController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SmartGroupController.groovy index a6d52b92e..b37ef4fd6 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SmartGroupController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/SmartGroupController.groovy @@ -42,19 +42,19 @@ class SmartGroupController extends ControllerUtils { def edit() { def smartGroupInstance = SmartGroup.get(params.id) - def smartGroupRuleFields = getSmartGroupRuleFields() def currentRules = [:] - - for(def prop in smartGroupRuleFields) { - if(smartGroupInstance."$prop") - currentRules."$prop" = smartGroupInstance."$prop" - } + + SmartGroup.configFields.each { field -> + if(smartGroupInstance."$field") + currentRules."$field" = smartGroupInstance."$field" + } + def customFieldNames = CustomField.allUniquelyNamed render view: "../smartGroup/create", model: [smartGroupInstance:smartGroupInstance, currentRules:currentRules, - fieldNames:[message(code: 'contact.phonenumber.label') , message(code: 'contact.name.label'), message(code: 'contact.email.label'), message(code: 'contact.notes.label')]+customFieldNames, - fieldIds:['mobile', 'contactName', 'email', 'notes']+customFieldNames.collect { CUSTOM_FIELD_ID_PREFIX+it }] + fieldNames:[message(code: 'contact.phonenumber.label') , message(code: 'contact.name.label'), message(code: 'contact.email.label'), message(code: 'contact.notes.label')] + customFieldNames, + fieldIds: SmartGroup.configFields+customFieldNames.collect { CUSTOM_FIELD_ID_PREFIX+it }] } def confirmDelete() { @@ -98,8 +98,7 @@ class SmartGroupController extends ControllerUtils { } private def removeSmartGroupRules(smartGroupInstance) { - def smartGroupRuleFields = getSmartGroupRuleFields() - def fieldsToNullify = smartGroupRuleFields - params['rule-field'] + def fieldsToNullify = SmartGroup.configFields - params['rule-field'] for(def field in fieldsToNullify) { if(field == "customFields") { smartGroupInstance.customFields.each {it.smartGroup = null} @@ -109,9 +108,5 @@ class SmartGroupController extends ControllerUtils { } } - private def getSmartGroupRuleFields() { - def smartGroupRuleFields = (new DefaultGrailsDomainClass(SmartGroup.class)).persistentProperties*.name - "name" - smartGroupRuleFields - } } diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy index d55ef8a88..c186563bd 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmartGroup.groovy @@ -3,7 +3,7 @@ package frontlinesms2 class SmartGroup { //> STATIC PROPERTIES static final String shortName = 'smartgroup' - + static configFields = ['mobile', 'contactName', 'email', 'notes'] //> SMART GROUP PROPERTIES /** the name of this smart group itself. This is mandatory. */ String name From 1a3815980d14efe788af82c8d67bcf0fa5f4c827 Mon Sep 17 00:00:00 2001 From: ivermac Date: Fri, 10 May 2013 16:51:14 +0300 Subject: [PATCH 1303/2668] FIX TOOLS-438 formatted and removed spaces in code --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index e85d3dc36..ddd159064 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -400,13 +400,10 @@ class FsmsTagLib { } def quickMessage = { att -> - att << [ controller:"quickMessage", - action:"create", - id:"quick_message", - popupCall:"mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, i18n('wizard.send'), true); mediumPopup.selectSubscriptionGroup(${att.groupId});" ] + def popupCall = "mediumPopup.launchMediumWizard(i18n('wizard.quickmessage.title'), data, i18n('wizard.send'), true); mediumPopup.selectSubscriptionGroup(${att.groupId});" + att << [controller:"quickMessage", action:"create", id:"quick_message", popupCall: popupCall] def body = "${g.message(code:'fmessage.quickmessage')}" out << fsms.popup(att,body) - } def popup = { att, body -> From a6246c9e89bee2f8ad6e2b68aeb46022b6f88276 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 13 May 2013 09:34:29 +0300 Subject: [PATCH 1304/2668] TOOLS-465 WIP Added fieldError taglib --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index e51252dac..cecbe92d1 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -518,6 +518,14 @@ class FsmsTagLib { out << g.remoteLink(att, body) } + def fieldErrors = { att, body -> + if (g.hasErrors(bean:att.bean, field:att.field)) { + out << "" + } + } + private def getFields(att) { def fields = att.remove('fields') if(!fields) fields = att.instanceClass?.configFields From bf7cea3249cee9c5bf25e4e916f93fdd99d19aef Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 13 May 2013 12:10:54 +0300 Subject: [PATCH 1305/2668] TOOLS-465 WIP Added fieldErrors taglib --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index cecbe92d1..44a0ca33b 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -519,9 +519,11 @@ class FsmsTagLib { } def fieldErrors = { att, body -> - if (g.hasErrors(bean:att.bean, field:att.field)) { - out << "
        From f24abf262d93a0dbdcfa17c3c4866ef4579e929b Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 12:38:03 +0300 Subject: [PATCH 2535/2668] TOOLS-1263 Replace icon-envelope > fa-envelope --- .../grails-app/views/contact/_single_contact.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp index b5a4aba68..405c81ab7 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp @@ -114,7 +114,7 @@ - +
        From 604abe482e12704340c76a6380c240f9f8b25fa3 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 12:40:13 +0300 Subject: [PATCH 2536/2668] TOOLS-1263 Update css fot fa-envelope font-awesome class --- plugins/frontlinesms-core/web-app/css/unreviewed-core.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css index 551e57564..e0c738eba 100644 --- a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -95,7 +95,7 @@ input[type=text]:-ms-input-placeholder { color:#bbb; font-style:italic; } #body.contacts #detail #single-contact #action-buttons { display:inline-block; vertical-align:top; margin-top:20px; } -#body.contacts #detail #single-contact #action-buttons .icon-envelope, +#body.contacts #detail #single-contact #action-buttons .fa-envelope, #body.contacts #detail #single-contact #action-buttons .fa-times, #body.contacts #detail #single-contact #action-buttons .fa-times-circle { font-size:14px; } From 824eecd8cbb0923940b019cf865903175a10c946 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 12:47:52 +0300 Subject: [PATCH 2537/2668] TOOLS-1263 Replace icon-search > fa-search-plus --- .../grails-app/views/contact/_single_contact.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp index 405c81ab7..978c61ecf 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp @@ -109,7 +109,7 @@
      - From bfe5080c67b4291691fedb1242317f844b203f91 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 12:53:16 +0300 Subject: [PATCH 2538/2668] TOOLS-1263 Update taglibs to use latest font-awesome --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 382348703..bc57022ba 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -492,7 +492,7 @@ class FsmsTagLib { if(att.code) { out << '

      ' if(icon) { - out << "" + out << "" } out << g.message(code:att.code) out << '

      ' From 5cb1cdafbe84dd12bdc3602f30e913387075964c Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 12:59:05 +0300 Subject: [PATCH 2539/2668] TOOLS-1263 Updated editor.js to use font-awesome --- plugins/frontlinesms-core/web-app/js/contact/editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/web-app/js/contact/editor.js b/plugins/frontlinesms-core/web-app/js/contact/editor.js index 171ac6410..fa5dc3fdf 100644 --- a/plugins/frontlinesms-core/web-app/js/contact/editor.js +++ b/plugins/frontlinesms-core/web-app/js/contact/editor.js @@ -152,7 +152,7 @@ var ContactEditor = function() { if(updateInProgress) { targetElement.after(""); } else { - targetElement.parent().find(".update.in-progress").removeClass('in-progress').addClass('icon-ok').addClass('done').fadeOut(1000, function() { $(this).remove(); }); + targetElement.parent().find(".update.in-progress").removeClass('in-progress').addClass('fa-check').addClass('done').fadeOut(1000, function() { $(this).remove(); }); } }, removeCustomFieldClickHandler = function(event) { From 1e41acaa8b44642ffe52bf4478fb0f8db808fec9 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 14:05:40 +0300 Subject: [PATCH 2540/2668] TOOLS-1263 Update routing.js and frontlinesync.js to fontawesome --- plugins/frontlinesms-core/web-app/js/frontlinesync.js | 4 ++-- plugins/frontlinesms-core/web-app/js/routing.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesync.js b/plugins/frontlinesms-core/web-app/js/frontlinesync.js index 202a0c3f1..4217a3479 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesync.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesync.js @@ -14,8 +14,8 @@ var frontlinesync = (function() { toggleOptions = function(connectionId) { var syncConfigContainer = $(getConnectionRow(connectionId) + ' .sync-config-container'); var expandIcon = $(getConnectionRow(connectionId) + " .sync-config-status-container .expand"); - var signRightIcon = "icon-chevron-sign-right"; - var signDownIcon = "icon-chevron-sign-down"; + var signRightIcon = "fa-chevron-circle-right"; + var signDownIcon = "fa-chevron-circle-down"; syncConfigContainer.toggle(); if(expandIcon.hasClass(signRightIcon)) { expandIcon.removeClass(signRightIcon); diff --git a/plugins/frontlinesms-core/web-app/js/routing.js b/plugins/frontlinesms-core/web-app/js/routing.js index 0097bd887..f64066b34 100644 --- a/plugins/frontlinesms-core/web-app/js/routing.js +++ b/plugins/frontlinesms-core/web-app/js/routing.js @@ -42,8 +42,8 @@ var routing = (function() { success : function(data) { var progressIndicator = routingForm.find(".progress.updating"); progressIndicator.removeClass("updating"); - progressIndicator.addClass("icon-ok"); - progressIndicator.fadeOut(1000, function() { $(this).removeClass("icon-ok").css("display", ""); }); + progressIndicator.addClass("fa-check"); + progressIndicator.fadeOut(1000, function() { $(this).removeClass("fa-check").css("display", ""); }); } }); }, From 5e403d91135996c5e2b81e4dca07489b07790bfd Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 14:08:23 +0300 Subject: [PATCH 2541/2668] TOOLS-1263 Update _frontlinesync.gsp to use font awesome --- .../grails-app/views/connection/_frontlinesync.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp index bfdb2b4ee..41b486e6c 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp @@ -22,7 +22,7 @@
      - + ${message(code:"frontlinesync.sync.config.dirty."+(!c.configSynced))} From cfa27849f45b5d4c80cff1d30160709ac8a93cd3 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 14:46:34 +0300 Subject: [PATCH 2542/2668] TOOLS-1241 Add font-awesome icons for contacts --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 4 ++-- plugins/frontlinesms-core/web-app/css/contact.css | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index bc57022ba..884db5692 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -484,7 +484,7 @@ class FsmsTagLib { def submenu = { att, body -> def icon - def iconMap = ['messages': 'envelope', 'missedCalls': 'phone', 'activities': 'comments', 'folders':'folder-open'] + def iconMap = ['messages': 'envelope', 'missedCalls': 'phone', 'activities': 'comments', 'folders':'folder-open', 'contacts':'user', 'groups':'users', 'smartgroups':'cog'] if(att.class in iconMap.keySet()) { icon = iconMap[att.class] } @@ -492,7 +492,7 @@ class FsmsTagLib { if(att.code) { out << '

      ' if(icon) { - out << "" + out << "" } out << g.message(code:att.code) out << '

      ' diff --git a/plugins/frontlinesms-core/web-app/css/contact.css b/plugins/frontlinesms-core/web-app/css/contact.css index 5a334d5c1..c4ff2be8b 100644 --- a/plugins/frontlinesms-core/web-app/css/contact.css +++ b/plugins/frontlinesms-core/web-app/css/contact.css @@ -1,7 +1,3 @@ -#body-menu li.contacts h3 { background-image:url("../images/icons/contacts.png"); } -#body-menu li.groups h3 { background-image:url("../images/icons/groups.png"); } -#body-menu li.smartgroups h3 { background-image:url("../images/icons/smartgroups.png"); } - #body.contacts #main-list-container > * { width:auto } #body.contacts #main-list-head { background-color:white; border-bottom:none; padding:0 17px; } #body.contacts #main-list-head .content { display:table; width:100%; padding-bottom:17px; } From 4c42583c219e46d274d522b3fcb5e7116a0417a6 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 22 Apr 2014 16:39:22 +0300 Subject: [PATCH 2543/2668] TOOLS-1241 Ensure search button is aligned properly --- plugins/frontlinesms-core/web-app/css/contact.css | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/web-app/css/contact.css b/plugins/frontlinesms-core/web-app/css/contact.css index c4ff2be8b..814a982fe 100644 --- a/plugins/frontlinesms-core/web-app/css/contact.css +++ b/plugins/frontlinesms-core/web-app/css/contact.css @@ -34,6 +34,7 @@ #body.contacts #detail #single-contact #contact-infos { position:absolute; top:17px; right:17px; } #body.contacts #detail #single-contact #contact-infos h2 { font-weight:bold; } #body.contacts #detail #single-contact #contact-infos ul { margin:10px 0; } +#body.contacts #detail #single-contact #contact-infos .search{ display:inline; } #body.contacts #detail #single-contact #contact-infos ul li { padding:5px 0 5px 25px; background-position:left center; background-repeat:no-repeat; } #body.contacts #detail #single-contact #contact-infos ul li.sent { background-image:url("../images/message/sent.png"); } From e0c996185d94a43d37c733adfc5fe66e29f1818f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 10:42:44 +0300 Subject: [PATCH 2544/2668] TOOLS-1271 Avoid querying for dispatches of inbound messages and messageDetails for non-existent owners, to optimise inbox loads --- .../grails-app/domain/frontlinesms2/TextMessage.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/TextMessage.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/TextMessage.groovy index de65a0e30..ccc3783a6 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/TextMessage.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/TextMessage.groovy @@ -150,7 +150,7 @@ class TextMessage extends Interaction { } private def areAnyDispatches(status) { - dispatches?.any { it.status == status } + !inbound && dispatches?.any { it.status == status } } public void setText(String text) { @@ -224,7 +224,7 @@ class TextMessage extends Interaction { //> GETTER AND SETTER OF MESSAGE DETAIL THAT USE CURRENT MESSAGE OWNER def getOwnerDetail() { - getMessageDetailValue(this.messageOwner) + messageOwner ? getMessageDetailValue(this.messageOwner) : null } def setMessageDetail(activityOrStep, val) { From c57f67d0e442d9eb447263f2e628efc3d9697a1a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 12:12:45 +0300 Subject: [PATCH 2545/2668] TOOLS-1263 Add fa prefix to icons --- .../taglib/frontlinesms2/FsmsTagLib.groovy | 2 +- .../grails-app/views/connection/_frontlinesync.gsp | 6 +++--- .../grails-app/views/contact/_custom_field.gsp | 2 +- .../grails-app/views/contact/_group_membership.gsp | 2 +- .../grails-app/views/contact/_multiple_contact.gsp | 2 +- .../grails-app/views/contact/_single_contact.gsp | 14 +++++++------- .../grails-app/views/import/reviewContacts.gsp | 4 ++-- .../grails-app/views/smartGroup/_rule.gsp | 2 +- .../frontlinesms-core/web-app/js/contact/editor.js | 2 +- plugins/frontlinesms-core/web-app/js/routing.js | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 884db5692..edc96217a 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -598,7 +598,7 @@ class FsmsTagLib { def warningType = att.warningType out << " -
      +
      ${c.secret}
      -
      +
      - + ${message(code:"frontlinesync.sync.config.dirty."+(!c.configSynced))} diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_custom_field.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_custom_field.gsp index c42088028..6f1110639 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_custom_field.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_custom_field.gsp @@ -2,7 +2,7 @@ - + diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_group_membership.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_group_membership.gsp index 56dbf4ae1..0d1f57cb3 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_group_membership.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_group_membership.gsp @@ -1,4 +1,4 @@
    • ${name} - +
      • diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_multiple_contact.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_multiple_contact.gsp index 31ecd4550..a126176ea 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_multiple_contact.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_multiple_contact.gsp @@ -8,7 +8,7 @@
    • ${g.name} - +
      • diff --git a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp index 978c61ecf..0b81a3ee3 100644 --- a/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp +++ b/plugins/frontlinesms-core/grails-app/views/contact/_single_contact.gsp @@ -12,7 +12,7 @@ - + @@ -22,14 +22,14 @@ - +
      diff --git a/plugins/frontlinesms-core/grails-app/views/smartGroup/_rule.gsp b/plugins/frontlinesms-core/grails-app/views/smartGroup/_rule.gsp index e8faa6220..83054bdc1 100644 --- a/plugins/frontlinesms-core/grails-app/views/smartGroup/_rule.gsp +++ b/plugins/frontlinesms-core/grails-app/views/smartGroup/_rule.gsp @@ -15,7 +15,7 @@ - + diff --git a/plugins/frontlinesms-core/web-app/js/contact/editor.js b/plugins/frontlinesms-core/web-app/js/contact/editor.js index fa5dc3fdf..7ef8f95e4 100644 --- a/plugins/frontlinesms-core/web-app/js/contact/editor.js +++ b/plugins/frontlinesms-core/web-app/js/contact/editor.js @@ -152,7 +152,7 @@ var ContactEditor = function() { if(updateInProgress) { targetElement.after(""); } else { - targetElement.parent().find(".update.in-progress").removeClass('in-progress').addClass('fa-check').addClass('done').fadeOut(1000, function() { $(this).remove(); }); + targetElement.parent().find(".update.in-progress").removeClass('in-progress').addClass('fa fa-check').addClass('done').fadeOut(1000, function() { $(this).remove(); }); } }, removeCustomFieldClickHandler = function(event) { diff --git a/plugins/frontlinesms-core/web-app/js/routing.js b/plugins/frontlinesms-core/web-app/js/routing.js index f64066b34..801863c31 100644 --- a/plugins/frontlinesms-core/web-app/js/routing.js +++ b/plugins/frontlinesms-core/web-app/js/routing.js @@ -42,8 +42,8 @@ var routing = (function() { success : function(data) { var progressIndicator = routingForm.find(".progress.updating"); progressIndicator.removeClass("updating"); - progressIndicator.addClass("fa-check"); - progressIndicator.fadeOut(1000, function() { $(this).removeClass("fa-check").css("display", ""); }); + progressIndicator.addClass("fa fa-check"); + progressIndicator.fadeOut(1000, function() { $(this).removeClass("fa fa-check").css("display", ""); }); } }); }, From 3a21e6efee143ee6f9daf0ad1c616d15f25bd785 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 12:27:15 +0300 Subject: [PATCH 2546/2668] Added a check for font-awesome icon usage without the fa class --- .../do/check_for_missing_fa_class | 15 +++++++++++++++ plugins/frontlinesms-core/do/jenkins/before | 1 + 2 files changed, 16 insertions(+) create mode 100755 plugins/frontlinesms-core/do/check_for_missing_fa_class diff --git a/plugins/frontlinesms-core/do/check_for_missing_fa_class b/plugins/frontlinesms-core/do/check_for_missing_fa_class new file mode 100755 index 000000000..2bf0fb09a --- /dev/null +++ b/plugins/frontlinesms-core/do/check_for_missing_fa_class @@ -0,0 +1,15 @@ +#!/bin/bash +echo "# Searching for fontawesome icons without fa class..." +grep -Er 'fa-' grails-app/views/ | grep -v 'fa ' +FOUND_STATUS=$? + +if [ 1 -eq $FOUND_STATUS ]; then + echo "# No incorrect font awesome icon usage was found." + RETURN_STATUS=0 +else + echo "# Font Awesome icons without the fa class were found. These work on Chromium for linux but not other browsers. Please add 'fa' class" + RETURN_STATUS=1 +fi + +exit $RETURN_STATUS + diff --git a/plugins/frontlinesms-core/do/jenkins/before b/plugins/frontlinesms-core/do/jenkins/before index 9265e9f83..dbdd6688e 100755 --- a/plugins/frontlinesms-core/do/jenkins/before +++ b/plugins/frontlinesms-core/do/jenkins/before @@ -2,6 +2,7 @@ set -e do/check_for_ignored_tests do/check_for_bad_template_renders +do/check_for_missing_fa_class do/check_for_bad_resource_tags do/check_for_setInterval_calls do/check_for_static_simple_date_format From b59dfe93628b6b7869c62b7044448ab2f69e8e55 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 17:07:05 +0300 Subject: [PATCH 2547/2668] A-49 Added InlineEditable taglib and supporting controller, js and style --- .../grails-app/conf/CoreResources.groovy | 1 + .../InlineEditableController.groovy | 19 +++++ .../taglib/frontlinesms2/FsmsTagLib.groovy | 9 ++- .../web-app/css/unreviewed-core.css | 24 +++++- .../web-app/js/inline_editable.js | 74 +++++++++++++++++++ 5 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/InlineEditableController.groovy create mode 100644 plugins/frontlinesms-core/web-app/js/inline_editable.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 8399f9d3d..b87dd60d2 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -60,6 +60,7 @@ modules = { resource url:[dir:'js', file:'jquery.autosize-min.js'] resource url:[dir:'js', file:'message_composer.js'] resource url:[dir:'js', file:'frontlinesync.js', disposition:'head'] + resource url:[dir:'js', file:'inline_editable.js', disposition:'head'] } messages { diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/InlineEditableController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/InlineEditableController.groovy new file mode 100644 index 000000000..ab488d9f7 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/InlineEditableController.groovy @@ -0,0 +1,19 @@ +package frontlinesms2 + +import grails.converters.JSON + +class InlineEditableController extends ControllerUtils { + def grailsApplication + + def update() { + println params + def domainInstance = grailsApplication.getArtefact("Domain", params.domainclass)?.getClazz()?.get(params.instanceid) + domainInstance?."${params.field}" = params.value + if(domainInstance?.save()) { + render ([success:true, value: params.value] as JSON) + } + else { + render ([success:false, error: (domainInstance? domainInstance.errors.allErrors.collect { message(error:it) }.join(" ") : message(code:'domain.not.found'))] as JSON) + } + } +} diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index edc96217a..e9edf301a 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -4,7 +4,6 @@ import org.springframework.web.servlet.support.RequestContextUtils import org.codehaus.groovy.grails.web.taglib.exceptions.GrailsTagException import frontlinesms2.CoreAppInfoProviders as CAIP import org.codehaus.groovy.grails.web.pages.discovery.GrailsConventionGroovyPageLocator - import org.apache.commons.math.random.RandomDataImpl; class FsmsTagLib { @@ -709,6 +708,14 @@ class FsmsTagLib { } } + def inlineEditable = { att -> + def domainClassName = att.instance.class.name + def currentValue = att.instance."${att.field}" + def classes = "inline-editable ${att.class ?: ''}" + out << "" + out << '' + } + private def isRequired(instanceClass, field) { !instanceClass.constraints[field].blank } diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css index e0c738eba..5eb0676c1 100644 --- a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -45,7 +45,7 @@ fieldset.table { display:table; } #body.contacts #group-list li:hover .remove-command { visibility:visible; } #body.contacts #group-list li:hover .remove-command:hover { color:#e00c0e; } -#body.contacts .editable input[type="text"], #body.contacts .editable textarea { +#body.contacts .editable input[type="text"], #body.contacts .editable textarea,input.inline-editable { border:1px #bbb solid; transition:border-color 1s linear; -webkit-transition:border-color 1s linear; @@ -59,7 +59,25 @@ fieldset.table { display:table; } } #body.contacts .edit .editable input[type="text"] { border:1px #fff solid; } #body.contacts .edit .editable input[type="text"]:focus, -#body.contacts .edit .editable input[type="text"]:hover, +input.inline-editable { + font-size:inherit; + background-color:transparent; + border-color:transparent; + min-width:200px; +} +.inline-editable-parent label.fa { + opacity:0.0; + vertical-align:middle; + font-size:18px; + margin-left:5px; +} +.inline-editable-parent:hover label.fa { + transition:opacity 200ms linear; + -webkit-transition:opacity 200ms linear; + -moz-transition:opacity 200ms linear; + opacity:1.0; +} +#body.contacts .edit .editable input[type="text"]:hover,input.inline-editable:hover, #body.contacts #note-area textarea:hover { background-color:#fff; border-color:#bbb; @@ -106,7 +124,7 @@ input[type=text]:-ms-input-placeholder { #body.contacts label.error { color:#c00; } #body.contacts .edit .editable input[type="text"].error { border: 1px solid #c00; } -#body.contacts .update.in-progress { background:url("../images/message/gray-ajax-spinner.gif") 2px 0 no-repeat; padding-left:18px; } +.update.in-progress { background:url("../images/message/gray-ajax-spinner.gif") 2px 0 no-repeat; padding-left:18px; } #body.contacts .update.done { padding-left:4px; } #body.contacts table td { position: relative; } diff --git a/plugins/frontlinesms-core/web-app/js/inline_editable.js b/plugins/frontlinesms-core/web-app/js/inline_editable.js new file mode 100644 index 000000000..db7b3f4f0 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/inline_editable.js @@ -0,0 +1,74 @@ +var inline_editable; +$(function() { + inline_editable = new InlineEditable(); +}); +InlineEditable = function() { + var + updateInProgress = false, + init = function() { + $('.inline-editable').blur(handleBlur); + }, + handleBlur = function() { + var getDataAttr = function(name, selector) { + return $(selector).attr('data-' + name); + }, + newValue = $(this).val(), + dataToSend = {}; + $.each(['domainclass', 'field', 'instanceid', 'savedvalue'], function(index, fieldName) { + dataToSend[fieldName] = getDataAttr(fieldName, event.target); + }); + if(dataToSend.savedvalue === newValue) { + return; + } + dataToSend.value = newValue; + $.ajax({ + type:"POST", + url:url_root + "inlineEditable/update", + data:dataToSend, + beforeSend:function() { + setUpdateInProgress(true, event.target); + toggleFormEnabled(false, event.target); + }, + success:handleServerResponse + }); + }, + toggleFormEnabled = function(enabled, targetElement) { + if (enabled) { + $("input.inline-editable").removeAttr('disabled'); + } + else { + targetElement = $(targetElement); + $("input.inline-editable").not(targetElement).attr('disabled','disabled'); + } + }, + + setUpdateInProgress = function(inProgress, targetElement) { + targetElement = $(targetElement); + targetElement.addClass('in-progress'); + updateInProgress = inProgress; + if(updateInProgress) { + targetElement.after(""); + } else { + $(".update.in-progress").removeClass('in-progress').addClass('fa fa-check').addClass('done').fadeOut(1000, function() { $(this).remove(); }); + $('label.server-side-error').remove(); + } + } + handleServerResponse = function(data) { + var targetElement = $('input.inline-editable.in-progress'); + if(data.success) { + toggleFormEnabled(true); + setUpdateInProgress(false); + targetElement.removeClass('in-progress').attr('data-savedvalue', targetElement.val()); + } + else { + $('label.server-side-error').remove(); + $(".update.in-progress").removeClass('in-progress'); + targetElement.parent().append(""); + } + }, + resizeToFit = function(selector) { + $(selector).attr('size', Math.max($(this).val().length + 5, 20)); + }; + + init(); +}; From 2444e0cecfca51bb2f877d1863346cf631d6bf7f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 17:07:22 +0300 Subject: [PATCH 2548/2668] A-49 Use inlineEditable for connection name editing --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 3 ++- .../grails-app/views/connection/_connection.gsp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 3a3b04494..ec2f8bc5d 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -96,7 +96,7 @@ default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}] default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}] -default.blank.message=Property [{0}] of class [{1}] cannot be blank +default.blank.message=This value cannot be blank default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}] default.null.message=Property [{0}] of class [{1}] cannot be null default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique @@ -1147,3 +1147,4 @@ missedCall.new.info=You have {0} new missed calls. Click to view # Multiple select missedCall.multiple.selected={0} missed calls selected message.multiple.selected={0} messages selected +fconnection.name.blank.error=Connection name cannot be blank diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp index bd6506982..da8716cfd 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_connection.gsp @@ -1,10 +1,10 @@ <%@ page import="frontlinesms2.api.FrontlineApi" %> - + -

      '${c.name}'

      +

      ${c.getFullApiUrl(request)}

      From 277398067649d0d0f9783f29bbb7c89d1a3f9b94 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 17:29:08 +0300 Subject: [PATCH 2549/2668] A-49 Upgraded to new test plugin to use latest selenium release --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 0bef286fe..0695f1c76 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -74,7 +74,7 @@ grails.project.dependency.resolution = { } plugins { - test ':frontlinesms-grails-test:0.18' + test ':frontlinesms-grails-test:0.19' compile ":hibernate:$grailsVersion" compile ":database-migration:1.0" From 637695024195be065b24e8a24d18f67824c0542e Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 17:29:08 +0300 Subject: [PATCH 2550/2668] A-49 Upgraded to new test plugin to use latest selenium release --- plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy index 0bef286fe..0695f1c76 100644 --- a/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/BuildConfig.groovy @@ -74,7 +74,7 @@ grails.project.dependency.resolution = { } plugins { - test ':frontlinesms-grails-test:0.18' + test ':frontlinesms-grails-test:0.19' compile ":hibernate:$grailsVersion" compile ":database-migration:1.0" From 91067af8f5759da9805787478e87cff7702eb545 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 23 Apr 2014 17:51:18 +0300 Subject: [PATCH 2551/2668] A-49 Fixed connectionName selector for PageConnection --- .../functional/frontlinesms2/connection/PageConnection.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index 59b676ba4..b0d266bfd 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -36,7 +36,7 @@ class ConnectionList extends Module { listSize { $("tbody tr.connection").size() } connection { i=0 -> $('tbody tr.connection', i) } hoverOn { i -> connection(i).find('div.controls').jquery.css("visibility", "visible") } - connectionName { i-> connection(i).find("td.connection-name").text() } + connectionName { i-> connection(i).find("td.connection-name input").value() } btnEnableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.enable') } btnRetryConnection(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.retryconnection') } btnDisableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.disable') } From d83ac9fcbbf5d84ab1e16cca7cb1ecb1adea357d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 12:36:37 +0300 Subject: [PATCH 2552/2668] A-49 Added test for inline edit of contacts --- .../connection/ConnectionFSpec.groovy | 15 ++++++++++++++- .../connection/PageConnection.groovy | 1 + .../web-app/js/inline_editable.js | 10 +++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy index cb8073a0e..bcf608417 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy @@ -8,7 +8,8 @@ import frontlinesms2.dev.MockModemUtils import serial.mock.MockSerial import serial.mock.CommPortIdentifier -import spock.lang.* +import geb.Browser +import grails.plugin.geb.GebSpec class ConnectionFSpec extends grails.plugin.geb.GebSpec { def 'When there are no connections, this is explained to the user'() { @@ -251,6 +252,18 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { connectionList.smssyncLastconnected(0).text()?.contains('smssync.lastConnected.never') } + def 'can rename a connection inline'() { + given: + createTestSmssyncConnection(false) + when: + to PageConnection + connectionList.connectionNameInput(0).click() + connectionList.connectionNameInput(0).value('this is a new name') + $('td.connection-name input.inline-editable').jquery.trigger('change') + then: + waitFor { remote { Fconnection.getAll()[0].name } == 'this is a new name' } + } + private def createBadConnection() { remote { MockModemUtils.initialiseMockSerial([ diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index b0d266bfd..0dfcea82a 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -37,6 +37,7 @@ class ConnectionList extends Module { connection { i=0 -> $('tbody tr.connection', i) } hoverOn { i -> connection(i).find('div.controls').jquery.css("visibility", "visible") } connectionName { i-> connection(i).find("td.connection-name input").value() } + connectionNameInput { i-> connection(i).find("td.connection-name input", 0) } btnEnableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.enable') } btnRetryConnection(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.retryconnection') } btnDisableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.disable') } diff --git a/plugins/frontlinesms-core/web-app/js/inline_editable.js b/plugins/frontlinesms-core/web-app/js/inline_editable.js index db7b3f4f0..68d71c8fb 100644 --- a/plugins/frontlinesms-core/web-app/js/inline_editable.js +++ b/plugins/frontlinesms-core/web-app/js/inline_editable.js @@ -6,16 +6,16 @@ InlineEditable = function() { var updateInProgress = false, init = function() { - $('.inline-editable').blur(handleBlur); + $('.inline-editable').change(handleUserInput); }, - handleBlur = function() { + handleUserInput = function(e) { var getDataAttr = function(name, selector) { return $(selector).attr('data-' + name); }, newValue = $(this).val(), dataToSend = {}; $.each(['domainclass', 'field', 'instanceid', 'savedvalue'], function(index, fieldName) { - dataToSend[fieldName] = getDataAttr(fieldName, event.target); + dataToSend[fieldName] = getDataAttr(fieldName, e.target); }); if(dataToSend.savedvalue === newValue) { return; @@ -26,8 +26,8 @@ InlineEditable = function() { url:url_root + "inlineEditable/update", data:dataToSend, beforeSend:function() { - setUpdateInProgress(true, event.target); - toggleFormEnabled(false, event.target); + setUpdateInProgress(true, e.target); + toggleFormEnabled(false, e.target); }, success:handleServerResponse }); From 836fb3261a906a3bf2e95454f983055dcde6500f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 12:45:30 +0300 Subject: [PATCH 2553/2668] A-49 Added test for contact name validation error --- .../connection/ConnectionFSpec.groovy | 16 +++++++++++++++- .../connection/PageConnection.groovy | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy index bcf608417..9e1dd3524 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/ConnectionFSpec.groovy @@ -259,11 +259,25 @@ class ConnectionFSpec extends grails.plugin.geb.GebSpec { to PageConnection connectionList.connectionNameInput(0).click() connectionList.connectionNameInput(0).value('this is a new name') - $('td.connection-name input.inline-editable').jquery.trigger('change') + connectionList.connectionNameInput(0).jquery.trigger('change') then: waitFor { remote { Fconnection.getAll()[0].name } == 'this is a new name' } } + def 'failure to provide a name results in validation error'() { + given: + createTestSmssyncConnection(false) + when: + to PageConnection + connectionList.connectionNameInput(0).click() + connectionList.connectionNameInput(0).value('') + connectionList.connectionNameInput(0).jquery.trigger('change') + then: + waitFor { + connectionList.connectionNameValidationError(0).displayed + } + } + private def createBadConnection() { remote { MockModemUtils.initialiseMockSerial([ diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index 0dfcea82a..f356df4f9 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -38,6 +38,7 @@ class ConnectionList extends Module { hoverOn { i -> connection(i).find('div.controls').jquery.css("visibility", "visible") } connectionName { i-> connection(i).find("td.connection-name input").value() } connectionNameInput { i-> connection(i).find("td.connection-name input", 0) } + connectionNameValidationError { i-> connection(i).find("td.connection-name label.server-side-error") } btnEnableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.enable') } btnRetryConnection(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.retryconnection') } btnDisableRoute(wait:true) { i -> hoverOn(i) ; connection(i).find(".btn", text:'connection.route.disable') } From 09211c81406499111e16c6de6e7d42293fa62565 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 14:07:06 +0300 Subject: [PATCH 2554/2668] A-49 Set default connection name for FrontlineSync --- .../grails-app/views/fconnection/frontlinesync/_config.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 6eec98929..1aaefe17f 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -3,7 +3,7 @@
      - +

      From 75c5bbe8f93a3a28f054251b9f48eaceaeede5f5 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 15:19:43 +0300 Subject: [PATCH 2555/2668] TOOLS-1262 Added ability to refresh the routing rules display --- .../frontlinesms2/ConnectionController.groovy | 8 ++++++++ plugins/frontlinesms-core/web-app/js/routing.js | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index eae260cd6..18557c71f 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -264,6 +264,14 @@ class ConnectionController extends ControllerUtils { } } + def routingRules() { + def appSettings = [:] + appSettings['routing.otherwise'] = appSettingsService.get("routing.otherwise") + appSettings['routing.use'] = appSettingsService.get("routing.use") + def fconnectionRoutingMap = getRoutingRules(appSettings['routing.use']) + render(template:'routing', model:[appSettings: appSettings, fconnectionRoutingMap: fconnectionRoutingMap]) + } + private def withFconnection = withDomainObject Fconnection, { params.id }, { redirect(controller:'connection', action:'list') } } diff --git a/plugins/frontlinesms-core/web-app/js/routing.js b/plugins/frontlinesms-core/web-app/js/routing.js index 801863c31..e8755d301 100644 --- a/plugins/frontlinesms-core/web-app/js/routing.js +++ b/plugins/frontlinesms-core/web-app/js/routing.js @@ -47,6 +47,16 @@ var routing = (function() { } }); }, + refreshRoutingRules = function() { + $.ajax({ + type: 'POST', + url: url_root + 'connection/routingRules', + success: function(data) { + $('#routing-preferences').html($(data).html()); + init(); + } + }); + }, showOrHideWarning = function(hasError) { var warningElement = $('p.warning_message'); if(hasError) { @@ -57,6 +67,7 @@ var routing = (function() { } }; return { - init: init + init: init, + refreshRoutingRules: refreshRoutingRules }; }()); From 364af0dc16b88d635d011cf854212c40f7093888 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 15:39:39 +0300 Subject: [PATCH 2556/2668] TOOLS-1262 Update routing rules when a connection's status has changed to connected --- plugins/frontlinesms-core/web-app/js/fconnection.js | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/web-app/js/fconnection.js b/plugins/frontlinesms-core/web-app/js/fconnection.js index 4c8d7cf73..a469f15c1 100644 --- a/plugins/frontlinesms-core/web-app/js/fconnection.js +++ b/plugins/frontlinesms-core/web-app/js/fconnection.js @@ -7,6 +7,7 @@ fconnection_list = (function() { sanchez.replaceContent(containerSelecter + " .controls", "fconnection-controls-" + status, { connectionId:id }); if((status === 'CONNECTED') && !wasConnected) { pulseNewConnections(id+""); + routing.refreshRoutingRules(); } }, pulseNewConnections = function(ids) { From 773e5bec202618e97f144d505f2a4f48f46de791 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 15:40:11 +0300 Subject: [PATCH 2557/2668] TOOLS-1262 Update routing rules when a frontlinesync connection's sendEnabled has changed in app_info payload, or has been changed via checkbox --- plugins/frontlinesms-core/web-app/js/frontlinesync.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesync.js b/plugins/frontlinesms-core/web-app/js/frontlinesync.js index 4217a3479..319332e52 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesync.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesync.js @@ -8,6 +8,7 @@ var frontlinesync = (function() { var syncConfigStatus = $(getConnectionRow(connectionId) + ' .sync-config-status') hideThinking(); toggleOptions(connectionId); + routing.refreshRoutingRules(); syncConfigStatus.html(i18n('frontlinesync.sync.config.dirty.true')); }; @@ -33,6 +34,9 @@ var frontlinesync = (function() { updateConfigSynced = function(data) { connectionRow = $(getConnectionRow(data.id)); var configSyncedMessage = i18n('frontlinesync.sync.config.dirty.' + !data.configSynced); + if(Boolean(connectionRow.find('#sendEnabled').attr('checked')) !== Boolean(data.sendEnabled)) { + routing.refreshRoutingRules(); + } connectionRow.find(".sync-config-status").html(configSyncedMessage); connectionRow.find("#sendEnabled").attr("checked", data.sendEnabled); connectionRow.find("#receiveEnabled").attr("checked", data.receiveEnabled); From 732dd79420ae8b4ffdf6453272fd43c3c71a041a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 15:44:48 +0300 Subject: [PATCH 2558/2668] TOOLS-1262 Moved routing.js init call into js to avoid g:javascript tag in directly rendered template --- .../grails-app/views/connection/_routing.gsp | 5 ----- plugins/frontlinesms-core/web-app/js/routing.js | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_routing.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_routing.gsp index ad999a55f..091e58418 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_routing.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_routing.gsp @@ -32,8 +32,3 @@ - -$(function() { - routing.init(); -}); - diff --git a/plugins/frontlinesms-core/web-app/js/routing.js b/plugins/frontlinesms-core/web-app/js/routing.js index e8755d301..0e271f24a 100644 --- a/plugins/frontlinesms-core/web-app/js/routing.js +++ b/plugins/frontlinesms-core/web-app/js/routing.js @@ -71,3 +71,4 @@ var routing = (function() { refreshRoutingRules: refreshRoutingRules }; }()); +$(function() { routing.init(); }); From 668e8dd3f36f2a4575dbf397e9138e881f884a4f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 17:27:02 +0300 Subject: [PATCH 2559/2668] A-48 Added checkIntervalMinutes attribute to FrontlineSync connections --- .../domain/frontlinesms2/FrontlinesyncFconnection.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index 5fa706581..4597040cf 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -23,10 +23,12 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { boolean receiveEnabled = false boolean missedCallEnabled = false boolean configSynced = false + Integer checkIntervalMinutes String secret static constraints = { lastConnectionTime nullable:true + checkIntervalMinutes nullable:true } def apiProcess(controller) { From 6b4e633f40cfb60768da75650b2a8a01436335ab Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 17:27:41 +0300 Subject: [PATCH 2560/2668] A-48 Added simple-slider library --- .../grails-app/conf/CoreResources.groovy | 3 + .../web-app/css/simple-slider-volume.css | 48 +++ .../web-app/css/simple-slider.css | 55 +++ .../web-app/js/simple-slider.js | 363 ++++++++++++++++++ 4 files changed, 469 insertions(+) create mode 100755 plugins/frontlinesms-core/web-app/css/simple-slider-volume.css create mode 100755 plugins/frontlinesms-core/web-app/css/simple-slider.css create mode 100755 plugins/frontlinesms-core/web-app/js/simple-slider.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index 8399f9d3d..b2417152b 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -113,6 +113,9 @@ modules = { settings { dependsOn 'common, font-awesome' resource url:[dir:'js', file:'/settings/general_settings.js'] + resource url:[dir:'js', file:'simple-slider.js'] + resource url:[dir:'css', file:'simple-slider.css'] + resource url:[dir:'css', file:'simple-slider-volume.css'] resource url:[dir:'js', file:'jquery.pulse.js'] resource url:[dir:'js', file:'contact/import_review.js'] } diff --git a/plugins/frontlinesms-core/web-app/css/simple-slider-volume.css b/plugins/frontlinesms-core/web-app/css/simple-slider-volume.css new file mode 100755 index 000000000..d8a876b33 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/css/simple-slider-volume.css @@ -0,0 +1,48 @@ +.slider-volume { + width: 300px; +} + +.slider-volume > .dragger { + width: 16px; + height: 16px; + margin: 0 auto; + border: 1px solid rgba(255,255,255,0.6); + + -moz-box-shadow: 0 0px 2px 1px rgba(0,0,0,0.5), 0 2px 5px 2px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 0px 2px 1px rgba(0,0,0,0.5), 0 2px 5px 2px rgba(0,0,0,0.2); + box-shadow: 0 0px 2px 1px rgba(0,0,0,0.5), 0 2px 5px 2px rgba(0,0,0,0.2); + + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + border-radius: 10px; + + background: #c5c5c5; + background: -moz-linear-gradient(90deg, rgba(180,180,180,1) 20%, rgba(230,230,230,1) 50%, rgba(180,180,180,1) 80%); + background: -webkit-radial-gradient( 50% 0%, 12% 50%, hsla(0,0%,100%,1) 0%, hsla(0,0%,100%,0) 100%), + -webkit-radial-gradient( 50% 100%, 12% 50%, hsla(0,0%,100%,.6) 0%, hsla(0,0%,100%,0) 100%), + -webkit-radial-gradient( 50% 50%, 200% 50%, hsla(0,0%,90%,1) 5%, hsla(0,0%,85%,1) 30%, hsla(0,0%,60%,1) 100%); +} + +.slider-volume > .track, .slider-volume > .highlight-track { + height: 11px; + + background: #787878; + background: -moz-linear-gradient(top, #787878, #a2a2a2); + background: -webkit-linear-gradient(top, #787878, #a2a2a2); + background: linear-gradient(top, #787878, #a2a2a2); + + -moz-box-shadow: inset 0 2px 5px 1px rgba(0,0,0,0.15), 0 1px 0px 0px rgba(230,230,230,0.9), inset 0 0 1px 1px rgba(0,0,0,0.2); + -webkit-box-shadow: inset 0 2px 5px 1px rgba(0,0,0,0.15), 0 1px 0px 0px rgba(230,230,230,0.9), inset 0 0 1px 1px rgba(0,0,0,0.2); + box-shadow: inset 0 2px 5px 1px rgba(0,0,0,0.15), 0 1px 0px 0px rgba(230,230,230,0.9), inset 0 0 1px 1px rgba(0,0,0,0.2); + + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; +} + +.slider-volume > .highlight-track { + background-color: #c5c5c5; + background: -moz-linear-gradient(top, #c5c5c5, #a2a2a2); + background: -webkit-linear-gradient(top, #c5c5c5, #a2a2a2); + background: linear-gradient(top, #c5c5c5, #a2a2a2); +} diff --git a/plugins/frontlinesms-core/web-app/css/simple-slider.css b/plugins/frontlinesms-core/web-app/css/simple-slider.css new file mode 100755 index 000000000..ca9bf6b7f --- /dev/null +++ b/plugins/frontlinesms-core/web-app/css/simple-slider.css @@ -0,0 +1,55 @@ +.slider { + width: 300px; +} + +.slider > .dragger { + background: #8DCA09; + background: -webkit-linear-gradient(top, #8DCA09, #72A307); + background: -moz-linear-gradient(top, #8DCA09, #72A307); + background: linear-gradient(top, #8DCA09, #72A307); + + -webkit-box-shadow: inset 0 2px 2px rgba(255,255,255,0.5), 0 2px 8px rgba(0,0,0,0.2); + -moz-box-shadow: inset 0 2px 2px rgba(255,255,255,0.5), 0 2px 8px rgba(0,0,0,0.2); + box-shadow: inset 0 2px 2px rgba(255,255,255,0.5), 0 2px 8px rgba(0,0,0,0.2); + + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + + border: 1px solid #496805; + width: 16px; + height: 16px; +} + +.slider > .dragger:hover { + background: -webkit-linear-gradient(top, #8DCA09, #8DCA09); +} + + +.slider > .track, .slider > .highlight-track { + background: #ccc; + background: -webkit-linear-gradient(top, #bbb, #ddd); + background: -moz-linear-gradient(top, #bbb, #ddd); + background: linear-gradient(top, #bbb, #ddd); + + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,0.1); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.1); + box-shadow: inset 0 2px 4px rgba(0,0,0,0.1); + + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + + border: 1px solid #aaa; + height: 4px; +} + +.slider > .highlight-track { + background-color: #8DCA09; + background: -webkit-linear-gradient(top, #8DCA09, #72A307); + background: -moz-linear-gradient(top, #8DCA09, #72A307); + background: linear-gradient(top, #8DCA09, #72A307); + + border-color: #496805; +} + diff --git a/plugins/frontlinesms-core/web-app/js/simple-slider.js b/plugins/frontlinesms-core/web-app/js/simple-slider.js new file mode 100755 index 000000000..1a02e5b37 --- /dev/null +++ b/plugins/frontlinesms-core/web-app/js/simple-slider.js @@ -0,0 +1,363 @@ +/* + jQuery Simple Slider + + Copyright (c) 2012 James Smith (http://loopj.com) + + Licensed under the MIT license (http://mit-license.org/) +*/ + +var __slice = [].slice, + __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + +(function($, window) { + var SimpleSlider; + SimpleSlider = (function() { + + function SimpleSlider(input, options) { + var ratio, + _this = this; + this.input = input; + this.defaultOptions = { + animate: true, + snapMid: false, + classPrefix: null, + classSuffix: null, + theme: null, + highlight: false + }; + this.settings = $.extend({}, this.defaultOptions, options); + if (this.settings.theme) { + this.settings.classSuffix = "-" + this.settings.theme; + } + this.input.hide(); + this.slider = $("
      ").addClass("slider" + (this.settings.classSuffix || "")).css({ + position: "relative", + userSelect: "none", + boxSizing: "border-box" + }).insertBefore(this.input); + if (this.input.attr("id")) { + this.slider.attr("id", this.input.attr("id") + "-slider"); + } + this.track = this.createDivElement("track").css({ + width: "100%" + }); + if (this.settings.highlight) { + this.highlightTrack = this.createDivElement("highlight-track").css({ + width: "0" + }); + } + this.dragger = this.createDivElement("dragger"); + this.slider.css({ + minHeight: this.dragger.outerHeight(), + marginLeft: this.dragger.outerWidth() / 2, + marginRight: this.dragger.outerWidth() / 2 + }); + this.track.css({ + marginTop: this.track.outerHeight() / -2 + }); + if (this.settings.highlight) { + this.highlightTrack.css({ + marginTop: this.track.outerHeight() / -2 + }); + } + this.dragger.css({ + marginTop: this.dragger.outerHeight() / -2, + marginLeft: this.dragger.outerWidth() / -2 + }); + this.track.mousedown(function(e) { + return _this.trackEvent(e); + }); + if (this.settings.highlight) { + this.highlightTrack.mousedown(function(e) { + return _this.trackEvent(e); + }); + } + this.dragger.mousedown(function(e) { + if (e.which !== 1) { + return; + } + _this.dragging = true; + _this.dragger.addClass("dragging"); + _this.domDrag(e.pageX, e.pageY); + return false; + }); + $("body").mousemove(function(e) { + if (_this.dragging) { + _this.domDrag(e.pageX, e.pageY); + return $("body").css({ + cursor: "pointer" + }); + } + }).mouseup(function(e) { + if (_this.dragging) { + _this.dragging = false; + _this.dragger.removeClass("dragging"); + return $("body").css({ + cursor: "auto" + }); + } + }); + this.pagePos = 0; + if (this.input.val() === "") { + this.value = this.getRange().min; + this.input.val(this.value); + } else { + this.value = this.nearestValidValue(this.input.val()); + } + this.setSliderPositionFromValue(this.value); + ratio = this.valueToRatio(this.value); + this.input.trigger("slider:ready", { + value: this.value, + ratio: ratio, + position: ratio * this.slider.outerWidth(), + el: this.slider + }); + } + + SimpleSlider.prototype.createDivElement = function(classname) { + var item; + item = $("
      ").addClass(classname).css({ + position: "absolute", + top: "50%", + userSelect: "none", + cursor: "pointer" + }).appendTo(this.slider); + return item; + }; + + SimpleSlider.prototype.setRatio = function(ratio) { + var value; + ratio = Math.min(1, ratio); + ratio = Math.max(0, ratio); + value = this.ratioToValue(ratio); + this.setSliderPositionFromValue(value); + return this.valueChanged(value, ratio, "setRatio"); + }; + + SimpleSlider.prototype.setValue = function(value) { + var ratio; + value = this.nearestValidValue(value); + ratio = this.valueToRatio(value); + this.setSliderPositionFromValue(value); + return this.valueChanged(value, ratio, "setValue"); + }; + + SimpleSlider.prototype.trackEvent = function(e) { + if (e.which !== 1) { + return; + } + this.domDrag(e.pageX, e.pageY, true); + this.dragging = true; + return false; + }; + + SimpleSlider.prototype.domDrag = function(pageX, pageY, animate) { + var pagePos, ratio, value; + if (animate == null) { + animate = false; + } + pagePos = pageX - this.slider.offset().left; + pagePos = Math.min(this.slider.outerWidth(), pagePos); + pagePos = Math.max(0, pagePos); + if (this.pagePos !== pagePos) { + this.pagePos = pagePos; + ratio = pagePos / this.slider.outerWidth(); + value = this.ratioToValue(ratio); + this.valueChanged(value, ratio, "domDrag"); + if (this.settings.snap) { + return this.setSliderPositionFromValue(value, animate); + } else { + return this.setSliderPosition(pagePos, animate); + } + } + }; + + SimpleSlider.prototype.setSliderPosition = function(position, animate) { + if (animate == null) { + animate = false; + } + if (animate && this.settings.animate) { + this.dragger.animate({ + left: position + }, 200); + if (this.settings.highlight) { + return this.highlightTrack.animate({ + width: position + }, 200); + } + } else { + this.dragger.css({ + left: position + }); + if (this.settings.highlight) { + return this.highlightTrack.css({ + width: position + }); + } + } + }; + + SimpleSlider.prototype.setSliderPositionFromValue = function(value, animate) { + var ratio; + if (animate == null) { + animate = false; + } + ratio = this.valueToRatio(value); + return this.setSliderPosition(ratio * this.slider.outerWidth(), animate); + }; + + SimpleSlider.prototype.getRange = function() { + if (this.settings.allowedValues) { + return { + min: Math.min.apply(Math, this.settings.allowedValues), + max: Math.max.apply(Math, this.settings.allowedValues) + }; + } else if (this.settings.range) { + return { + min: parseFloat(this.settings.range[0]), + max: parseFloat(this.settings.range[1]) + }; + } else { + return { + min: 0, + max: 1 + }; + } + }; + + SimpleSlider.prototype.nearestValidValue = function(rawValue) { + var closest, maxSteps, range, steps; + range = this.getRange(); + rawValue = Math.min(range.max, rawValue); + rawValue = Math.max(range.min, rawValue); + if (this.settings.allowedValues) { + closest = null; + $.each(this.settings.allowedValues, function() { + if (closest === null || Math.abs(this - rawValue) < Math.abs(closest - rawValue)) { + return closest = this; + } + }); + return closest; + } else if (this.settings.step) { + maxSteps = (range.max - range.min) / this.settings.step; + steps = Math.floor((rawValue - range.min) / this.settings.step); + if ((rawValue - range.min) % this.settings.step > this.settings.step / 2 && steps < maxSteps) { + steps += 1; + } + return steps * this.settings.step + range.min; + } else { + return rawValue; + } + }; + + SimpleSlider.prototype.valueToRatio = function(value) { + var allowedVal, closest, closestIdx, idx, range, _i, _len, _ref; + if (this.settings.equalSteps) { + _ref = this.settings.allowedValues; + for (idx = _i = 0, _len = _ref.length; _i < _len; idx = ++_i) { + allowedVal = _ref[idx]; + if (!(typeof closest !== "undefined" && closest !== null) || Math.abs(allowedVal - value) < Math.abs(closest - value)) { + closest = allowedVal; + closestIdx = idx; + } + } + if (this.settings.snapMid) { + return (closestIdx + 0.5) / this.settings.allowedValues.length; + } else { + return closestIdx / (this.settings.allowedValues.length - 1); + } + } else { + range = this.getRange(); + return (value - range.min) / (range.max - range.min); + } + }; + + SimpleSlider.prototype.ratioToValue = function(ratio) { + var idx, range, rawValue, step, steps; + if (this.settings.equalSteps) { + steps = this.settings.allowedValues.length; + step = Math.round(ratio * steps - 0.5); + idx = Math.min(step, this.settings.allowedValues.length - 1); + return this.settings.allowedValues[idx]; + } else { + range = this.getRange(); + rawValue = ratio * (range.max - range.min) + range.min; + return this.nearestValidValue(rawValue); + } + }; + + SimpleSlider.prototype.valueChanged = function(value, ratio, trigger) { + var eventData; + if (value.toString() === this.value.toString()) { + return; + } + this.value = value; + eventData = { + value: value, + ratio: ratio, + position: ratio * this.slider.outerWidth(), + trigger: trigger, + el: this.slider + }; + return this.input.val(value).trigger($.Event("change", eventData)).trigger("slider:changed", eventData); + }; + + return SimpleSlider; + + })(); + $.extend($.fn, { + simpleSlider: function() { + var params, publicMethods, settingsOrMethod; + settingsOrMethod = arguments[0], params = 2 <= arguments.length ? __slice.call(arguments, 1) : []; + publicMethods = ["setRatio", "setValue"]; + return $(this).each(function() { + var obj, settings; + if (settingsOrMethod && __indexOf.call(publicMethods, settingsOrMethod) >= 0) { + obj = $(this).data("slider-object"); + return obj[settingsOrMethod].apply(obj, params); + } else { + settings = settingsOrMethod; + return $(this).data("slider-object", new SimpleSlider($(this), settings)); + } + }); + } + }); + return $(function() { + return $("[data-slider]").each(function() { + var $el, allowedValues, settings, x; + $el = $(this); + settings = {}; + allowedValues = $el.data("slider-values"); + if (allowedValues) { + settings.allowedValues = (function() { + var _i, _len, _ref, _results; + _ref = allowedValues.split(","); + _results = []; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + x = _ref[_i]; + _results.push(parseFloat(x)); + } + return _results; + })(); + } + if ($el.data("slider-range")) { + settings.range = $el.data("slider-range").split(","); + } + if ($el.data("slider-step")) { + settings.step = $el.data("slider-step"); + } + settings.snap = $el.data("slider-snap"); + settings.equalSteps = $el.data("slider-equal-steps"); + if ($el.data("slider-theme")) { + settings.theme = $el.data("slider-theme"); + } + if ($el.attr("data-slider-highlight")) { + settings.highlight = $el.data("slider-highlight"); + } + if ($el.data("slider-animate") != null) { + settings.animate = $el.data("slider-animate"); + } + return $el.simpleSlider(settings); + }); + }); +})(this.jQuery || this.Zepto, this); From 3b0f2a7784ce991c3268077c5997c6774672d0b7 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 24 Apr 2014 17:28:07 +0300 Subject: [PATCH 2561/2668] A-48 Added slider input to FrontlineSync config, with hardcoded values --- .../grails-app/views/connection/_frontlinesync.gsp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp index bdc26b7a1..efc5d3df6 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp @@ -43,6 +43,10 @@
      +
      + + +
      From b16181bfae9ebb64e4d0f112aa178100a1b5ac26 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 14:33:48 +0300 Subject: [PATCH 2562/2668] A-48 WIP on slider - now displays value from db, and label is updated on change --- .../FrontlinesyncFconnection.groovy | 4 ++ .../grails-app/i18n/messages.properties | 7 +++ .../views/connection/_frontlinesync.gsp | 17 +++++-- .../web-app/css/simple-slider-volume.css | 48 ------------------- .../web-app/css/simple-slider.css | 14 +++--- .../web-app/css/unreviewed-core.css | 8 ++++ .../web-app/js/frontlinesync.js | 23 ++++++++- 7 files changed, 61 insertions(+), 60 deletions(-) delete mode 100755 plugins/frontlinesms-core/web-app/css/simple-slider-volume.css diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index 4597040cf..439a23fbe 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -8,6 +8,7 @@ import frontlinesms2.api.* @FrontlineApiAnnotations(apiUrl="frontlinesync") class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { + static final syncFrequencyOptions = [1, 5, 15, 30, 60, 120, null] static String getShortName() { 'frontlinesync' } static final passwords = [] static final configFields = ['info-setup': ['secret'], 'info-name':['name']] @@ -58,6 +59,9 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { return routeDefinitions } + def getSyncFrequencyOptionListIndex() { + return syncFrequencyOptions.indexOf(checkIntervalMinutes) + } String getFullApiUrl(request) { return apiEnabled? "${urlHelperService.getBaseUrl(request)}" :'' diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 3a3b04494..8812d5c77 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -237,6 +237,13 @@ frontlinesync.sync.config.button=Save changes and push to your Android frontlinesync.connection.options.label=Connection options frontlinesync.sync.config.dirty.false=have been synced with your Android frontlinesync.sync.config.dirty.true=waiting to be synced with your Android +frontlinesync.syncOption.manual=Do not automatically check +frontlinesync.syncOption.1=every minute +frontlinesync.syncOption.5=every 5 minutes +frontlinesync.syncOption.15=every 15 minutes +frontlinesync.syncOption.30=every half hour +frontlinesync.syncOption.60=every hour +frontlinesync.syncOption.120=every 2 hours # Smssync Fconnection smssync.label=SMSSync smssync.name.label=Name diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp index efc5d3df6..a043c8afa 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp @@ -1,3 +1,4 @@ +<%@ page import="frontlinesms2.FrontlinesyncFconnection" %>

      @@ -44,13 +45,23 @@
      - - + +
      - + +if(typeof frontlineSyncCheckSettingOptions == 'undefined') { + frontlineSyncCheckSettingOptions = []; + + frontlineSyncCheckSettingOptions.push({ + 'valueInMinutes': ${minuteVal?:'null'}, + 'i18n': "${g.message(code: 'frontlinesync.syncOption.' + (minuteVal ?: 'manual'))}" + }); + +} + diff --git a/plugins/frontlinesms-core/web-app/css/simple-slider-volume.css b/plugins/frontlinesms-core/web-app/css/simple-slider-volume.css deleted file mode 100755 index d8a876b33..000000000 --- a/plugins/frontlinesms-core/web-app/css/simple-slider-volume.css +++ /dev/null @@ -1,48 +0,0 @@ -.slider-volume { - width: 300px; -} - -.slider-volume > .dragger { - width: 16px; - height: 16px; - margin: 0 auto; - border: 1px solid rgba(255,255,255,0.6); - - -moz-box-shadow: 0 0px 2px 1px rgba(0,0,0,0.5), 0 2px 5px 2px rgba(0,0,0,0.2); - -webkit-box-shadow: 0 0px 2px 1px rgba(0,0,0,0.5), 0 2px 5px 2px rgba(0,0,0,0.2); - box-shadow: 0 0px 2px 1px rgba(0,0,0,0.5), 0 2px 5px 2px rgba(0,0,0,0.2); - - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - border-radius: 10px; - - background: #c5c5c5; - background: -moz-linear-gradient(90deg, rgba(180,180,180,1) 20%, rgba(230,230,230,1) 50%, rgba(180,180,180,1) 80%); - background: -webkit-radial-gradient( 50% 0%, 12% 50%, hsla(0,0%,100%,1) 0%, hsla(0,0%,100%,0) 100%), - -webkit-radial-gradient( 50% 100%, 12% 50%, hsla(0,0%,100%,.6) 0%, hsla(0,0%,100%,0) 100%), - -webkit-radial-gradient( 50% 50%, 200% 50%, hsla(0,0%,90%,1) 5%, hsla(0,0%,85%,1) 30%, hsla(0,0%,60%,1) 100%); -} - -.slider-volume > .track, .slider-volume > .highlight-track { - height: 11px; - - background: #787878; - background: -moz-linear-gradient(top, #787878, #a2a2a2); - background: -webkit-linear-gradient(top, #787878, #a2a2a2); - background: linear-gradient(top, #787878, #a2a2a2); - - -moz-box-shadow: inset 0 2px 5px 1px rgba(0,0,0,0.15), 0 1px 0px 0px rgba(230,230,230,0.9), inset 0 0 1px 1px rgba(0,0,0,0.2); - -webkit-box-shadow: inset 0 2px 5px 1px rgba(0,0,0,0.15), 0 1px 0px 0px rgba(230,230,230,0.9), inset 0 0 1px 1px rgba(0,0,0,0.2); - box-shadow: inset 0 2px 5px 1px rgba(0,0,0,0.15), 0 1px 0px 0px rgba(230,230,230,0.9), inset 0 0 1px 1px rgba(0,0,0,0.2); - - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -.slider-volume > .highlight-track { - background-color: #c5c5c5; - background: -moz-linear-gradient(top, #c5c5c5, #a2a2a2); - background: -webkit-linear-gradient(top, #c5c5c5, #a2a2a2); - background: linear-gradient(top, #c5c5c5, #a2a2a2); -} diff --git a/plugins/frontlinesms-core/web-app/css/simple-slider.css b/plugins/frontlinesms-core/web-app/css/simple-slider.css index ca9bf6b7f..5b145b078 100755 --- a/plugins/frontlinesms-core/web-app/css/simple-slider.css +++ b/plugins/frontlinesms-core/web-app/css/simple-slider.css @@ -4,9 +4,9 @@ .slider > .dragger { background: #8DCA09; - background: -webkit-linear-gradient(top, #8DCA09, #72A307); - background: -moz-linear-gradient(top, #8DCA09, #72A307); - background: linear-gradient(top, #8DCA09, #72A307); + background: -webkit-linear-gradient(top, #C03283, #C03283); + background: -moz-linear-gradient(top, #C03283, #C03283); + background: linear-gradient(top, #C03283, #C03283); -webkit-box-shadow: inset 0 2px 2px rgba(255,255,255,0.5), 0 2px 8px rgba(0,0,0,0.2); -moz-box-shadow: inset 0 2px 2px rgba(255,255,255,0.5), 0 2px 8px rgba(0,0,0,0.2); @@ -16,13 +16,13 @@ -moz-border-radius: 10px; border-radius: 10px; - border: 1px solid #496805; - width: 16px; - height: 16px; + border: 1px solid #C03283; + width: 12px; + height: 12px; } .slider > .dragger:hover { - background: -webkit-linear-gradient(top, #8DCA09, #8DCA09); + background: -webkit-linear-gradient(top, #C03283, #C03283); } diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css index e0c738eba..ba24d3b73 100644 --- a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -213,3 +213,11 @@ tr.connection.connecting .config-table-container{ display:block; } .sync-config-status-toggler { display:inline; text-decoration:underline !important; } .sync-config-container { margin-left:20px; display:none; } .synced-config { margin:5px 0; } +label[for=syncFrequency] { + margin-top:10px; + display:block; + color:#333; +} +label[for=syncFrequency] em { + font-weight:bold; +} diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesync.js b/plugins/frontlinesms-core/web-app/js/frontlinesync.js index 4217a3479..3525b1ee7 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesync.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesync.js @@ -1,5 +1,5 @@ var frontlinesync = (function() { - var connetionRow, updateConfigSynced, beforeUpdate, afterUpdate, toggleOptions; + var connetionRow, updateConfigSynced, beforeUpdate, afterUpdate, toggleOptions, updateCheckFrequencyLabel, bindEventListeners; beforeUpdate = function() { showThinking(); }; @@ -38,10 +38,29 @@ var frontlinesync = (function() { connectionRow.find("#receiveEnabled").attr("checked", data.receiveEnabled); connectionRow.find("#missedCallEnabled").attr("checked", data.missedCallEnabled); }; + + updateCheckFrequencyLabel = function(connectionId) { + var row = $(getConnectionRow(connectionId)), + indexValue = row.find('input[name=syncFrequency]').val(); + row.find('em.syncFrequencyValue').html(frontlineSyncCheckSettingOptions[indexValue].i18n); + }; + + updateAllFrequencyLabels = function() { + $('input[name=syncFrequency]').trigger('slider:changed'); + } + + bindEventListeners = function() { + $('input[name=syncFrequency]').bind('slider:changed', function() { + updateCheckFrequencyLabel($(this).closest('tr').attr('id').split('-')[1]); + }); + }; + + bindEventListeners(); return { beforeUpdate: beforeUpdate, afterUpdate: afterUpdate, toggleOptions: toggleOptions, - updateConfigSynced: updateConfigSynced + updateConfigSynced: updateConfigSynced, + updateAllFrequencyLabels: updateAllFrequencyLabels }; })(); From f733787c748c569af8f0a6f4b09c89f484048875 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 14:40:38 +0300 Subject: [PATCH 2563/2668] A-48 Can save sync frequency from form --- .../services/frontlinesms2/FrontlinesyncService.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index 43c105927..38fbdf19d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -97,6 +97,7 @@ class FrontlinesyncService { ["sendEnabled", "receiveEnabled", "missedCallEnabled"].each { connection."$it" = config."$it" as boolean } + connection.checkIntervalMinutes = FrontlinesyncFconnection.syncFrequencyOptions[config.syncFrequency as int] connection.configSynced = markAsDirty if(connection.sendEnabled) { fconnectionService.enableFconnection(connection) From c5792956a9dc0b154e2e3841074f383b7ccdecc6 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 14:46:23 +0300 Subject: [PATCH 2564/2668] A-48 Save sync frequency changes in android payload --- .../services/frontlinesms2/FrontlinesyncService.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index 38fbdf19d..08391da1f 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -97,7 +97,12 @@ class FrontlinesyncService { ["sendEnabled", "receiveEnabled", "missedCallEnabled"].each { connection."$it" = config."$it" as boolean } - connection.checkIntervalMinutes = FrontlinesyncFconnection.syncFrequencyOptions[config.syncFrequency as int] + if(config.syncFrequency) { + connection.checkIntervalMinutes = FrontlinesyncFconnection.syncFrequencyOptions[config.syncFrequency as int] + } + else if(config.syncInterval) { + connection.checkIntervalMinutes = config.syncInterval as Integer + } connection.configSynced = markAsDirty if(connection.sendEnabled) { fconnectionService.enableFconnection(connection) From 7cd93510d041172af3fa98b24fc45381262994dd Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 15:30:20 +0300 Subject: [PATCH 2565/2668] A-48 Removed old simple-slider theme from settings module --- plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index b2417152b..e95b7e6d9 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -115,7 +115,6 @@ modules = { resource url:[dir:'js', file:'/settings/general_settings.js'] resource url:[dir:'js', file:'simple-slider.js'] resource url:[dir:'css', file:'simple-slider.css'] - resource url:[dir:'css', file:'simple-slider-volume.css'] resource url:[dir:'js', file:'jquery.pulse.js'] resource url:[dir:'js', file:'contact/import_review.js'] } From c630a1c10f49f422a95f300d25cef8d485b86714 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 15:36:13 +0300 Subject: [PATCH 2566/2668] A-48 Check for null syncInterval in payload --- .../services/frontlinesms2/FrontlinesyncService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index 08391da1f..f697e1146 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -101,7 +101,7 @@ class FrontlinesyncService { connection.checkIntervalMinutes = FrontlinesyncFconnection.syncFrequencyOptions[config.syncFrequency as int] } else if(config.syncInterval) { - connection.checkIntervalMinutes = config.syncInterval as Integer + connection.checkIntervalMinutes = config.syncInterval.toString() == 'null' ? null : (config.syncInterval as Integer) } connection.configSynced = markAsDirty if(connection.sendEnabled) { From a41fcb1acac2ee30d8e39e3f54f6850de9271c68 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 16:11:46 +0300 Subject: [PATCH 2567/2668] A-48 Allow app_info updating of the sync frequency slider --- .../src/groovy/frontlinesms2/CoreAppInfoProviders.groovy | 2 +- plugins/frontlinesms-core/web-app/js/frontlinesync.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index aac8b647c..051905df7 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -27,7 +27,7 @@ class CoreAppInfoProviders { s.registerProvider('frontlinesync_config_synced_status') { app, controller, data -> FrontlinesyncFconnection.findAll().collect { c -> - [id:c.id, configSynced:c.configSynced, status:c.status.toString(), sendEnabled:c.sendEnabled, receiveEnabled:c.receiveEnabled, missedCallEnabled:c.missedCallEnabled] + [id:c.id, syncFrequencyIndex: c.getSyncFrequencyOptionListIndex(), configSynced:c.configSynced, status:c.status.toString(), sendEnabled:c.sendEnabled, receiveEnabled:c.receiveEnabled, missedCallEnabled:c.missedCallEnabled] } } diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesync.js b/plugins/frontlinesms-core/web-app/js/frontlinesync.js index 3525b1ee7..55be02714 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesync.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesync.js @@ -31,12 +31,13 @@ var frontlinesync = (function() { } updateConfigSynced = function(data) { - connectionRow = $(getConnectionRow(data.id)); - var configSyncedMessage = i18n('frontlinesync.sync.config.dirty.' + !data.configSynced); + var connectionRow = $(getConnectionRow(data.id)), + configSyncedMessage = i18n('frontlinesync.sync.config.dirty.' + !data.configSynced); connectionRow.find(".sync-config-status").html(configSyncedMessage); connectionRow.find("#sendEnabled").attr("checked", data.sendEnabled); connectionRow.find("#receiveEnabled").attr("checked", data.receiveEnabled); connectionRow.find("#missedCallEnabled").attr("checked", data.missedCallEnabled); + connectionRow.find("input[name=syncFrequency]").simpleSlider("setValue", data.syncFrequencyIndex); }; updateCheckFrequencyLabel = function(connectionId) { From b76a380ea15f76156b3c997f2d39464b77ece34d Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 16:24:05 +0300 Subject: [PATCH 2568/2668] A-48 Manual sync option is now represented by zero instead of null --- .../domain/frontlinesms2/FrontlinesyncFconnection.groovy | 5 ++--- .../services/frontlinesms2/FrontlinesyncService.groovy | 4 ++-- .../grails-app/views/connection/_frontlinesync.gsp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index 439a23fbe..d5381bf16 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -8,7 +8,7 @@ import frontlinesms2.api.* @FrontlineApiAnnotations(apiUrl="frontlinesync") class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { - static final syncFrequencyOptions = [1, 5, 15, 30, 60, 120, null] + static final syncFrequencyOptions = [1, 5, 15, 30, 60, 120, 0] static String getShortName() { 'frontlinesync' } static final passwords = [] static final configFields = ['info-setup': ['secret'], 'info-name':['name']] @@ -24,12 +24,11 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { boolean receiveEnabled = false boolean missedCallEnabled = false boolean configSynced = false - Integer checkIntervalMinutes + int checkIntervalMinutes = 0 String secret static constraints = { lastConnectionTime nullable:true - checkIntervalMinutes nullable:true } def apiProcess(controller) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index f697e1146..e12641811 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -100,8 +100,8 @@ class FrontlinesyncService { if(config.syncFrequency) { connection.checkIntervalMinutes = FrontlinesyncFconnection.syncFrequencyOptions[config.syncFrequency as int] } - else if(config.syncInterval) { - connection.checkIntervalMinutes = config.syncInterval.toString() == 'null' ? null : (config.syncInterval as Integer) + else if(config.syncInterval != null) { + connection.checkIntervalMinutes = config.syncInterval as Integer } connection.configSynced = markAsDirty if(connection.sendEnabled) { diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp index a043c8afa..0948c3adf 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp @@ -58,7 +58,7 @@ if(typeof frontlineSyncCheckSettingOptions == 'undefined') { frontlineSyncCheckSettingOptions = []; frontlineSyncCheckSettingOptions.push({ - 'valueInMinutes': ${minuteVal?:'null'}, + 'valueInMinutes': ${minuteVal}, 'i18n': "${g.message(code: 'frontlinesync.syncOption.' + (minuteVal ?: 'manual'))}" }); From b114520802544113c4b2c3d91712badcff74a5c6 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 25 Apr 2014 17:26:42 +0300 Subject: [PATCH 2569/2668] A-48 Refactored references to syncInterval - --- .../frontlinesms2/FrontlinesyncFconnection.groovy | 8 ++++---- .../grails-app/i18n/messages.properties | 15 ++++++++------- .../frontlinesms2/FrontlinesyncService.groovy | 8 ++++---- .../views/connection/_frontlinesync.gsp | 8 ++++---- .../frontlinesms2/CoreAppInfoProviders.groovy | 2 +- .../web-app/css/unreviewed-core.css | 4 ++-- .../frontlinesms-core/web-app/js/frontlinesync.js | 10 +++++----- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index d5381bf16..19b0f923a 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -8,7 +8,7 @@ import frontlinesms2.api.* @FrontlineApiAnnotations(apiUrl="frontlinesync") class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { - static final syncFrequencyOptions = [1, 5, 15, 30, 60, 120, 0] + static final checkIntervalOptions = [1, 5, 15, 30, 60, 120, 0] static String getShortName() { 'frontlinesync' } static final passwords = [] static final configFields = ['info-setup': ['secret'], 'info-name':['name']] @@ -24,7 +24,7 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { boolean receiveEnabled = false boolean missedCallEnabled = false boolean configSynced = false - int checkIntervalMinutes = 0 + int checkInterval = 0 String secret static constraints = { @@ -58,8 +58,8 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { return routeDefinitions } - def getSyncFrequencyOptionListIndex() { - return syncFrequencyOptions.indexOf(checkIntervalMinutes) + def getIndexOfCurrentCheckFrequency() { + return checkIntervalOptions.indexOf(checkInterval) } String getFullApiUrl(request) { diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 8812d5c77..908e77b74 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -237,13 +237,14 @@ frontlinesync.sync.config.button=Save changes and push to your Android frontlinesync.connection.options.label=Connection options frontlinesync.sync.config.dirty.false=have been synced with your Android frontlinesync.sync.config.dirty.true=waiting to be synced with your Android -frontlinesync.syncOption.manual=Do not automatically check -frontlinesync.syncOption.1=every minute -frontlinesync.syncOption.5=every 5 minutes -frontlinesync.syncOption.15=every 15 minutes -frontlinesync.syncOption.30=every half hour -frontlinesync.syncOption.60=every hour -frontlinesync.syncOption.120=every 2 hours +frontlinesync.checkInterval.label=Check for outgoing messages: +frontlinesync.checkInterval.manual=Do not automatically check +frontlinesync.checkInterval.1=every minute +frontlinesync.checkInterval.5=every 5 minutes +frontlinesync.checkInterval.15=every 15 minutes +frontlinesync.checkInterval.30=every half hour +frontlinesync.checkInterval.60=every hour +frontlinesync.checkInterval.120=every 2 hours # Smssync Fconnection smssync.label=SMSSync smssync.name.label=Name diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index e12641811..8c4c7a6f2 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -97,11 +97,11 @@ class FrontlinesyncService { ["sendEnabled", "receiveEnabled", "missedCallEnabled"].each { connection."$it" = config."$it" as boolean } - if(config.syncFrequency) { - connection.checkIntervalMinutes = FrontlinesyncFconnection.syncFrequencyOptions[config.syncFrequency as int] + if(config.checkIntervalIndex) { + connection.checkInterval = FrontlinesyncFconnection.checkIntervalOptions[config.checkIntervalIndex as int] } - else if(config.syncInterval != null) { - connection.checkIntervalMinutes = config.syncInterval as Integer + else if(config.checkInterval != null) { + connection.checkInterval = config.checkInterval as Integer } connection.configSynced = markAsDirty if(connection.sendEnabled) { diff --git a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp index 0948c3adf..aac89f3df 100644 --- a/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp +++ b/plugins/frontlinesms-core/grails-app/views/connection/_frontlinesync.gsp @@ -45,8 +45,8 @@
      - - + +
      @@ -56,10 +56,10 @@ if(typeof frontlineSyncCheckSettingOptions == 'undefined') { frontlineSyncCheckSettingOptions = []; - + frontlineSyncCheckSettingOptions.push({ 'valueInMinutes': ${minuteVal}, - 'i18n': "${g.message(code: 'frontlinesync.syncOption.' + (minuteVal ?: 'manual'))}" + 'i18n': "${g.message(code: 'frontlinesync.checkInterval.' + (minuteVal ?: 'manual'))}" }); } diff --git a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy index 051905df7..f5d23c2c8 100644 --- a/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy +++ b/plugins/frontlinesms-core/src/groovy/frontlinesms2/CoreAppInfoProviders.groovy @@ -27,7 +27,7 @@ class CoreAppInfoProviders { s.registerProvider('frontlinesync_config_synced_status') { app, controller, data -> FrontlinesyncFconnection.findAll().collect { c -> - [id:c.id, syncFrequencyIndex: c.getSyncFrequencyOptionListIndex(), configSynced:c.configSynced, status:c.status.toString(), sendEnabled:c.sendEnabled, receiveEnabled:c.receiveEnabled, missedCallEnabled:c.missedCallEnabled] + [id:c.id, checkIntervalIndex: c.getIndexOfCurrentCheckFrequency(), configSynced:c.configSynced, status:c.status.toString(), sendEnabled:c.sendEnabled, receiveEnabled:c.receiveEnabled, missedCallEnabled:c.missedCallEnabled] } } diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css index ba24d3b73..c537b02e6 100644 --- a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -213,11 +213,11 @@ tr.connection.connecting .config-table-container{ display:block; } .sync-config-status-toggler { display:inline; text-decoration:underline !important; } .sync-config-container { margin-left:20px; display:none; } .synced-config { margin:5px 0; } -label[for=syncFrequency] { +label[for=checkIntervalIndex] { margin-top:10px; display:block; color:#333; } -label[for=syncFrequency] em { +label[for=checkIntervalIndex] em { font-weight:bold; } diff --git a/plugins/frontlinesms-core/web-app/js/frontlinesync.js b/plugins/frontlinesms-core/web-app/js/frontlinesync.js index 55be02714..421e36f25 100644 --- a/plugins/frontlinesms-core/web-app/js/frontlinesync.js +++ b/plugins/frontlinesms-core/web-app/js/frontlinesync.js @@ -37,21 +37,21 @@ var frontlinesync = (function() { connectionRow.find("#sendEnabled").attr("checked", data.sendEnabled); connectionRow.find("#receiveEnabled").attr("checked", data.receiveEnabled); connectionRow.find("#missedCallEnabled").attr("checked", data.missedCallEnabled); - connectionRow.find("input[name=syncFrequency]").simpleSlider("setValue", data.syncFrequencyIndex); + connectionRow.find("input[name=checkIntervalIndex]").simpleSlider("setValue", data.checkIntervalIndex); }; updateCheckFrequencyLabel = function(connectionId) { var row = $(getConnectionRow(connectionId)), - indexValue = row.find('input[name=syncFrequency]').val(); - row.find('em.syncFrequencyValue').html(frontlineSyncCheckSettingOptions[indexValue].i18n); + indexValue = row.find('input[name=checkIntervalIndex]').val(); + row.find('em.checkIntervalValue').html(frontlineSyncCheckSettingOptions[indexValue].i18n); }; updateAllFrequencyLabels = function() { - $('input[name=syncFrequency]').trigger('slider:changed'); + $('input[name=checkIntervalIndex]').trigger('slider:changed'); } bindEventListeners = function() { - $('input[name=syncFrequency]').bind('slider:changed', function() { + $('input[name=checkIntervalIndex]').bind('slider:changed', function() { updateCheckFrequencyLabel($(this).closest('tr').attr('id').split('-')[1]); }); }; From aa53a5490f2871f811aa95f725cff09848cdbbb9 Mon Sep 17 00:00:00 2001 From: fredotieno Date: Mon, 28 Apr 2014 09:42:52 +0300 Subject: [PATCH 2570/2668] Added variable to store the total frontlinesync connections created --- .../frontlinesms2/ConnectionController.groovy | 3 ++- .../views/fconnection/frontlinesync/_config.gsp | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index eae260cd6..a2d4ea7a3 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -47,7 +47,8 @@ class ConnectionController extends ControllerUtils { } } } else { - return [action:'save'] + def frontlinesyncCount = FrontlinesyncFconnection.countByNameLike("%FrontlineSync%") + return [action:'save', frontlinesyncCount:frontlinesyncCount] } } diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 1aaefe17f..60f99bdd4 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -2,8 +2,14 @@


      - - + + + + + + + +

      From e9a39025d27da7f40784a6ab1ab3e2efc81c8435 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Apr 2014 10:27:30 +0300 Subject: [PATCH 2571/2668] A-48 Send checkInterval to android when config is dirty --- .../services/frontlinesms2/FrontlinesyncService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index 8c4c7a6f2..02051fbde 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -115,7 +115,7 @@ class FrontlinesyncService { private generateSyncConfig(connection) { def m = [:] - ["sendEnabled", "receiveEnabled", "missedCallEnabled"].each { + ["sendEnabled", "receiveEnabled", "missedCallEnabled", "checkInterval"].each { m."$it" = connection."$it" } m From 33feaebeb5e3543ec27745a2543d8a4e31318668 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Apr 2014 11:14:18 +0300 Subject: [PATCH 2572/2668] A-48 Added FrontlinesyncFSpec --- .../connection/FrontlinesyncFSpec.groovy | 65 +++++++++++++++++++ .../connection/PageConnection.groovy | 8 +++ 2 files changed, 73 insertions(+) create mode 100644 plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy new file mode 100644 index 000000000..2e40e630e --- /dev/null +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy @@ -0,0 +1,65 @@ +package frontlinesms2.connection +import spock.lang.* + +import frontlinesms2.* +import frontlinesms2.popup.* +import frontlinesms2.dev.MockModemUtils + +import serial.mock.MockSerial +import serial.mock.CommPortIdentifier +import spock.lang.* + +class FrontlinesyncFSpec extends grails.plugin.geb.GebSpec { + def 'can toggle the display of FrontlineSync\'s config using the provided link'() { + given: + setUpTestConnection() + when: + to PageConnection + then: + connectionList.frontlineSyncConfigExpander(0).displayed + !connectionList.frontlineSyncConfigHolder(0).displayed + when: + connectionList.frontlineSyncConfigExpander(0).click() + then: + waitFor { + connectionList.frontlineSyncConfigHolder(0).displayed + } + } + + def 'can change the sendEnabled, receiveEnabled and missedCallEnabled attributes via inline config editor'() { + given: + setUpTestConnection() + when: + to PageConnection + then: + connectionList.frontlineSyncConfigExpander(0).displayed + when: + connectionList.frontlineSyncConfigExpander(0).click() + then: + waitFor { + connectionList.frontlineSyncConfigHolder(0).displayed + } + !connectionList.frontlineSyncSendEnabled(0).value() + !connectionList.frontlineSyncReceiveEnabled(0).value() + !connectionList.frontlineSyncMissedCallEnabled(0).value() + when: + connectionList.frontlineSyncSendEnabled(0).click() + connectionList.frontlineSyncReceiveEnabled(0).click() + connectionList.frontlineSyncMissedCallEnabled(0).click() + connectionList.frontlineSyncSaveConfig(0).click() + to PageConnection + then: + waitFor { + connectionList.frontlineSyncSendEnabled(0).value() + connectionList.frontlineSyncReceiveEnabled(0).value() + connectionList.frontlineSyncMissedCallEnabled(0).value() + } + } + + private def setUpTestConnection() { + remote { + new FrontlinesyncFconnection(name:"FrontlineSync connection", secret:'3469', enabled:true, sendEnabled: false, receiveEnabled: false, missedCallEnabled: false, checkInterval:0).save(flush: true, failOnError:true) + return null + } + } +} diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index 59b676ba4..883b2a34c 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -45,6 +45,14 @@ class ConnectionList extends Module { status { i -> connection(i).find('td.connection-status') } smssyncUrl { i -> connection(i).find('p.api-url') } smssyncLastconnected { i -> connection(i).find('em.smssync-lastconnected') } + frontlineSyncConfigExpander { i -> connection(i).find('a.sync-config-status-toggler') } + frontlineSyncConfigHolder(required:false) { i -> connection(i).find('div.sync-config-container') } + frontlineSyncSendEnabled { i -> connection(i).find('#sendEnabled') } + frontlineSyncReceiveEnabled { i -> connection(i).find('#receiveEnabled') } + frontlineSyncMissedCallEnabled { i -> connection(i).find('#missedCallEnabled') } + frontlineSyncCheckFrequencyValue { i -> connection(i).find('input[name=checkIntervalIndex]').jquery.val() } + setFrontlineSyncCheckFrequencyValue { val -> js.exec "\$('input[name=checkIntervalIndex]').simpleSlider('setValue', ${val});" } + frontlineSyncSaveConfig { i -> connection(i).find('#sync-config-button') } } } From 96c09a1746d98e7b85622da6a38af5c1b24ab2c0 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Apr 2014 11:51:56 +0300 Subject: [PATCH 2573/2668] A-48 Expanded FrontlinesyncFSpec --- .../connection/FrontlinesyncFSpec.groovy | 61 ++++++++++++++++++- .../connection/PageConnection.groovy | 2 + 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy index 2e40e630e..64bdbb911 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy @@ -56,9 +56,66 @@ class FrontlinesyncFSpec extends grails.plugin.geb.GebSpec { } } - private def setUpTestConnection() { + @Unroll + def 'each checkInterval is represented by the slider, with appropriate text above it'() { + given: + setUpTestConnection(true,checkInterval) + when: + to PageConnection + connectionList.frontlineSyncConfigExpander(0).click() + then: + connectionList.frontlineSyncCheckIntervalString(0) == "frontlinesync.checkInterval.${expectedString}" + where: + checkInterval | expectedString + 1 | '1' + 5 | '5' + 15 | '15' + 30 | '30' + 60 | '60' + 120 | '120' + 0 | 'manual' + } + + def 'when config is changed in the back end while the UI is displayed, the display is updated asynchronously, including the \'dirty\' flag'() { + given: + setUpTestConnection(true,0) + when: + to PageConnection + connectionList.frontlineSyncConfigExpander(0).click() + then: + connectionList.frontlineSyncConfigSyncStatus(0) == 'frontlinesync.sync.config.dirty.true' + !connectionList.frontlineSyncSendEnabled(0).value() + !connectionList.frontlineSyncReceiveEnabled(0).value() + !connectionList.frontlineSyncMissedCallEnabled(0).value() + connectionList.frontlineSyncCheckIntervalString(0) == "frontlinesync.checkInterval.manual" + when: + remote { + def fc = FrontlinesyncFconnection.findBySecret('3469') + fc.sendEnabled = true + fc.receiveEnabled = true + fc.missedCallEnabled = true + fc.checkInterval = 60 + fc.configSynced = true + fc.save(flush:true, failOnError: true) + return null + } + then: + waitFor ('very slow') { + connectionList.frontlineSyncConfigSyncStatus(0) == 'frontlinesync.sync.config.dirty.false' + connectionList.frontlineSyncSendEnabled(0).value() + connectionList.frontlineSyncReceiveEnabled(0).value() + connectionList.frontlineSyncMissedCallEnabled(0).value() + connectionList.frontlineSyncCheckIntervalString(0) == "frontlinesync.checkInterval.60" + } + } + + private def setUpTestConnection(hasBeenContacted=true,checkInterval=0) { remote { - new FrontlinesyncFconnection(name:"FrontlineSync connection", secret:'3469', enabled:true, sendEnabled: false, receiveEnabled: false, missedCallEnabled: false, checkInterval:0).save(flush: true, failOnError:true) + def conn = new FrontlinesyncFconnection(name:"FrontlineSync connection", secret:'3469', enabled:true, sendEnabled: false, receiveEnabled: false, missedCallEnabled: false, checkInterval:checkInterval) + if(hasBeenContacted) { + conn.lastConnectionTime = new Date() + } + conn.save(flush: true, failOnError:true) return null } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index 883b2a34c..0e3b4a255 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -52,7 +52,9 @@ class ConnectionList extends Module { frontlineSyncMissedCallEnabled { i -> connection(i).find('#missedCallEnabled') } frontlineSyncCheckFrequencyValue { i -> connection(i).find('input[name=checkIntervalIndex]').jquery.val() } setFrontlineSyncCheckFrequencyValue { val -> js.exec "\$('input[name=checkIntervalIndex]').simpleSlider('setValue', ${val});" } + frontlineSyncCheckIntervalString { i -> connection(i).find('em.checkIntervalValue').text() } frontlineSyncSaveConfig { i -> connection(i).find('#sync-config-button') } + frontlineSyncConfigSyncStatus { i -> connection(i).find('span.sync-config-status').text() } } } From 3151f2d7abd5024f8896dbf9e94b90f0788a616f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Apr 2014 12:05:05 +0300 Subject: [PATCH 2574/2668] A-48 More FrontlinesyncFSpec test cases --- .../connection/FrontlinesyncFSpec.groovy | 31 +++++++++++++++++++ .../connection/PageConnection.groovy | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy index 64bdbb911..977863c9b 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/FrontlinesyncFSpec.groovy @@ -76,6 +76,37 @@ class FrontlinesyncFSpec extends grails.plugin.geb.GebSpec { 0 | 'manual' } + def 'changing the checkInterval updates the text display live, and submitting the value updates the saved interval on the server'() { + given: + setUpTestConnection(true,0) + when: + to PageConnection + connectionList.frontlineSyncConfigExpander(0).click() + then: + connectionList.frontlineSyncCheckIntervalString(0) == "frontlinesync.checkInterval.manual" + when: + connectionList.setFrontlineSyncCheckFrequencyValue(intervalIndex) + then: + connectionList.frontlineSyncCheckIntervalString(0) == "frontlinesync.checkInterval.${expectedString}" + when: + connectionList.frontlineSyncSaveConfig(0).click() + then: + waitFor { + remote { + FrontlinesyncFconnection.findBySecret('3469').checkInterval == checkInterval + } + } + where: + checkInterval | expectedString | intervalIndex + 1 | '1' | 0 + 5 | '5' | 1 + 15 | '15' | 2 + 30 | '30' | 3 + 60 | '60' | 4 + 120 | '120' | 5 + 0 | 'manual' | 6 + } + def 'when config is changed in the back end while the UI is displayed, the display is updated asynchronously, including the \'dirty\' flag'() { given: setUpTestConnection(true,0) diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy index 0e3b4a255..7970a3260 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/connection/PageConnection.groovy @@ -51,7 +51,7 @@ class ConnectionList extends Module { frontlineSyncReceiveEnabled { i -> connection(i).find('#receiveEnabled') } frontlineSyncMissedCallEnabled { i -> connection(i).find('#missedCallEnabled') } frontlineSyncCheckFrequencyValue { i -> connection(i).find('input[name=checkIntervalIndex]').jquery.val() } - setFrontlineSyncCheckFrequencyValue { val -> js.exec "\$('input[name=checkIntervalIndex]').simpleSlider('setValue', ${val});" } + setFrontlineSyncCheckFrequencyValue { val -> js.exec "\$('input[name=checkIntervalIndex]').simpleSlider('setValue', ${val});"; return true } frontlineSyncCheckIntervalString { i -> connection(i).find('em.checkIntervalValue').text() } frontlineSyncSaveConfig { i -> connection(i).find('#sync-config-button') } frontlineSyncConfigSyncStatus { i -> connection(i).find('span.sync-config-status').text() } From 09347dc7c80cb392eb2573487f8a32f09ffcd4e1 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Apr 2014 12:19:01 +0300 Subject: [PATCH 2575/2668] A-48 Minor 18n change --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index 908e77b74..0481ec001 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -237,7 +237,7 @@ frontlinesync.sync.config.button=Save changes and push to your Android frontlinesync.connection.options.label=Connection options frontlinesync.sync.config.dirty.false=have been synced with your Android frontlinesync.sync.config.dirty.true=waiting to be synced with your Android -frontlinesync.checkInterval.label=Check for outgoing messages: +frontlinesync.checkInterval.label=Check for outgoing messages frontlinesync.checkInterval.manual=Do not automatically check frontlinesync.checkInterval.1=every minute frontlinesync.checkInterval.5=every 5 minutes From 70c6e57b55893ec122ffde43dcc5ca1113ef6e20 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 28 Apr 2014 13:27:19 +0300 Subject: [PATCH 2576/2668] A-48 Fixed FrontlinesyncServiceSpec --- .../unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy index 9fcf2cfd8..eacf6894b 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy @@ -176,7 +176,7 @@ class FrontlinesyncServiceSpec extends Specification { def connection = setupConnection("secret") connection.configSynced = false expect: - service.generateOutgoingResponse(connection).equals([config:[sendEnabled:null, receiveEnabled:null, missedCallEnabled:null]]) + service.generateOutgoingResponse(connection).equals([config:[sendEnabled:null, receiveEnabled:null, missedCallEnabled:null, checkInterval: null]]) } From 02f6074d5492d8cc4fa32d30e5a58e74c4ffa570 Mon Sep 17 00:00:00 2001 From: fredotieno Date: Mon, 28 Apr 2014 14:51:14 +0300 Subject: [PATCH 2577/2668] One-liner giving \o/sync connection a name --- .../frontlinesms2/ConnectionController.groovy | 3 +-- .../views/fconnection/frontlinesync/_config.gsp | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index a2d4ea7a3..eae260cd6 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -47,8 +47,7 @@ class ConnectionController extends ControllerUtils { } } } else { - def frontlinesyncCount = FrontlinesyncFconnection.countByNameLike("%FrontlineSync%") - return [action:'save', frontlinesyncCount:frontlinesyncCount] + return [action:'save'] } } diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 60f99bdd4..85305d31e 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -2,14 +2,8 @@


      - - - - - - - - + +

      From edef8938155096edd012d6bb83e4a74b3c5aeaa4 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 28 Apr 2014 16:57:01 +0300 Subject: [PATCH 2578/2668] A-49 Fix bad regex for evaluating proper conneciton status --- .../grails-app/services/frontlinesms2/FconnectionService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index edaacccce..6ce18ce1d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -75,7 +75,7 @@ class FconnectionService { if(c.id in connectingIds) { return ConnectionStatus.CONNECTING } - if(camelContext.routes.any { it.id ==~ /.*-$c.id$/ }) { + if(camelContext.routes.any { it.id ==~ /out.*-$c.id$/ }) { return ConnectionStatus.CONNECTED } if(c.hasProperty('customStatus')) { From 253c5e9a87084d7b69e999d9e28232751b3a2af8 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 28 Apr 2014 16:57:27 +0300 Subject: [PATCH 2579/2668] A-49 Add brackets around FrontlineSync autogenerated names --- .../grails-app/views/fconnection/frontlinesync/_config.gsp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 85305d31e..3fc0337d8 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -3,7 +3,12 @@
      - + <% + def connectionsCount = frontlinesms2.FrontlinesyncFconnection.countByNameLike("%FrontlineSync%") + def suffix = connectionsCount?"($connectionsCount)" :'' + def connectionName = fconnectionInstance?.name?:'FrontlineSync '+ suffix + %> +

      From 98ce731811919f6e241ce97ac5345d667be87d46 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 28 Apr 2014 17:19:13 +0300 Subject: [PATCH 2580/2668] A-49 Fix css layout bug in firefox --- plugins/frontlinesms-core/web-app/css/unreviewed-core.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css index 5eb0676c1..5935858d3 100644 --- a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -210,12 +210,9 @@ tr.connection.connected .sync-config-status-container { display:block; } .sync-config-status-container .expand { font-size:14px; } .config-table-container{ display:none; } tr.connection.connecting .config-table-container{ display:block; } -.config-table { display:table; border-collapse:separate; border-spacing:5px; } -.config-values { display:table-row; } -.connection-config-container { padding:5px; height:auto; position:relative; } +.connection-config-container { display:inline-block; padding:5px; height:auto; position:relative; border:1px solid black; } .connection-config-container .icon { text-align:end; font-size:1.5em; position:absolute; bottom:5px; right: 5px; } .connection:hover .connection-config-container { background-color:white; } -.connection-config-container { display:table-cell; border:1px solid black; } .connection-config { padding: 3px 15px; } .connection-config .field-label { text-align:center; } .connection-config .field-value { text-align:center; } From 8e88246ea92c5c07a25a6d03f8f252a3bac89ceb Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 29 Apr 2014 13:28:11 +0300 Subject: [PATCH 2581/2668] A-49 Remove trailing space for default FrontlineSync connection name --- .../grails-app/views/fconnection/frontlinesync/_config.gsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 3fc0337d8..d1bf6dd74 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -5,8 +5,8 @@ <% def connectionsCount = frontlinesms2.FrontlinesyncFconnection.countByNameLike("%FrontlineSync%") - def suffix = connectionsCount?"($connectionsCount)" :'' - def connectionName = fconnectionInstance?.name?:'FrontlineSync '+ suffix + def suffix = connectionsCount?" ($connectionsCount)" :'' + def connectionName = fconnectionInstance?.name?:'FrontlineSync'+ suffix %>
      From 4516bd34c23e980f420819699c59abb8879376d3 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 29 Apr 2014 15:14:35 +0300 Subject: [PATCH 2582/2668] TOOLS-1272 Purge routing rules for deleted connections before adding new ones --- .../frontlinesms2/ConnectionController.groovy | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 18557c71f..72c2ddef7 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -239,8 +239,21 @@ class ConnectionController extends ControllerUtils { if(saveSuccessful) { doAfterSaveOperations(fconnectionInstance) def connectionUseSetting = appSettingsService['routing.use'] - appSettingsService['routing.use'] = connectionUseSetting? - "$connectionUseSetting,fconnection-$fconnectionInstance.id": + def purgedRules = [] + if (connectionUseSetting) { + connectionUseSetting.split(',').each { rule -> + if(rule.startsWith('fconnection-')) { + if(Fconnection.countById(rule.split('-')[1] as int)) { + purgedRules << rule + } + } + else { + purgedRules << rule + } + } + } + appSettingsService['routing.use'] = purgedRules? + "${purgedRules.join(',')},fconnection-$fconnectionInstance.id": "fconnection-$fconnectionInstance.id" withFormat { html { From 29ba3c0e18b1889f1bfbac47de699eb610dab0b2 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 29 Apr 2014 15:31:04 +0300 Subject: [PATCH 2583/2668] TOOLS-1272 Updated ConnectionControllerSpec --- .../ConnectionControllerSpec.groovy | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy index 7e22c4ea3..677f1ddc4 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ConnectionControllerSpec.groovy @@ -103,6 +103,9 @@ class ConnectionControllerSpec extends Specification { @Unroll def 'creating a connection should add it to the enabled routes list'() { given: 'TODO set up request vars' + Fconnection.metaClass.static.countById = { id -> + return 1 + } def ass = ['routing.use':initialSetting] controller.appSettingsService = ass params.connectionType = 'smssync' @@ -119,8 +122,27 @@ class ConnectionControllerSpec extends Specification { initialSetting | finalSetting null|/^fconnection-\d+$/ ''|/^fconnection-\d+$/ - 'fconnection-C'|/^fconnection-C,fconnection-\d+$/ - 'fconnection-C,fconnection-A'|/^fconnection-C,fconnection-A,fconnection-\d+$/ + 'fconnection-9'|/^fconnection-9,fconnection-\d+$/ + 'fconnection-9,fconnection-8'|/^fconnection-9,fconnection-8,fconnection-\d+$/ + } + + def 'when adding new connections to the routing rule list, non-existent connections are purged from it'() { + given: + Fconnection.metaClass.static.countById = { id -> + return (id == 2 || id == 3) ? 1 : 0 + } + def ass = ['routing.use':'uselastreceiver,fconnection-1,fconnection-3,fconnection-2,fconnection-4,fconnection-5'] + controller.appSettingsService = ass + params.connectionType = 'smssync' + params.smssyncname = 'test-connection' + params.smssyncreceiveEnabled = true + params.smssyncsecret = '' + params.smssyncsendEnabled = true + params.smssynctimeout = '60' + when: + controller.save() + then: + ass['routing.use'] ==~ /^uselastreceiver,fconnection-3,fconnection-2,fconnection-\d+$/ } private def buildTestConnection(status) { From 6489e8e81c83515291f52ceac3ebc558848b8c0f Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Wed, 30 Apr 2014 11:49:03 +0300 Subject: [PATCH 2584/2668] TOOLS-1272 TOOLS 1272 Rename "purgedRules" to "retainedRules" --- .../frontlinesms2/ConnectionController.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy index 72c2ddef7..b51defee4 100644 --- a/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy +++ b/plugins/frontlinesms-core/grails-app/controllers/frontlinesms2/ConnectionController.groovy @@ -239,21 +239,21 @@ class ConnectionController extends ControllerUtils { if(saveSuccessful) { doAfterSaveOperations(fconnectionInstance) def connectionUseSetting = appSettingsService['routing.use'] - def purgedRules = [] + def retainedRules = [] if (connectionUseSetting) { connectionUseSetting.split(',').each { rule -> if(rule.startsWith('fconnection-')) { if(Fconnection.countById(rule.split('-')[1] as int)) { - purgedRules << rule + retainedRules << rule } } else { - purgedRules << rule + retainedRules << rule } } } - appSettingsService['routing.use'] = purgedRules? - "${purgedRules.join(',')},fconnection-$fconnectionInstance.id": + appSettingsService['routing.use'] = retainedRules? + "${retainedRules.join(',')},fconnection-$fconnectionInstance.id": "fconnection-$fconnectionInstance.id" withFormat { html { From a8545e7c236aef62976509dae7c94f2074bfb143 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 2 May 2014 13:05:39 +0300 Subject: [PATCH 2585/2668] A-48 Change default checkInterval to be 1 minute --- .../domain/frontlinesms2/FrontlinesyncFconnection.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index 19b0f923a..f11c2e4a2 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -24,7 +24,7 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { boolean receiveEnabled = false boolean missedCallEnabled = false boolean configSynced = false - int checkInterval = 0 + int checkInterval = 1 String secret static constraints = { From 9a996c49f2a9f1ac5f2f5c447c2a7ff7c59b1a86 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Fri, 2 May 2014 17:31:23 +0300 Subject: [PATCH 2586/2668] A-50 Added link to Google Play in FrontlineSync wizard, and simplified layout --- .../grails-app/i18n/messages.properties | 3 ++- .../taglib/frontlinesms2/FsmsTagLib.groovy | 1 - .../views/fconnection/frontlinesync/_config.gsp | 16 ++++++++-------- .../web-app/css/unreviewed-core.css | 7 +++++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index ab2946d77..ea850d1c1 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -217,7 +217,8 @@ nexmo.sendEnabled.label=Sending enabled # FrontlineSync Fconnection frontlinesync.label=Alpha: FrontlineSync frontlinesync.description=Receive missed-call notifications from your Android phone. -frontlinesync.info-setup=Give your FrontlineSync connection a name of your choice, e.g. 'Charlie's work Android'. +frontlinesync.info-setup.p1=FrontlineSync is an Android app that allows you to use your Android device as a gateway for FrontlineSMS and FrontlineCloud. Using FrontlineSync, you can send and receive SMS, and also track missed calls. +frontlinesync.info-setup.p2=To set up a FrontlineSync connection, install the app on your phone from the Google Play link below, give the connection a name, and click next. Once you submit this form, you will be provided information that you need to enter into the Android app. frontlinesync.passcode-setup=The FrontlineSync app on your Android device will ask you to enter the passcode below the first time you open the app. You can also reconfigure FrontlineSync by navigating to the Configure Screen via the Android app's main menu. frontlinesync.final-setup=Click Next to save this configuration. frontlinesync.secret.label=Passcode diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index e9edf301a..29eb3cbb5 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -618,7 +618,6 @@ class FsmsTagLib { passcode = randomData.nextInt(1000, 9999) } out << g.hiddenField(name:'frontlinesyncsecret', value:passcode) - out << "
      ${passcode}
      " } private def getFields(att) { diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index d1bf6dd74..166ab9a36 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -1,5 +1,7 @@       diff --git a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css index e3cfc0249..d71345d38 100644 --- a/plugins/frontlinesms-core/web-app/css/unreviewed-core.css +++ b/plugins/frontlinesms-core/web-app/css/unreviewed-core.css @@ -211,6 +211,7 @@ tr.connection.connected .sync-config-status-container { display:block; } .config-table-container{ display:none; } tr.connection.connecting .config-table-container{ display:block; } .connection-config-container { display:inline-block; padding:5px; height:auto; position:relative; border:1px solid black; } +.connection-config-container.noborder { border:none; } .connection-config-container .icon { text-align:end; font-size:1.5em; position:absolute; bottom:5px; right: 5px; } .connection:hover .connection-config-container { background-color:white; } .connection-config { padding: 3px 15px; } @@ -236,3 +237,9 @@ label[for=checkIntervalIndex] { label[for=checkIntervalIndex] em { font-weight:bold; } +.google-play-link { + display: block; +} +.google-play-link.large { + padding-top:10px; +} From 58f0fd82225b006ef5c5da41744b0c8e4e9b5627 Mon Sep 17 00:00:00 2001 From: fredotieno Date: Mon, 5 May 2014 11:47:43 +0300 Subject: [PATCH 2587/2668] Merged Dutch Translation --- .../grails-app/i18n/messages_nl.properties | 162 +++++++++--------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages_nl.properties b/plugins/frontlinesms-core/grails-app/i18n/messages_nl.properties index beeb08aee..899520bc3 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages_nl.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages_nl.properties @@ -33,7 +33,7 @@ connection.route.disableNotification=Verbinding via route verbroken op {0} connection.route.pauseNotification=verbinding onderbroken connection.route.resumeNotification=verbinding hervat op connection.test.sent=Testbericht met succes verzonden naar{0} via{1} -connection.route.exception={1} +connection.route.exception={,1} # Connection exception messages connection.error.org.smslib.alreadyconnectedexception=Apparaat is al verbonden connection.error.org.smslib.gsmnetworkregistrationexception=Registratie bij GSM network is mislukt @@ -53,7 +53,7 @@ connection.list.none=U heeft geen verbindingen geconfigureerd. connection.edit=Verbinding bewerken connection.delete=Verbinding verwijderen connection.deleted=Verbinding {0} is verwijderd. -connection.route.enable=Enable +connection.route.enable=Activeren connection.route.retryconnection=Opnieuw proberen connection.add=Nieuwe verbinding toevoegen connection.createtest.message.label=Testbericht @@ -69,7 +69,7 @@ connection.createtest.number=Nummer connection.confirm.header=Instellingen bevestigen connection.name.autoconfigured=Automatisch geconfigureerd {0} {1} op port {2}" status.connection.title=Verbindingen -status.connection.manage=Manage your connections +status.connection.manage=Verbindingen beheren status.connection.none=U heeft geen verbindingen geconfigureerd status.devises.header=Apparatuur bespeurd status.detect.modems=Modems bespeuren @@ -123,7 +123,7 @@ default.unarchived.multiple={0} gede-archiveerd default.delete.failed=Kon niet worden verwijderd {0} met id {1} default.notfound=Niet gevonden {0} met id {1} default.optimistic.locking.failure=Een andere gebruiker heeft dit bijgewerkt {0} tijdens Uw bewerking -default.home.label=Home +default.home.label=Start default.list.label={0} Lijst default.add.label=Toevoegen {0} default.new.label=Nieuw {0} @@ -136,7 +136,7 @@ default.button.edit.label=Bewerken default.button.update.label=Bijwerken default.button.delete.label=Verwijderen default.button.search.label=Zoeken -default.button.apply.label=Apply +default.button.apply.label=Toepassen default.button.delete.confirm.message=Bent U zeker? default.deleted.message={0} verwijderd # Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author) @@ -160,24 +160,24 @@ default.search.date.format=d/M/yyyy default.search.moreoption.label=Verdere opties # SMSLib Fconnection smslib.label=Telefoon/Modem -smslib.type.label=Type +smslib.type.label=Soort smslib.name.label=Naam smslib.manufacturer.label=Fabrikant smslib.model.label=Model smslib.port.label=Port -smslib.baud.label=Baud rate +smslib.baud.label=Baudrate smslib.pin.label=PIN smslib.imsi.label=SIM IMSI smslib.serial.label=Serienummer van het apparaat # -smslib.sendEnabled.label=Use for sending -smslib.receiveEnabled.label=Use for receiving -smslibFconnection.sendEnabled.validator.error.send=Modem should be used for sending -smslibFconnection.receiveEnabled.validator.error.receive=or receiving messages +smslib.sendEnabled.label=Gebruiken voor versturen +smslib.receiveEnabled.label=Gebruiken voor ontvangen +smslibFconnection.sendEnabled.validator.error.send=Modem gebruiken om te versturen +smslibFconnection.receiveEnabled.validator.error.receive=of berichten te ontvangen smslib.description=Verbinden met USB, serial en bluetooth modems of telefoon smslib.global.info=FrontlineSMS zal proberen om automatisch een verbonden modem of telefoon te configureren, maar hier kunt U deze zelf configureren # Email Fconnection -email.label=Email -email.type.label=Type +email.label=E-mail +email.type.label=Soort email.name.label=Naam email.receiveProtocol.label=Protocol email.serverName.label=Server Naam @@ -197,14 +197,14 @@ clickatell.description=Een bericht verzenden en ontvangen via een Clickatell acc clickatell.global.info=U zult een account moeten configureren met Clickatell (www.clickatell.com). clickatellFconnection.fromNumber.validator.invalid=A 'Van Nummer' is vereist om een bericht naar de Verenigde Staten te verzenden # TODO: Change markup below to markdown -clickatell.info-local=In order to set up a Clickatell connection, you must first have a Clickatell account. If you do not have one, please go to the Clickatell site and register for a 'Developer's Central Account'. It is free to sign up for test messages, and the process should take less that 5 minutes.

      Once you have an active Clickatell account, you will need to 'Create a Connection (API ID)' from the front page. First, select 'APIs,' then select 'Set up a new API.' From there, choose 'add HTTP API' with the default settings, then enter the relevant details below.

      The 'Name' field is just for your own reference for your Frontline account, and not related to the Clickatell API, e.g. 'My local message connection'. -clickatell.info-clickatell=The following details should be copied and pasted directly from the Clickatell HTTP API screen. +clickatell.info-local=Om een Clickatell verbinding tot stand te brengen moet men een Clickatell account hebben. Ga naar om u in te schrijven voor een 'Developer's Central Account' als u nog geen account heeft. U kunt gratis inschrijven voor een testboodschap en het zal niet langer dan 5 minuten in beslag nemen.

      Zodra u een Clickatell account heeft, gaat u naar 'Create a Connection (API ID)' op de eerste pagina. Kies 'APIs,' dan 'Set up a new API.' Kies 'add HTTP API' met de default settings en voer in de desbetreffende informatie.

      De 'Name' field is uw referentie voor uw Frontline account, en betreft niet het Clickatell API, b.v. 'Mijn plaatselijke boodschap verbinding'. +clickatell.info-clickatell=De volgende informatie moet gekopieerd en geplakt worden direct van het Clikatell HTTP API scherm. #Nexmo Fconnection nexmo.label=Nexmo -nexmo.type.label=Nexmo connection +nexmo.type.label=Mexmo verbinding nexmo.name.label=Naam nexmo.api_key.label=API Sleutel: -nexmo.api_secret.label=API secret +nexmo.api_secret.label=API geheim nexmo.fromNumber.label=Van Nummer nexmo.description=Een bericht verzenden en ontvangen via een Clickatell account nexmo.receiveEnabled.label=Ontvangen ingeschakeld @@ -216,12 +216,12 @@ smssync.type.label=Type smssync.receiveEnabled.label=Ontvangen ingeschakeld smssync.sendEnabled.label=Verzenden ingeschakeld smssync.secret.label=Geheime informatie -smssync.timeout.label=Timeout (mins) +smssync.timeout.label=Timeout (min) smssync.description=Gebruik een Android telefoon met een geinstalleerde Smssync app om een SMS with FrontlineSMS to ontvangen en verzenden smssync.field.secret.info=Op Uw app, voer de geheime informatie in die overeenkomt met dit veld. smssync.global.info=Download de SMSSync app vansmssync.ushahidi.com -smssync.timeout=The Android phone associated with "{0}" has not contacted your Frontline account for {1} minute(s) [edit] -smssync.info-setup=Frontline products enable you to send and receive messages through your Android phone. In order to do this you will need to:\n\n1. Input a 'Secret' and name your connection. A secret is simply a password of your choice.\n2. Download and install [SMSSync from the Android App store](https://play.google.com/store/apps/details?id=org.addhen.smssync&hl=en) to your Android phone\n3. Once you have created this connection, you can create a new Sync URL within SMSSync on your Android phone by entering the connection URL (generated by your Frontline product and displayed on the next page) and your chosen secret. See [The SMSSync Site](http://smssync.ushahidi.com/howto) for more help. +smssync.timeout=De Android telefoon gekoppeld aan "{0}" heeft geen verbinding gezocht met uw Frontline account gedurende {1} minute(s) [edit] +smssync.info-setup=Frontline producten stellen u in staat boodschappen te versturen en ontvangen via uw Android telefoon. Daartoe dient u o:\n\n1. Een 'Geheim' en een naam voor uw verbinding in te voeren. Een geheim is een wachtoord van uw keuze.\n2. Download en installeer [SMSSync van de Android App store](https://play.google.com/store/apps/details?id=org.addhen.smssync&hl=en) op uw Android telefoon\n3. Zodra u deze verbinding tot stand heeft gebracht kunt u a nieuwe Sync URL maken in SMSSync op uw Android telefoon door de verbinding URL in te voeren (gegenereed door uw Frontline product en te zien op de volgende pagina) en uw gekozen geheim. Zie [The SMSSync Site](http://smssync.ushahidi.com/howto) voor meer hulp. smssync.info-timeout=If SMSSync does not contact your Frontline product for a certain duration (default 60 minutes), your queued messages will NOT be sent, and you will see a notification that the messages failed to send. Select this duration below: smssync.info-name=Finally, you should name your SMSSync connection with a name of your choice, e.g. 'Bob's work Android'. # Messages Tab @@ -326,7 +326,7 @@ autoforward.keyword.none.generic=Geen autoforward.groups.none=Geen autoforward.contacts.none=Geen autoforward.message.format=Bericht -contact.new=New Contact +contact.new=Nieuw contactpersoon contact.list.no.contact=Geen contacten hier! contact.header=Contacten contact.header.group=Contacten >> {0} @@ -343,7 +343,7 @@ contact.customfield.option.createnew=Nieuwe maken... contact.name.label=Naam contact.phonenumber.label=Telefoonnummer contact.notes.label=Notities -contact.email.label=Email +contact.email.label=E-mail contact.groups.label=Groepen contact.notinanygroup.label=Niet gevonden in groepen contact.messages.label=Berichten @@ -474,11 +474,11 @@ smallpopup.contact.export.title=Exporteren smallpopup.contact.delete.title=Verwijderen contact.selected.many={0} contacten geselecteerd group.join.reply.message=Welkom -group.leave.reply.message=Bye +group.leave.reply.message=Tot ziens fmessage.new.info=U heeft {0} nieuwe berichten. Klik om weer te geven wizard.quickmessage.title=Send Message wizard.messages.replyall.title=Allemaal beantwoorden -wizard.send.message.title=Send Message +wizard.send.message.title=Bericht verzenden wizard.ok=Ok wizard.create=Maken wizard.save=Opslaan @@ -487,7 +487,7 @@ common.settings=Instellingen common.help=Help validation.nospaces.error=Trefwoord mag geen spaties bevatten activity.validation.prompt=Alle verplichte velden invullen a.u.b. -validator.invalid.name=Another activity exists with the name {2} +validator.invalid.name=Een andere activiteit heeft deze naam al {2} autoreply.blank.keyword=Leeg trefwoord. Alle inkomende berichten krijgen een antwoord. poll.type.prompt=Selecteer welk soort poll aan te maken poll.question.yes.no=Vraag met een 'Ja' of 'Nee' antwoord @@ -566,11 +566,11 @@ logs.content=Bericht logs.date=Tijd logs.filter.label=Toon logboeken voor logs.filter.anytime=alle tijden -logs.filter.days.1=last 24 hours -logs.filter.days.3=last 3 days -logs.filter.days.7=last 7 days -logs.filter.days.14=last 14 days -logs.filter.days.28=last 28 days +logs.filter.days.1=afgelopen 24 uur +logs.filter.days.3=laatste 3 dagen +logs.filter.days.7=laatste 7 dagen +logs.filter.days.14=laatste 14 dagen +logs.filter.days.28=laatste 28 dagen logs.download.label=Download systeem logboeken logs.download.buttontext=Download Logboeken logs.download.title=Download logboeken om te verzenden @@ -597,18 +597,18 @@ traffic.total=Totaal tab.message=Berichten tab.archive=Archief tab.contact=Contacten -tab.status=Status +tab.status=Usage Statistics tab.search=Zoeken help.info=Deze versie is een beta dus er is geen ingebouwde Help. Voor hulp in dit stadium raadpleeg de gebruikersforums. -help.notfound=This help file is not yet available, sorry. +help.notfound=Dit 'help' bestand is helaas nog niet beschikbaar. # IntelliSms Fconnection intellisms.label=IntelliSms Account intellisms.type.label=Type intellisms.name.label=Naam intellisms.username.label=Gebruikersnaam intellisms.password.label=Wachtwoord -intellisms.sendEnabled.label=Use for sending -intellisms.receiveEnabled.label=Use for receiving +intellisms.sendEnabled.label=Gebruiken om te verzenden +intellisms.receiveEnabled.label=Voor ontvangst intellisms.receiveProtocol.label=Protocol intellisms.serverName.label=Server Naam intellisms.serverPort.label=Serverpoort @@ -648,7 +648,7 @@ export.message.source.mobile=Bron Mobiel export.contact.title=FrontlineSMS Contact Exporteren export.contact.name=Naam export.contact.mobile=Mobiel -export.contact.email=Email +export.contact.email=E-mail export.contact.notes=Notities export.contact.groups=Groepen export.messages.name1={0} {1} ({2} berichten) @@ -676,9 +676,9 @@ import.upload.failed=Uploaden bestand niet gelukt door onbekende reden import.contact.save.error=Er is een fout opgetreden in het opslaan van het contact import.contact.complete={0} contacten zijn geimporteerd; {1} mislukt import.contact.exist=The imported contacts already exist. -import.contact.failed.label=Failed contact imports +import.contact.failed.label=mislukte imports contactpersonen import.contact.failed.info={0} contact(s) successfully imported.
      {1} contact(s) could not be imported.
      {2} -import.download.failed.contacts=Download a file containing the failed contacts. +import.download.failed.contacts=een bestand met de mislukte contactpersonen downloaden import.message.save.error=Er is een fout opgetreden in het opslaan van het bericht import.message.complete={0} berichten zijn geimporteerd; {1} mislukt export.label=Export data from your Frontline workspace @@ -719,7 +719,7 @@ folder.title={0} frontlinesms.welcome=Welkom bij FrontlineSMS! \\o/ failed.pending.fmessages={0} bericht(en) in behandeling mislukt. Ga naar de berichten in behandeling voor weergave. subscription.title={0} -subscription.info.group=Group: {0} +subscription.info.group=Groep: {0} subscription.info.groupMemberCount={0} leden subscription.info.keyword=Top-level trefwoorden: {0} subscription.sorting.disable=Automatisch sorteren uitschakelen @@ -735,7 +735,7 @@ download.logs.info1=WARNING: Het FrontlineSMS team kunnen de ingediende logs hel download.logs.info2=Andere gebruikers hebben wellicht hetzelfde probleem gerapporteerd en een oplossing gevonden! Om verder te gaan en uw logs in te dienen, klik 'Doorgaan' # Configuration location info configuration.location.title=Configuratie Locatie -configuration.location.description=These files include your database and other settings, which you may wish to back up elsewhere. +configuration.location.description=Deze bestanden bevatten uw database en andere instellingen waarvan u waarschijnlijk ergens anders een back-up wil maken configuration.location.instructions=U kunt de configuratie van uw applicatie in {1}. Deze bestanden bevatten uw database en andere instellingen die u wellicht in een back-upbestand elders wilt opslaan. dynamicfield.contact_name.label=Contact Naam dynamicfield.contact_number.label=Contact Nummer @@ -871,11 +871,11 @@ webconnection.ushahidi.serviceType.crowdmap=Crowdmap webconnection.ushahidi.serviceType.ushahidi=Ushahidi webconnection.crowdmap.url.suffix.label=.crowdmap.com webconnection.ushahidi.subtitle=Webverbinding met {0} -webconnection.ushahidi.service.label=Service: +webconnection.ushahidi.service.label=Dienst: webconnection.ushahidi.fsmskey.label=FrontlineSMS API Geheime informatie: webconnection.ushahidi.crowdmapkey.label=Crowdmap/Ushahidi API Sleutel: webconnection.ushahidi.keyword.label=Trefwoord: -url.invalid.url=The URL provided is invalid. +url.invalid.url=De opgegeven URL is niet geldig webconnection.confirm=Bevestigen webconnection.keyword.title=Alle berichten overbrengen die ontvangen worden en het volgende trefwoord bevatten: webconnection.all.messages=Trefwoord niet gebruiken (Alle inkomende berichten worden overgebracht naar deze webverbinding @@ -902,7 +902,7 @@ webconnection.url.validation.error=Url is verplicht webconnection.save=De Webverbinding is opgeslagen! webconnection.saved=Webverbinding opgeslagen! webconnection.save.success={0} Webverbinding is opgeslagen! -webconnection.generic.service.label=Service: +webconnection.generic.service.label=Dienst: webconnection.generic.httpMethod.label=Http Methode: webconnection.generic.url.label=Adres: webconnection.generic.parameters.label=Geconfigureerde informatie is naar de server gestuurd: @@ -925,7 +925,7 @@ subscription.group.description=Contacten kunnen automatisch aan de groepen toege subscription.keyword.header=Trefwoorden invoeren voor dit abonnement subscription.top.keyword.description=De top-level trefwoorden invoeren die de gebruikers zullen gebruiken om deze groep te selecteren. subscription.top.keyword.more.description=U kunt meerdere top-level trefwoorden invoeren per optie, door komma's gescheiden. Top-level trefwoorden moeten uniek zijn voor iedere activiteit. -subscription.keywords.header=Enter keywords for joining and leaving this group. +subscription.keywords.header=Voer trefwoorden in voor het deelnemen of verlaten van deze groep. subscription.keywords.description=U kunt meerdere top-level trefwoorden invoeren, door komma's gescheiden. Als hierboven geen top-level trefwoorden zijn ingevoerd dan moeten deze trefwoorden voor het deelnemen en verlaten uniek zijn voor iedere activiteit. subscription.default.action.header=Een actie selecteren in het geval dat er geen trefwoord gestuurd wordt subscription.default.action.description=De gewenste actie selecteren als een bericht het top-level trefwoord bevat maar geen trefwoord vorr het deelnemen of verlaten : @@ -980,13 +980,13 @@ activity.generic.sort.validation.unique.error=Trefwoorden moeten uniek zijn activity.generic.keyword.in.use=Het trefwoord {0} is reeds in gebruik door activiteit{1} activity.generic.global.keyword.in.use=Activiteit {0} is ingesteld om alle berichten te ontvangen die niet overeenkomen met andere trefwoorden. Met deze instelling kan slechts een enkele activiteit actief zijn #basic authentication -auth.basic.label=Basic Authentication -auth.basic.info=Require a username and password for accessing FrontlineSMS across the network -auth.basic.enabled.label=Enable Basic Authentication +auth.basic.label=Basis authenticatie +auth.basic.info=Een gebruikersnaam en wachtwoord vereisen om toegang te verkrijgen tot het gehele netwerk van FrontlineSMS +auth.basic.enabled.label=Basis Authenticatie Ondersteuning auth.basic.username.label=Gebruikersnaam auth.basic.password.label=Wachtwoord -auth.basic.confirmPassword.label=Confirm Password -auth.basic.password.mismatch=Passwords don't match +auth.basic.confirmPassword.label=Wachtwoord bevestigen +auth.basic.password.mismatch=Wachtwoorden komen niet overeen newfeatures.popup.title=Nieuwe Functies newfeatures.popup.showinfuture=Deze dialoog voortaan tonen dynamicfield.message_text.label=Bericht tekst @@ -996,39 +996,39 @@ dynamicfield.sender_number.label=Afzender Nummer dynamicfield.recipient_number.label=Ontvanger Nummer dynamicfield.recipient_name.label=Ontvanger Naam # Smpp Fconnection -smpp.label=SMPP Account +smpp.label=SMPP-account smpp.type.label=Type smpp.name.label=Naam -smpp.send.label=Use for sending -smpp.receive.label=Use for receiving +smpp.send.label=Om te verzenden +smpp.receive.label=Om te verzenden smpp.url.label=SMSC URL smpp.port.label=SMSC Port smpp.username.label=Gebruikersnaam smpp.password.label=Wachtwoord smpp.fromNumber.label=Van Nummer -smpp.description=Send and receive messages through an SMSC +smpp.description=Berichten verzenden en ontvangen via een SMSC smpp.global.info=You will need to get an account with your phone network of choice. smpp.send.validator.invalid=You cannot configure a connection without SEND or RECEIVE fuctionality. routing.title=Create rules for which phone number is used by outgoing messages. routing.info=These rules will determine how the system selects which connection or phone number to use to send outgoing messages. Remember, the phone number seen by recipients may depend on the rules you set here. Also, changing this configuration may affect the cost of sending messages. routing.rules.sending=When sending outgoing messages: routing.rules.not_selected=If none of the above rules match: -routing.rules.otherwise=Otherwise: -routing.rules.device=Use {0} +routing.rules.otherwise=Anders: +routing.rules.device=Gebruik {0} routing.rule.uselastreceiver=Send through most recent number that the contact messaged -routing.rule.useany=Use any available connection's phone number -routing.rule.dontsend=Do not send the message +routing.rule.useany=Gebruik een telefoonnummer dat beschikbaar is +routing.rule.dontsend=Dit bericht niet verzenden routing.notification.no-available-route=Outgoing message(s) not sent due to your routing preferences. -routing.rules.none-selected.warning=Warning: You have no rules or phone numbers selected. No messages will be sent. If you wish to send messages, please enable a connection. -customactivity.overview=Overview +routing.rules.none-selected.warning=Waarschuwing: U heeft geen regels of telefoonnummers geselecteerd. Geen bericht zal verzonden worden. ALs u een bericht wilt sturen dient u een verbinding tot stand te brengen. +customactivity.overview=Overzicht customactivity.title={0} customactivity.confirm=Bevestigen -customactivity.label=Custom Activity Builder -customactivity.description=Create your own activity from scratch by applying a custom set of actions to your specified keyword -customactivity.name.prompt=Name this activity -customactivity.moreactions.delete=Delete activity -customactivity.moreactions.rename=Rename activity -customactivity.moreactions.edit=Edit activity +customactivity.label=Aangepaste activiteitsopbouw +customactivity.description=Uw eigen activiteit opmaken door aangepaste instellingen te verbinden met een door u gekozen wachtwoord. +customactivity.name.prompt=Geef deze activiteit een naam +customactivity.moreactions.delete=Activiteit verwijderen +customactivity.moreactions.rename=Activiteit hernoemen +customactivity.moreactions.edit=Activiteit bewerken customactivity.moreactions.export=Export activity customactivity.text.none=Geen customactivity.config=Configure @@ -1038,27 +1038,27 @@ customactivity.info.warning=Without a keyword, all incoming messages will trigge customactivity.info.note=Note: If you archive the Custom Activity, incoming messages will no longer be sorted for it. customactivity.save.success={0} activity saved customactivity.action.steps.label=Action Steps -validation.group.notnull=Please select a group -customactivity.join.description=Joining "{0}" group -customactivity.leave.description=Leaving "{0}" group -customactivity.forward.description=Forwarding with "{0}" -customactivity.webconnectionStep.description=Upload to "{0}" -customactivity.reply.description=Reply with "{0}" -customactivity.step.join.add=Add sender to group -customactivity.step.join.title=Add sender to group* +validation.group.notnull=Selecteer een groep +customactivity.join.description=Aan een "{0}" groep deelnemen +customactivity.leave.description=Een "{0}" groep verlaten +customactivity.forward.description=Doorsturen met "{0}" +customactivity.webconnectionStep.description=Upload naar "{0}" +customactivity.reply.description=Beantwoorden met "{0}" +customactivity.step.join.add=Verzender toevoegen aan groep +customactivity.step.join.title=Verzender toevoegen aan groep* customactivity.step.leave.add=Afzenders verwijderen van {0} customactivity.step.leave.title=Afzenders verwijderen van {0} -customactivity.step.reply.add=Send Autoreply -customactivity.step.reply.title=Enter message to autoreply to sender* -customactivity.step.forward.add=Forward message -customactivity.step.forward.title=Automatically forward a message to one or more contacts -customactivity.manual.sorting=Automatic processing disabled -customactivity.step.webconnectionStep.add=Upload message to a URL -customactivity.step.webconnectionStep.title=Upload message to a URL -customactivity.validation.error.autoreplytext=Reply message is required +customactivity.step.reply.add=Automatisch antwoord versturen +customactivity.step.reply.title=Bericht invoeren voor automatisch antwoord naar afzender* +customactivity.step.forward.add=Bericht doorsturen +customactivity.step.forward.title=Een bericht automatisch doorsturen naar een of meerdere contactpersonen +customactivity.manual.sorting=Automatisch verwerken uitgeschakeld +customactivity.step.webconnectionStep.add=Bericht uploaden naar een URL +customactivity.step.webconnectionStep.title=Bericht uploaden naar een URL +customactivity.validation.error.autoreplytext=Antwoord bericht is vereist customactivity.validation.error.name=Url is verplicht customactivity.validation.error.url=Url is verplicht -customactivity.validation.error.paramname=Parameter name is required +customactivity.validation.error.paramname=Parameter naam is vereist recipientSelector.keepTyping=Keep typing... recipientSelector.searching=Bezig met zoeken validation.recipients.notnull=Please select at least one recipient From 82bca7fa42cd9ce37946711460197ea7573ba2a7 Mon Sep 17 00:00:00 2001 From: fredotieno Date: Mon, 5 May 2014 12:41:33 +0300 Subject: [PATCH 2588/2668] Changed sprint number to 77 --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index a52699088..e77dab9b3 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -6,4 +6,4 @@ app.servlet.version=2.5 app.version=3.2-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 -sprint.number=73 +sprint.number=77 From 2349875a4affd5d2a6cdce98809a984fcdcb31bd Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 5 May 2014 14:42:17 +0300 Subject: [PATCH 2589/2668] SPRINT-BUILD-77 SETUP: Backup app.version [3.2-SNAPSHOT] and change to SPRINT-77 for BuildInstaller script --- plugins/frontlinesms-core/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index e77dab9b3..10147544d 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,7 +3,8 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=3.2-SNAPSHOT +app.version.backup=3.2-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=77 +app.version=SPRINT-77 From e1754664741b5ec951a1aee2f192b74bf0a48e43 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 5 May 2014 15:05:21 +0300 Subject: [PATCH 2590/2668] Revert "Changed sprint number to 77" This reverts commit 82bca7fa42cd9ce37946711460197ea7573ba2a7. Conflicts: plugins/frontlinesms-core/application.properties --- plugins/frontlinesms-core/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 10147544d..c7b16d2ab 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -6,5 +6,5 @@ app.servlet.version=2.5 app.version.backup=3.2-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 -sprint.number=77 -app.version=SPRINT-77 +sprint.number=78 +app.version=3.2-SNAPSHOT From 2b83d14768515068f96cd1b62468f6fe733a9d49 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 6 May 2014 16:59:16 +0300 Subject: [PATCH 2591/2668] Fix FconnectionServiceSpec : incoming connections get CONNECTED status --- .../grails-app/services/frontlinesms2/FconnectionService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy index 6ce18ce1d..8764bedec 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FconnectionService.groovy @@ -75,7 +75,7 @@ class FconnectionService { if(c.id in connectingIds) { return ConnectionStatus.CONNECTING } - if(camelContext.routes.any { it.id ==~ /out.*-$c.id$/ }) { + if(camelContext.routes.any { it.id ==~ /in-$c.id$|out.*-$c.id$/ }) { return ConnectionStatus.CONNECTED } if(c.hasProperty('customStatus')) { From ce57e04ee47e66baf5794710ae22a86edb144522 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Tue, 6 May 2014 17:00:10 +0300 Subject: [PATCH 2592/2668] Mock apiService in ApiControllerSpec --- .../test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy index beae207b6..7c777a127 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/controllers/ApiControllerSpec.groovy @@ -9,6 +9,7 @@ class ApiControllerSpec extends Specification { def setup() { def grailsApplication = [domainClasses:[[clazz:Webconnection]]] controller.grailsApplication = grailsApplication + controller.apiService = [invokeApiProcess : { entity, controller -> return [ status: 200 ]}] Webconnection.metaClass.static.findById = { id -> Mock(GenericWebconnection) } Webconnection.metaClass.static.findAllByNameIlike = { name -> Mock(GenericWebconnection) } From a10381ab714c78bf6c913ee19c3ee709ae4e1b7f Mon Sep 17 00:00:00 2001 From: fredotieno Date: Tue, 6 May 2014 17:57:06 +0300 Subject: [PATCH 2593/2668] Fixed PhonesAndConnectionsFSpec functional test --- plugins/frontlinesms-core/application.properties | 2 +- .../frontlinesms2/settings/PageConnectionSettings.groovy | 2 +- .../frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index e77dab9b3..7cb0b7d99 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,5 +1,5 @@ #Grails Metadata file -#Thu Apr 17 17:21:10 EAT 2014 +#Tue May 06 16:37:50 EAT 2014 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy index bfadc8387..fc3c0491f 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PageConnectionSettings.groovy @@ -10,7 +10,7 @@ class PageConnectionSettings extends PageSettings { static content = { btnNewConnection { $('ul.buttons').find('a', name:'addConnection') } - connectionNames { $('.connection-header').find('h2') } + connectionNames { $('.connection-header').find('h2 input') } connections { $('.connection-list .connection') } routing { module RoutingConnections } } diff --git a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy index 1b7650d89..0169fde66 100644 --- a/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy +++ b/plugins/frontlinesms-core/test/functional/frontlinesms2/settings/PhonesAndConnectionsFSpec.groovy @@ -21,7 +21,7 @@ class PhonesAndConnectionsFSpec extends grails.plugin.geb.GebSpec { go 'connection/list' then: at PageConnectionSettings - connectionNames*.text()?.containsAll(["'Miriam's Clickatell account'", "'MTN Dongle'"]) + connectionNames*.value()?.containsAll(["Miriam's Clickatell account", "MTN Dongle"]) } def 'smsssync connection should display connection url'(){ From 05b9a62b9d42c206e6631a0f17dfe259d8b630d5 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 7 May 2014 16:21:20 +0300 Subject: [PATCH 2594/2668] Exclude SecurityFilters from Multitenant plugin --- plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy index 33b257b63..0818b92e4 100644 --- a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy +++ b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy @@ -2,7 +2,8 @@ class FrontlinesmsCoreGrailsPlugin { def version = '3.45-SNAPSHOT' def grailsVersion = "2.0.3" def pluginExcludes = ["grails-app/views/error.gsp", - "grails-app/conf/CoreBootStrap.groovy"] + "grails-app/conf/CoreBootStrap.groovy", + "grails-app/conf/frontlinesms2/SecurityFilters.groovy"] def author = "FrontlineSMS team" def authorEmail = "dev@frontlinesms.com" def title = "FrontlineSMS Core" From 6127fa4fbfce7a1611b65e255b9e86f5fba590e6 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 7 May 2014 16:35:34 +0300 Subject: [PATCH 2595/2668] Manually rolled up plugin version - should have happened in last releaser --- plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy index 0818b92e4..905058b48 100644 --- a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy +++ b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy @@ -1,5 +1,5 @@ class FrontlinesmsCoreGrailsPlugin { - def version = '3.45-SNAPSHOT' + def version = '3.46-SNAPSHOT' def grailsVersion = "2.0.3" def pluginExcludes = ["grails-app/views/error.gsp", "grails-app/conf/CoreBootStrap.groovy", From 406338d2e7be92f46ab1f63c7a2bf477c4035fbf Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 8 May 2014 13:47:19 +0300 Subject: [PATCH 2596/2668] Dropped wasteful query in FsmsTaglib --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index 29eb3cbb5..eb9707f85 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -436,7 +436,6 @@ class FsmsTagLib { def trafficLightStatus = { att -> out << '' } From 6ad901d13fa3c7cb2836a19e5475fde7d506e2b7 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 8 May 2014 14:30:52 +0300 Subject: [PATCH 2597/2668] TOOLS-1298 Denormalised dispatch list for SMSSync to avoid wasteful queries --- .../grails-app/domain/frontlinesms2/QueuedDispatch.groovy | 4 ++++ .../domain/frontlinesms2/SmssyncFconnection.groovy | 6 +++++- .../grails-app/services/frontlinesms2/SmssyncService.groovy | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy index f9e122fc4..33bfe688e 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy @@ -34,6 +34,10 @@ class QueuedDispatch implements Serializable { } } + static void deleteAll(Fconnection c) { + executeUpdate "DELETE FROM QueuedDispatch WHERE connectionId=:connectionId" + } + static getDispatches(connection) { // TODO should do this in a single query def dispatchIds = Dispatch.executeQuery("SELECT q.dispatchId FROM QueuedDispatch q WHERE q.connectionId=:connectionId", diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy index 5cbe6d047..392de8219 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy @@ -22,6 +22,7 @@ class SmssyncFconnection extends Fconnection implements FrontlineApi { Date lastConnectionTime boolean sendEnabled = true boolean receiveEnabled = true + boolean hasDispatches = false String secret int timeout = 360 // 3 hour default @@ -31,7 +32,10 @@ class SmssyncFconnection extends Fconnection implements FrontlineApi { } def removeDispatchesFromQueue(dispatches) { - QueuedDispatch.delete(this, dispatches) + QueuedDispatch.deleteAll(this) + if(this.hasDispatches) { + this.hasDispatches = false + } } def apiProcess(controller) { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 737b489c2..129c8f384 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -15,6 +15,7 @@ class SmssyncService { void processSend(Exchange x) { def connection = SmssyncFconnection.get(x.in.headers['fconnection-id']) connection.addToQueuedDispatches(x.in.body) + connection.hasDispatches = true connection.save(failOnError:true) } @@ -97,12 +98,11 @@ class SmssyncService { private def generateOutgoingResponse(connection, boolean includeWhenEmpty) { def responseMap = [:] - def q = connection.queuedDispatches + def q = connection.hasDispatches ? connection.queuedDispatches : [] if(q || includeWhenEmpty) { responseMap.task = 'send' connection.removeDispatchesFromQueue(q) - responseMap.messages = q.collect { d -> d.status = DispatchStatus.SENT d.dateSent = new Date() From e682d83e1bafee759f300e837d2e4429bad1f3c5 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 8 May 2014 14:38:29 +0300 Subject: [PATCH 2598/2668] TOOLS-1298 Cleaned up removeDispatchesFromQueue as it does not need dispatch list --- .../grails-app/domain/frontlinesms2/SmssyncFconnection.groovy | 2 +- .../grails-app/services/frontlinesms2/SmssyncService.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy index 392de8219..699924c43 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/SmssyncFconnection.groovy @@ -31,7 +31,7 @@ class SmssyncFconnection extends Fconnection implements FrontlineApi { lastConnectionTime nullable:true } - def removeDispatchesFromQueue(dispatches) { + def removeDispatchesFromQueue() { QueuedDispatch.deleteAll(this) if(this.hasDispatches) { this.hasDispatches = false diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy index 129c8f384..3079d9362 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/SmssyncService.groovy @@ -102,7 +102,7 @@ class SmssyncService { if(q || includeWhenEmpty) { responseMap.task = 'send' - connection.removeDispatchesFromQueue(q) + connection.removeDispatchesFromQueue() responseMap.messages = q.collect { d -> d.status = DispatchStatus.SENT d.dateSent = new Date() From f2e612cb40dec82ac8ee2aad40eafed42005bc79 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 8 May 2014 14:39:55 +0300 Subject: [PATCH 2599/2668] TOOLS-1298 Apply hasDispatches denormalisation to FrontlineSync --- .../frontlinesms2/FrontlinesyncFconnection.groovy | 10 ++++++++-- .../services/frontlinesms2/FrontlinesyncService.groovy | 4 ++-- .../services/FrontlinesyncServiceSpec.groovy | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index f11c2e4a2..88e6e9ec8 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -24,6 +24,7 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { boolean receiveEnabled = false boolean missedCallEnabled = false boolean configSynced = false + boolean hasDispatches = false int checkInterval = 1 String secret @@ -66,12 +67,17 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { return apiEnabled? "${urlHelperService.getBaseUrl(request)}" :'' } - def removeDispatchesFromQueue(dispatches) { - QueuedDispatch.delete(this, dispatches) + def removeDispatchesFromQueue() { + QueuedDispatch.deleteAll(this) + if(this.hasDispatches) { + this.hasDispatches = false + this.save() + } } def addToQueuedDispatches(d) { QueuedDispatch.create(this, d) + this.hasDispatches = true } def getQueuedDispatches() { diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy index 02051fbde..817658b31 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/FrontlinesyncService.groovy @@ -73,9 +73,9 @@ class FrontlinesyncService { private generateOutgoingResponse(connection) { def responseMap = [:] if(connection.sendEnabled) { - def q = connection.queuedDispatches + def q = connection.hasDispatches ? connection.queuedDispatches : [] if(q) { - connection.removeDispatchesFromQueue(q) + connection.removeDispatchesFromQueue() responseMap.messages = q.collect { d -> [to:d.dst, message:d.text, dispatchId:d.id] } diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy index eacf6894b..1a8081df4 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy @@ -148,7 +148,7 @@ class FrontlinesyncServiceSpec extends Specification { def connection = setupConnection("secret") connection.sendEnabled = true connection.queuedDispatches = [mockDispatch('123', 'yeah', 123)] - connection.removeDispatchesFromQueue = { q -> true } + connection.removeDispatchesFromQueue = { true } expect: service.generateOutgoingResponse(connection).equals([messages:[[to:'123', message:'yeah', dispatchId: 123]]]) From b9407434a7edf72d973c4b527b9139e116d79d72 Mon Sep 17 00:00:00 2001 From: fredotieno Date: Thu, 8 May 2014 15:41:59 +0300 Subject: [PATCH 2600/2668] Changed checkInterval --- .../domain/frontlinesms2/FrontlinesyncFconnection.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy index f11c2e4a2..a392ad9b9 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/FrontlinesyncFconnection.groovy @@ -24,7 +24,7 @@ class FrontlinesyncFconnection extends Fconnection implements FrontlineApi { boolean receiveEnabled = false boolean missedCallEnabled = false boolean configSynced = false - int checkInterval = 1 + int checkInterval = 15 String secret static constraints = { From 09bcf64bd7d0c964852d311cd9038f0fb7985530 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 8 May 2014 17:42:05 +0300 Subject: [PATCH 2601/2668] TOOLS-1298 Fixed SmssyncServiceSpec --- .../unit/frontlinesms2/services/SmssyncServiceSpec.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy index 5c9b0ae4b..1d2550e96 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy @@ -92,7 +92,10 @@ class SmssyncServiceSpec extends Specification { controller.params.from = '1234567890' controller.params.message = 'word' } - if(dispatchCount) mockDispatchQueue(connection, (1..dispatchCount)) + if(dispatchCount) { + mockDispatchQueue(connection, (1..dispatchCount)) + connection.hasDispatches >> true + } when: def actualResponse = service.generateApiResponse(connection, controller) then: From 17c17a6d6d453cbe5433be827d7a73abecb4916c Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 9 May 2014 13:10:36 +0300 Subject: [PATCH 2602/2668] Remove timer.js --- .../frontlinesms-core/grails-app/conf/CoreResources.groovy | 1 - plugins/frontlinesms-core/web-app/js/timer.js | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 plugins/frontlinesms-core/web-app/js/timer.js diff --git a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy index ef6575bac..68f0600a0 100644 --- a/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy +++ b/plugins/frontlinesms-core/grails-app/conf/CoreResources.groovy @@ -27,7 +27,6 @@ modules = { resource url:[dir:'css', file:'help.css'] resource url:[dir:'js', file:'frontlinesms_core.js'], disposition:'head' - resource url:[dir:'js', file:'timer.js'], disposition:'head' resource url:[dir:'js', file:'app_info.js'], disposition:'head' resource url:[dir:'js', file:'activity/popups.js'], disposition:'head' resource url:[dir:'js', file:"activity/custom_activity.js"], disposition:'head' diff --git a/plugins/frontlinesms-core/web-app/js/timer.js b/plugins/frontlinesms-core/web-app/js/timer.js deleted file mode 100644 index d5e2a6092..000000000 --- a/plugins/frontlinesms-core/web-app/js/timer.js +++ /dev/null @@ -1,5 +0,0 @@ -timer = { - setInterval:function(a, b, c, d) { setInterval(a, b, c, d); }, - setTimeout:function(a, b, c, d) { setTimeout(a, b, c, d); } -}; - From 6ec6c3498cb4ab0162fca37ab1cac8e8efca7052 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Fri, 9 May 2014 13:11:26 +0300 Subject: [PATCH 2603/2668] Use fibonacci based repeatInterval --- .../frontlinesms-core/web-app/js/app_info.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/web-app/js/app_info.js b/plugins/frontlinesms-core/web-app/js/app_info.js index 0432fb085..8d67788f7 100644 --- a/plugins/frontlinesms-core/web-app/js/app_info.js +++ b/plugins/frontlinesms-core/web-app/js/app_info.js @@ -2,12 +2,14 @@ app_info = (function() { var callbacks, counter, + fibonacciTimeOffsetPair = [1, 1], failCallback, - init = function(repeatInterval) { + repeatIntervalOffset, + init = function(initialRepeatIntervalOffset) { counter = 0; callbacks = {}; - repeatInterval = repeatInterval || 15000; - timer.setInterval(requester, repeatInterval); + repeatIntervalOffset = initialRepeatIntervalOffset || 15000; + setTimeout(requester, repeatIntervalGenerator()); }, callbackProcessor = function(data) { var c; @@ -55,6 +57,7 @@ app_info = (function() { success:callbackProcessor, error:failureProcessor }); } + setTimeout(requester, repeatIntervalGenerator()); }, listen = function(interest, f, data, callback) { if(!interest || !f) { @@ -86,6 +89,14 @@ app_info = (function() { } failCallback = listener; }, + repeatIntervalGenerator = function() { + fibonacciTimeOffsetPair = [ + fibonacciTimeOffsetPair[1], + fibonacciTimeOffsetPair[0] + fibonacciTimeOffsetPair[1] + ]; + var nextRepeatInterval = fibonacciTimeOffsetPair[0] * 1000 + repeatIntervalOffset; + return nextRepeatInterval; + }, stopListening = function(disinterest) { delete callbacks[disinterest]; }; From bb3d3b81a7476b8e0001669dbddc84b3a20ffa41 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 9 May 2014 14:22:17 +0300 Subject: [PATCH 2604/2668] TOOLS-1298 Fix missing param for hql query --- .../grails-app/domain/frontlinesms2/QueuedDispatch.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy index 33bfe688e..cbef8985f 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/QueuedDispatch.groovy @@ -35,7 +35,7 @@ class QueuedDispatch implements Serializable { } static void deleteAll(Fconnection c) { - executeUpdate "DELETE FROM QueuedDispatch WHERE connectionId=:connectionId" + executeUpdate ("DELETE FROM QueuedDispatch WHERE connectionId=:connectionId", [connectionId:c.id]) } static getDispatches(connection) { From a701889fb8c1bd41fa3ca32fbbde3730031f542f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Fri, 9 May 2014 15:43:19 +0300 Subject: [PATCH 2605/2668] TOOLS-1298 Fix FrotlinesyncServiceSpec --- .../unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy | 1 + .../test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy index 1a8081df4..b910e5f57 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/FrontlinesyncServiceSpec.groovy @@ -147,6 +147,7 @@ class FrontlinesyncServiceSpec extends Specification { given: def connection = setupConnection("secret") connection.sendEnabled = true + connection.hasDispatches = true connection.queuedDispatches = [mockDispatch('123', 'yeah', 123)] connection.removeDispatchesFromQueue = { true } expect: diff --git a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy index 1d2550e96..cb9282e09 100644 --- a/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy +++ b/plugins/frontlinesms-core/test/unit/frontlinesms2/services/SmssyncServiceSpec.groovy @@ -45,6 +45,7 @@ class SmssyncServiceSpec extends Specification { def setupDefaultConnection(boolean sendEnabled=true) { connection.receiveEnabled >> true connection.enabled >> true + connection.hasDispatches >> true if(sendEnabled) { connection.sendEnabled >> true mockDispatchQueue(connection, [1, 2, 3]) From 755641b16088859b9d48cc0efeaced0346252d5f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 12 May 2014 13:48:46 +0300 Subject: [PATCH 2606/2668] Disabled SMSSync, enabled FrontlineSync --- .../grails-app/domain/frontlinesms2/Fconnection.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index 1129452b6..a1e5a6212 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -22,13 +22,13 @@ class Fconnection { ClickatellFconnection, IntelliSmsFconnection, NexmoFconnection, - SmssyncFconnection, + FrontlinesyncFconnection, SmppFconnection] static final getImplementations(params) { (params.beta || Boolean.parseBoolean(ApplicationHolder.application.mainContext.getBean('appSettingsService').beta ?: 'false')) ? betaImplementations: implementations } - static getBetaImplementations() { [FrontlinesyncFconnection] + implementations } + static getBetaImplementations() { [SmssyncFconnection] + implementations } static getNonnullableConfigFields = { clazz -> def fields = clazz.configFields From 61581bda6c7fa7d266d239f4390e9913d467759b Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 12 May 2014 14:06:36 +0300 Subject: [PATCH 2607/2668] Sprint builds should be treated as non-release --- plugins/frontlinesms-core/scripts/BuildInstallers.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/scripts/BuildInstallers.groovy b/plugins/frontlinesms-core/scripts/BuildInstallers.groovy index c2074f50e..8d845cd08 100644 --- a/plugins/frontlinesms-core/scripts/BuildInstallers.groovy +++ b/plugins/frontlinesms-core/scripts/BuildInstallers.groovy @@ -38,7 +38,7 @@ def doScript(name) { def isReleaseBuild() { def appVersion = metadata['app.version'].toUpperCase() - return !(appVersion.contains('SNAPSHOT') || appVersion.contains('RC')) + return !(appVersion.contains('SNAPSHOT') || appVersion.contains('RC') || appVersion.contains('SPRINT')) } target(clearPluginXmls: 'Delete plugin.xml from all in-place plugins') { From ce5bbd17a691944f702cdd49bd2136141e97eec2 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 12 May 2014 15:23:50 +0300 Subject: [PATCH 2608/2668] Clean before building installers --- plugins/frontlinesms-core/do/create_sprint_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/create_sprint_build b/plugins/frontlinesms-core/do/create_sprint_build index abe502186..d6e5c13e8 100755 --- a/plugins/frontlinesms-core/do/create_sprint_build +++ b/plugins/frontlinesms-core/do/create_sprint_build @@ -22,7 +22,7 @@ git commit -m "SPRINT-BUILD-$sprintNumber SETUP: Backup app.version [$appVersion echo "Generating build for iteration $sprintNumber" # Generate installers with migrations disabled -grails -Ddb.migrations=false prod build-installers --stacktrace +grails -Ddb.migrations=false prod clean build-installers --stacktrace # Tag build git tag "SPRINT-$sprintNumber" From 63aa96cf977ed18c99fc8e05aed4e37da1ab9827 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 12 May 2014 15:45:06 +0300 Subject: [PATCH 2609/2668] Revert " Clean before building installers" This reverts commit ce5bbd17a691944f702cdd49bd2136141e97eec2. --- plugins/frontlinesms-core/do/create_sprint_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/do/create_sprint_build b/plugins/frontlinesms-core/do/create_sprint_build index d6e5c13e8..abe502186 100755 --- a/plugins/frontlinesms-core/do/create_sprint_build +++ b/plugins/frontlinesms-core/do/create_sprint_build @@ -22,7 +22,7 @@ git commit -m "SPRINT-BUILD-$sprintNumber SETUP: Backup app.version [$appVersion echo "Generating build for iteration $sprintNumber" # Generate installers with migrations disabled -grails -Ddb.migrations=false prod clean build-installers --stacktrace +grails -Ddb.migrations=false prod build-installers --stacktrace # Tag build git tag "SPRINT-$sprintNumber" From bb81a20884a2f2ca6f7570340089cc0afb9bea80 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 12 May 2014 15:50:17 +0300 Subject: [PATCH 2610/2668] SPRINT-BUILD-78 SETUP: Backup app.version [3.2-SNAPSHOT 3.2-SNAPSHOT] and change to SPRINT-78 for BuildInstaller script --- plugins/frontlinesms-core/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index a3b315ce0..d5b1e71aa 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -7,4 +7,5 @@ app.version.backup=3.2-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 -app.version=3.2-SNAPSHOT +app.version.backup=3.2-SNAPSHOT +app.version=SPRINT-78 From 29ff5ebfd161165aa11a6a8f15ef0aee787d5d7a Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Mon, 12 May 2014 16:44:00 +0300 Subject: [PATCH 2611/2668] Updated app version to 4-SNAPSHOT --- plugins/frontlinesms-core/application.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index d5b1e71aa..8b0e94918 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,9 +3,7 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version.backup=3.2-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 -app.version.backup=3.2-SNAPSHOT -app.version=SPRINT-78 +app.version=4-SNAPSHOT From 5c7b6acf8e1379332c85d0e810ee615f59a3ce75 Mon Sep 17 00:00:00 2001 From: eugene Date: Tue, 13 May 2014 08:54:03 +0300 Subject: [PATCH 2612/2668] A-80:Added a link to google playstore from frontline sync connection configuration --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 1 + .../grails-app/views/fconnection/frontlinesync/_config.gsp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index ea850d1c1..1b02df280 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -1157,3 +1157,4 @@ missedCall.new.info=You have {0} new missed calls. Click to view missedCall.multiple.selected={0} missed calls selected message.multiple.selected={0} messages selected fconnection.name.blank.error=Connection name cannot be blank +fconnection.frontlinesync.googleplaystore.download=To download, please visit the Google Play Store diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 166ab9a36..002e5a376 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -14,6 +14,10 @@
      + + + +
      Android app on Google Play From d3814ec2af07bfe8884636178ee0d19361b90e4f Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 13 May 2014 11:30:04 +0300 Subject: [PATCH 2613/2668] Frontlinesync is beta, not alpha --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index ea850d1c1..a8e3da94c 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -215,7 +215,7 @@ nexmo.description=Send and receive messages through a Nexmo account. nexmo.receiveEnabled.label=Receiving enabled nexmo.sendEnabled.label=Sending enabled # FrontlineSync Fconnection -frontlinesync.label=Alpha: FrontlineSync +frontlinesync.label=Beta: FrontlineSync frontlinesync.description=Receive missed-call notifications from your Android phone. frontlinesync.info-setup.p1=FrontlineSync is an Android app that allows you to use your Android device as a gateway for FrontlineSMS and FrontlineCloud. Using FrontlineSync, you can send and receive SMS, and also track missed calls. frontlinesync.info-setup.p2=To set up a FrontlineSync connection, install the app on your phone from the Google Play link below, give the connection a name, and click next. Once you submit this form, you will be provided information that you need to enter into the Android app. From 0ef0335cb9f692de3cdb77335f2e0bba88303194 Mon Sep 17 00:00:00 2001 From: fredotieno Date: Tue, 13 May 2014 12:37:47 +0300 Subject: [PATCH 2614/2668] ANDROID-80 added local android playstore image --- .../views/fconnection/frontlinesync/_config.gsp | 4 ++-- .../web-app/images/en_app_rgb_wo_45.png | Bin 0 -> 8913 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/en_app_rgb_wo_45.png diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 002e5a376..b9cc6f78a 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -19,7 +19,7 @@
      - Android app on Google Play + + diff --git a/plugins/frontlinesms-core/web-app/images/en_app_rgb_wo_45.png b/plugins/frontlinesms-core/web-app/images/en_app_rgb_wo_45.png new file mode 100644 index 0000000000000000000000000000000000000000..9891cbbd39d36e215940fa18a1fd1a0a83bcb9af GIT binary patch literal 8913 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 Date: Tue, 13 May 2014 13:00:33 +0300 Subject: [PATCH 2615/2668] Replaced g:img with g:resource --- .../grails-app/views/fconnection/frontlinesync/_config.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index b9cc6f78a..d3c20b0e5 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -19,7 +19,7 @@
      - + Android app on Google Play From fd5eaccc01bea73e8900b8f5ec0e2a7502b4c558 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 13 May 2014 13:07:51 +0300 Subject: [PATCH 2616/2668] Renamed play store badge to more sensible file name --- .../views/fconnection/frontlinesync/_config.gsp | 2 +- ...p_rgb_wo_45.png => frontlinesync_play_badge.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename plugins/frontlinesms-core/web-app/images/{en_app_rgb_wo_45.png => frontlinesync_play_badge.png} (100%) diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index d3c20b0e5..7f94aa66b 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -19,7 +19,7 @@
      - Android app on Google Play + Android app on Google Play diff --git a/plugins/frontlinesms-core/web-app/images/en_app_rgb_wo_45.png b/plugins/frontlinesms-core/web-app/images/frontlinesync_play_badge.png similarity index 100% rename from plugins/frontlinesms-core/web-app/images/en_app_rgb_wo_45.png rename to plugins/frontlinesms-core/web-app/images/frontlinesync_play_badge.png From 4132c957ff58f63483a1a306f720eb73e0234554 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 13 May 2014 13:22:53 +0300 Subject: [PATCH 2617/2668] [POST-RELEASE: 3.46 -> 3.47-SNAPSHOT] --- plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy index 905058b48..8b2f90c3c 100644 --- a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy +++ b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy @@ -1,5 +1,5 @@ class FrontlinesmsCoreGrailsPlugin { - def version = '3.46-SNAPSHOT' + def version = '3.47-SNAPSHOT' def grailsVersion = "2.0.3" def pluginExcludes = ["grails-app/views/error.gsp", "grails-app/conf/CoreBootStrap.groovy", From f22e4a14d4b2ef5cd68e596d73203b0d6b2251c1 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 13 May 2014 15:17:31 +0300 Subject: [PATCH 2618/2668] Update version number for SPRINT-78.1 release --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 8b0e94918..7ef1d8c49 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -6,4 +6,4 @@ app.servlet.version=2.5 plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 -app.version=4-SNAPSHOT +app.version=SPRINT-78.1 From 2b31f010be675f79c1398584fa39892b6525b60e Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 13 May 2014 15:42:38 +0300 Subject: [PATCH 2619/2668] Post-SPRINT-build, reinstated app version --- plugins/frontlinesms-core/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 7ef1d8c49..69cfad209 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,9 +1,9 @@ #Grails Metadata file -#Tue May 06 16:37:50 EAT 2014 +#Tue May 13 15:24:58 EAT 2014 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 +app.version=4-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 -app.version=SPRINT-78.1 From 6154a4105ef9bf08816bd931fdba690dc4ae1e17 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Thu, 15 May 2014 11:34:58 +0300 Subject: [PATCH 2620/2668] Change g:resource to r:resource --- .../grails-app/views/fconnection/frontlinesync/_config.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp index 7f94aa66b..96d799485 100644 --- a/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp +++ b/plugins/frontlinesms-core/grails-app/views/fconnection/frontlinesync/_config.gsp @@ -19,7 +19,7 @@
      - Android app on Google Play + Android app on Google Play From 363baabd6ff08e14f67c477fba791c6eff4790ce Mon Sep 17 00:00:00 2001 From: eugene Date: Mon, 19 May 2014 10:47:28 +0300 Subject: [PATCH 2621/2668] CORE-2053:Changed frontline sync label to 'FrontlineSync Beta' and moved 'FrontlineSync Beta' checkbox to the top of the connections list --- .../grails-app/domain/frontlinesms2/Fconnection.groovy | 4 ++-- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index a1e5a6212..00aded935 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -18,11 +18,11 @@ class Fconnection { static transients = ['status', 'routeDefinitions'] static String getShortName() { 'base' } - static final implementations = [SmslibFconnection, + static final implementations = [FrontlinesyncFconnection, + SmslibFconnection, ClickatellFconnection, IntelliSmsFconnection, NexmoFconnection, - FrontlinesyncFconnection, SmppFconnection] static final getImplementations(params) { (params.beta || Boolean.parseBoolean(ApplicationHolder.application.mainContext.getBean('appSettingsService').beta ?: 'false')) ? betaImplementations: implementations diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index c515b84b2..d0b39153b 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -215,7 +215,7 @@ nexmo.description=Send and receive messages through a Nexmo account. nexmo.receiveEnabled.label=Receiving enabled nexmo.sendEnabled.label=Sending enabled # FrontlineSync Fconnection -frontlinesync.label=Beta: FrontlineSync +frontlinesync.label=FrontlineSync Beta frontlinesync.description=Receive missed-call notifications from your Android phone. frontlinesync.info-setup.p1=FrontlineSync is an Android app that allows you to use your Android device as a gateway for FrontlineSMS and FrontlineCloud. Using FrontlineSync, you can send and receive SMS, and also track missed calls. frontlinesync.info-setup.p2=To set up a FrontlineSync connection, install the app on your phone from the Google Play link below, give the connection a name, and click next. Once you submit this form, you will be provided information that you need to enter into the Android app. From a880e32f8b47b90eed5405a287a24c0a6ef345ab Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 13:35:17 +0300 Subject: [PATCH 2622/2668] CORE-1990 Use Domain.merge in DispatchRouterService This is meant to merge a domain instance back to the current persistence context. --- .../services/frontlinesms2/DispatchRouterService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 15cc50c23..d09c9e653 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -58,7 +58,7 @@ class DispatchRouterService { def dispatch = exchange.in.body logWithPrefix " dispatch.fconnectionId:::: $route" dispatch.fconnectionId = route as Long - dispatch.save(failOnError:true, flush:true) + dispatch.merge(failOnError:true, flush:true) } break } From 73cf7b2f080ed1c0ca742ee1da43fbff16ac1d55 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 13:52:30 +0300 Subject: [PATCH 2623/2668] CORE-1990 Call refresh on dispatch and revert to .save from .merge --- .../services/frontlinesms2/DispatchRouterService.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index d09c9e653..9309eacdd 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -57,8 +57,9 @@ class DispatchRouterService { if(exchange.in.body instanceof Dispatch) { def dispatch = exchange.in.body logWithPrefix " dispatch.fconnectionId:::: $route" + dispatch.refresh() dispatch.fconnectionId = route as Long - dispatch.merge(failOnError:true, flush:true) + dispatch.save(failOnError:true, flush:true) } break } From 0cdf38dcea4b1781bc6c0adef108ee7de1238bcd Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 19 May 2014 13:57:16 +0300 Subject: [PATCH 2624/2668] Added migration for v2.4 release candidate --- .../migrations/changelog-v2.4.groovy | 149 ++++++++++++++++++ .../grails-app/migrations/changelog.groovy | 2 + 2 files changed, 151 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy new file mode 100644 index 000000000..4bfa5b7a2 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy @@ -0,0 +1,149 @@ +databaseChangeLog = { + + //Rename table SMSSYNC_DISPATCH to QUEUED_DISPATCH + changeSet(author: "vaneyck (by hand)", id: "rename-smssync-dispatch-table-1372420837873-1") { + renameTable(oldTableName: "SMSSYNC_DISPATCH", newTableName: "QUEUED_DISPATCH") + } + + changeSet(author: "vaneyck (generated)", id: "1387530956381-1") { + addColumn(tableName: "FCONNECTION_FMESSAGE") { + column(name: "TEXT_MESSAGE_ID", type: "BIGINT") + } + } + + // Copy all fconnection_fmessage[i].fmessage_id to fconnection_fmessage[i].text_message_id + changeSet(author: "vaneyck", id:"1387530956381-4") { + grailsChange{ + change{ + sql.executeUpdate("UPDATE FCONNECTION_FMESSAGE SET TEXT_MESSAGE_ID = FMESSAGE_ID") + } + } + } + + //Add CLASS property to fmessage table + changeSet(author: "vaneyck (generated)", id: "1400489400949-2") { + addColumn(tableName: "FMESSAGE") { + column(name: "CLASS", type: "VARCHAR(255)") { + constraints(nullable: "false") + } + } + } + + // Set all fmessage.class to frontlinesms2.TextMessage + changeSet(author: "vaneyck", id:"1387530956381-3") { + grailsChange{ + change{ + sql.executeUpdate("UPDATE FMESSAGE SET CLASS = 'frontlinesms2.TextMessage'") + } + } + } + + //Move FCONNECTION_FMESSAGE data to the FMESSAGE table CONNECTION_ID + changeSet(author: "vaneyck (generated)", id: "1400489400949-3") { + addColumn(tableName: "FMESSAGE") { + column(name: "CONNECTION_ID", type: "BIGINT") + } + grailsChange { + change { + sql.execute 'UPDATE FMESSAGE M JOIN FCONNECTION_FMESSAGE CM ' + + 'ON M.ID = CM.TEXT_MESSAGE_ID ' + + 'SET CONNECTION_ID = CM.FCONNECTION_MESSAGES_ID' + } + } + + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-4") { + addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { + column(name: "CHECK_INTERVAL", type: "INT") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-5") { + addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { + column(name: "CONFIG_SYNCED", type: "BOOLEAN") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-6") { + addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { + column(name: "HAS_DISPATCHES", type: "BOOLEAN") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-7") { + addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { + column(name: "MISSED_CALL_ENABLED", type: "BOOLEAN") { + constraints(nullable: "false") + } + } + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-8") { + addColumn(tableName: "SMSSYNC_FCONNECTION") { + column(name: "HAS_DISPATCHES", type: "BOOLEAN") { + constraints(nullable: "false") + } + } + } + + //Set default values for FRONTLINESYNC_FCONNECTION properties [CONFIG_SYNCED, MISSED_CALL_ENABLED, CHECK_INTERVAL] + changeSet(author: "vaneyck (by hand)", id: "set_default_values_for_smssync_and_frontlinesync_properties") { + grailsChange{ + change{ + sql.executeUpdate("UPDATE FRONTLINESYNC_FCONNECTION SET CONFIG_SYNCED = 1") + sql.executeUpdate("UPDATE FRONTLINESYNC_FCONNECTION SET MISSED_CALL_ENABLED = 1") + sql.executeUpdate("UPDATE FRONTLINESYNC_FCONNECTION SET CHECK_INTERVAL = 1") + } + } + } + + // FRONTLINESYNC_FCONNECTION.CHECK_INTERVAL should be nullable + changeSet(author: "vaneyck|sitati (by hand)", id: "added-check-interval-to-frontlinesync-table-1372420837874-2") { + addNotNullConstraint(columnDataType: "BIGINT", columnName: "CHECK_INTERVAL", tableName: "FRONTLINESYNC_FCONNECTION") + } + + //Set default values for HAS_DISPATCHES on FRONTLINESYNC_FCONNECTION and SMSSYNC_FCONNECTION + changeSet(author: "vaneyck (generated)", id: "1399636740836-3") { + grailsChange { + change { + sql.executeUpdate("UPDATE FRONTLINESYNC_FCONNECTION SET HAS_DISPATCHES = 1") + sql.executeUpdate("UPDATE SMSSYNC_FCONNECTION SET HAS_DISPATCHES = 1") + } + } + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-9") { + dropNotNullConstraint(columnDataType: "VARCHAR(1600)", columnName: "TEXT", tableName: "FMESSAGE") + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-10") { + modifyDataType(columnName: "TEXT", newDataType: "VARCHAR(511)", tableName: "SYSTEM_NOTIFICATION") + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-12") { + dropForeignKeyConstraint(baseTableName: "FCONNECTION_FMESSAGE", baseTableSchemaName: "PUBLIC", constraintName: "FKD49CD6FC51C23BBF") + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-13") { + dropForeignKeyConstraint(baseTableName: "FCONNECTION_FMESSAGE", baseTableSchemaName: "PUBLIC", constraintName: "FKD49CD6FC92DDC012") + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-17") { + dropColumn(columnName: "VERSION", tableName: "FCONNECTION") + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-18") { + dropTable(tableName: "FCONNECTION_FMESSAGE") + } + + changeSet(author: "vaneyck (generated)", id: "1400489400949-19") { + dropTable(tableName: "SMSSYNC_DISPATCH") + } +} diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy index 01209cfb9..60ce82197 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy @@ -26,5 +26,7 @@ databaseChangeLog = { include file: 'changelog-3.0.groovy' include file: 'changelog-3.1.groovy' + + include file: 'changelog-v2.4.groovy' } From 8f330514cd7306b62abdb7f65c140d5a4a788fae Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 13:58:53 +0300 Subject: [PATCH 2625/2668] CORE-1990 Set flush:true in generateDispatches --- .../grails-app/services/frontlinesms2/MessageSendService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy index 6b615d67d..1e5134d27 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy @@ -65,7 +65,7 @@ class MessageSendService { def generateDispatches(List addresses) { (addresses.unique() - null).collect { it = it.replaceAll(/\s|\(|\)|\-/, "") - new Dispatch(dst:it, status:DispatchStatus.PENDING) + new Dispatch(dst:it, status:DispatchStatus.PENDING).save(flush: true) } } } From e2345124ebd9df8d01b1a056b264876bff6e89af Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 13:59:12 +0300 Subject: [PATCH 2626/2668] CORE-1990 Remove call to Dispatch.referesh --- .../services/frontlinesms2/DispatchRouterService.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 9309eacdd..15cc50c23 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -57,7 +57,6 @@ class DispatchRouterService { if(exchange.in.body instanceof Dispatch) { def dispatch = exchange.in.body logWithPrefix " dispatch.fconnectionId:::: $route" - dispatch.refresh() dispatch.fconnectionId = route as Long dispatch.save(failOnError:true, flush:true) } From ec4817453fab95f6bec36c09c961a51ad4e2b4cf Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 19 May 2014 14:25:28 +0300 Subject: [PATCH 2627/2668] Move SmsSync to the bottom of the connection list dialog --- .../grails-app/domain/frontlinesms2/Fconnection.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy index 00aded935..6f0f7deb5 100644 --- a/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy +++ b/plugins/frontlinesms-core/grails-app/domain/frontlinesms2/Fconnection.groovy @@ -23,12 +23,13 @@ class Fconnection { ClickatellFconnection, IntelliSmsFconnection, NexmoFconnection, - SmppFconnection] + SmppFconnection, + SmssyncFconnection] static final getImplementations(params) { (params.beta || Boolean.parseBoolean(ApplicationHolder.application.mainContext.getBean('appSettingsService').beta ?: 'false')) ? betaImplementations: implementations } - static getBetaImplementations() { [SmssyncFconnection] + implementations } + static getBetaImplementations() { implementations } static getNonnullableConfigFields = { clazz -> def fields = clazz.configFields From 038191d08c4e689917ed237e4c0593e4c8360d62 Mon Sep 17 00:00:00 2001 From: Pitkin Date: Mon, 19 May 2014 14:26:15 +0300 Subject: [PATCH 2628/2668] Started making changes for 2.4 --- .../grails-app/conf/help/features/new.txt | 33 ++++--------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt index d4a271424..6d4dc1e60 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt @@ -1,32 +1,11 @@ -# New features in FrontlineSMS v 2.3 -## Better ways to connect: -### SMSSync -FrontlineSMS now supports SMSSync, an Android application from our friends at Ushahidi that allows you to sync text messages from an Android phone to FrontlineSMS. Note: you'll need a local area network or Internet access to use this feature. We still support modems and mobile phones; SMSSync just represents an additional way to connect to the people you care about. +# New features in FrontlineSMS v 2.4 +## A new Android gateway! +### FrontlineSync +Details of FrontlineSync -### Custom Routing Preferences -We now allow you to set custom routing preferences among your connections. For example, you can instruct FrontlineSMS to respond to users via the phone number they texted first. Or, you can prioritize your phone numbers so that you are using your preferred connection first. This feature has been requested by many users, and we're excited to add it to this list! - -## A powerful new activity: -### Custom Activity Builder -This lets you link several actions together based on a single keyword or incoming message. For instance, you can add to or remove a sender from a group, forward a message, send an autoreply ... or combine all of the above. It gives you a powerful way to have FrontlineSMS perform several tasks at the same time ... all automatically. - -## A better way to manage translations: -### Translations -We've improved the process for users to translate both FrontlineSMS and FrontlineCloud and we are adding new languages constantly. -Don't see a language you need? Is a current language not specific to your dialect? Contact us, and we can give you access to translate into any language or dialect of your choice. support@frontlinesms.com - -## Improvements -We have made significant improvements to contact editing and importing, as well as our help files. Here is a quick summary: - -### Contact Editing and Importing -We've added a new contact import tool, which will help you organize your column headings before finalizing your contact import. No more guessing as to whether your column headings are correct; we allow you to edit them during the import to ensure everything is accurate. -We've also improved the contact editing page so that edits looks cleaner. - -### Improved Visual Cues -We've made some small improvements to visual cues in the app, but we think they have a big effect on the user experience. For instance, now notifications appear next to activities when you receive a message, so you won't miss anything important! The application also assists with showing phone number formats and shows a country flag next to each phone number -- all with the goal of helping you ensure you're reaching the right person. +## Numerous UI improvements and bug fixes ## And stay tuned ... - -We are committed to releasing a number of great features in the next few months. Stay tuned for a new version of FrontlineSMS desktop soon! +We have improved our release process to ensure FrontlineSMS receives more bug fixes more quickly. [1]: http://support.frontlinesms.com From d151b74756f770782fdcafba8399b0044d94dfd2 Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 14:26:41 +0300 Subject: [PATCH 2629/2668] CORE-1990 Save dispatch while flushing in messageSendService.createOutgoingMessage --- .../services/frontlinesms2/MessageSendService.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy index 1e5134d27..8a3512c2d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy @@ -40,6 +40,7 @@ class MessageSendService { def dispatches = generateDispatches(addresses) dispatches.each { message.addToDispatches(it) + it.save(flush:true) } return message } @@ -65,7 +66,7 @@ class MessageSendService { def generateDispatches(List addresses) { (addresses.unique() - null).collect { it = it.replaceAll(/\s|\(|\)|\-/, "") - new Dispatch(dst:it, status:DispatchStatus.PENDING).save(flush: true) + new Dispatch(dst:it, status:DispatchStatus.PENDING) } } } From 2df6cdc06cc83c0b38af26e6ea5fde36305be2dd Mon Sep 17 00:00:00 2001 From: Vaneyck Seme Date: Mon, 19 May 2014 14:31:44 +0300 Subject: [PATCH 2630/2668] Update FrontlineSync description --- plugins/frontlinesms-core/grails-app/i18n/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/i18n/messages.properties b/plugins/frontlinesms-core/grails-app/i18n/messages.properties index d0b39153b..8c708a4f8 100644 --- a/plugins/frontlinesms-core/grails-app/i18n/messages.properties +++ b/plugins/frontlinesms-core/grails-app/i18n/messages.properties @@ -216,7 +216,7 @@ nexmo.receiveEnabled.label=Receiving enabled nexmo.sendEnabled.label=Sending enabled # FrontlineSync Fconnection frontlinesync.label=FrontlineSync Beta -frontlinesync.description=Receive missed-call notifications from your Android phone. +frontlinesync.description=Use an Android phone with Frontline's native app to send and receive SMS and capture missed calls. frontlinesync.info-setup.p1=FrontlineSync is an Android app that allows you to use your Android device as a gateway for FrontlineSMS and FrontlineCloud. Using FrontlineSync, you can send and receive SMS, and also track missed calls. frontlinesync.info-setup.p2=To set up a FrontlineSync connection, install the app on your phone from the Google Play link below, give the connection a name, and click next. Once you submit this form, you will be provided information that you need to enter into the Android app. frontlinesync.passcode-setup=The FrontlineSync app on your Android device will ask you to enter the passcode below the first time you open the app. You can also reconfigure FrontlineSync by navigating to the Configure Screen via the Android app's main menu. From 07ea2ca2523048ed280caafb4c75aa47492dfcbb Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 14:39:38 +0300 Subject: [PATCH 2631/2668] Revert to initial (at fork-from-master) state --- .../grails-app/services/frontlinesms2/MessageSendService.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy index 8a3512c2d..6b615d67d 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/MessageSendService.groovy @@ -40,7 +40,6 @@ class MessageSendService { def dispatches = generateDispatches(addresses) dispatches.each { message.addToDispatches(it) - it.save(flush:true) } return message } From 3289858676f99e28198f1df0f375ccfcf3221bfa Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 19 May 2014 15:07:38 +0300 Subject: [PATCH 2632/2668] [POST-RELEASE: 3.47 -> 3.48-SNAPSHOT] --- plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy index 8b2f90c3c..13d584486 100644 --- a/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy +++ b/plugins/frontlinesms-core/FrontlinesmsCoreGrailsPlugin.groovy @@ -1,5 +1,5 @@ class FrontlinesmsCoreGrailsPlugin { - def version = '3.47-SNAPSHOT' + def version = '3.48-SNAPSHOT' def grailsVersion = "2.0.3" def pluginExcludes = ["grails-app/views/error.gsp", "grails-app/conf/CoreBootStrap.groovy", From d82de3848e4e8c9502126670c8f0a59fd790b09f Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Mon, 19 May 2014 16:41:06 +0300 Subject: [PATCH 2633/2668] Released 2.4.0-RC1 --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 69cfad209..93683535d 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,7 +3,7 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=4-SNAPSHOT +app.version=4.0-RC1 plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 From 97349e39462c0fb4507646b4623ecd2e1a0a8f4c Mon Sep 17 00:00:00 2001 From: Okal Otieno Date: Mon, 19 May 2014 17:35:31 +0300 Subject: [PATCH 2634/2668] CORE-1990 Add delay to DispatchRouterService.slip to make sure dispatch is available --- .../services/frontlinesms2/DispatchRouterService.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 15cc50c23..7abd99344 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -55,6 +55,7 @@ class DispatchRouterService { logWithPrefix "Route Id selected: $routeId" if(routeId) { if(exchange.in.body instanceof Dispatch) { + sleep 40 def dispatch = exchange.in.body logWithPrefix " dispatch.fconnectionId:::: $route" dispatch.fconnectionId = route as Long From fd237e9c1931b19f123f7531a608af3bcf9d1e51 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 20 May 2014 09:42:10 +0300 Subject: [PATCH 2635/2668] Fix mysql Query in chnagelog-v2.4 migrations file --- .../grails-app/migrations/changelog-v2.4.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy index 4bfa5b7a2..4d699775f 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy @@ -45,9 +45,7 @@ databaseChangeLog = { } grailsChange { change { - sql.execute 'UPDATE FMESSAGE M JOIN FCONNECTION_FMESSAGE CM ' + - 'ON M.ID = CM.TEXT_MESSAGE_ID ' + - 'SET CONNECTION_ID = CM.FCONNECTION_MESSAGES_ID' + sql.execute 'UPDATE FMESSAGE M SET CONNECTION_ID = (SELECT FCONNECTION_MESSAGES_ID FROM FCONNECTION_FMESSAGE FM WHERE FM.TEXT_MESSAGE_ID = M.ID)' } } From 0a4f13108fb45fe54222d948d587ca794de78a40 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 20 May 2014 10:23:03 +0300 Subject: [PATCH 2636/2668] Fix migration script bug where fmessage.class was nullable before defaulty values weree set --- .../grails-app/migrations/changelog-v2.4.groovy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy index 4d699775f..a4286bb8f 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy @@ -24,12 +24,12 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-2") { addColumn(tableName: "FMESSAGE") { column(name: "CLASS", type: "VARCHAR(255)") { - constraints(nullable: "false") + constraints(nullable: "true") } } } - // Set all fmessage.class to frontlinesms2.TextMessage + //Set all fmessage.class to frontlinesms2.TextMessage changeSet(author: "vaneyck", id:"1387530956381-3") { grailsChange{ change{ @@ -38,6 +38,10 @@ databaseChangeLog = { } } + changeSet(author: "vaneyck (by hand)", id: "addNotNullConstraint-to-fmessage.class-1387530956381-3") { + addNotNullConstraint(columnDataType: "VARCHAR", columnName: "CLASS", tableName: "FMESSAGE") + } + //Move FCONNECTION_FMESSAGE data to the FMESSAGE table CONNECTION_ID changeSet(author: "vaneyck (generated)", id: "1400489400949-3") { addColumn(tableName: "FMESSAGE") { @@ -54,7 +58,7 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-4") { addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { column(name: "CHECK_INTERVAL", type: "INT") { - constraints(nullable: "false") + constraints(nullable: "true") } } } From b7109667877fbeadd78abaca88f27ebb6e6aeb1c Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 20 May 2014 10:33:20 +0300 Subject: [PATCH 2637/2668] Add default value for boolean properties in changelog-v2.4 --- .../grails-app/migrations/changelog-v2.4.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy index a4286bb8f..2e4f6028f 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy @@ -65,7 +65,7 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-5") { addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { - column(name: "CONFIG_SYNCED", type: "BOOLEAN") { + column(name: "CONFIG_SYNCED", type: "BOOLEAN", defaultValue: true) { constraints(nullable: "false") } } @@ -73,7 +73,7 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-6") { addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { - column(name: "HAS_DISPATCHES", type: "BOOLEAN") { + column(name: "HAS_DISPATCHES", type: "BOOLEAN", defaultValue: true) { constraints(nullable: "false") } } @@ -81,7 +81,7 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-7") { addColumn(tableName: "FRONTLINESYNC_FCONNECTION") { - column(name: "MISSED_CALL_ENABLED", type: "BOOLEAN") { + column(name: "MISSED_CALL_ENABLED", type: "BOOLEAN", defaultValue: true) { constraints(nullable: "false") } } @@ -89,7 +89,7 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-8") { addColumn(tableName: "SMSSYNC_FCONNECTION") { - column(name: "HAS_DISPATCHES", type: "BOOLEAN") { + column(name: "HAS_DISPATCHES", type: "BOOLEAN", defaultValue: true) { constraints(nullable: "false") } } From 20b492740582ca556b0d38a2e3ff1183afbe8992 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 20 May 2014 10:46:27 +0300 Subject: [PATCH 2638/2668] Remove migrations entry for dropping smssync_dispatch table --- .../grails-app/migrations/changelog-v2.4.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy index 2e4f6028f..6e338040d 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy @@ -144,8 +144,4 @@ databaseChangeLog = { changeSet(author: "vaneyck (generated)", id: "1400489400949-18") { dropTable(tableName: "FCONNECTION_FMESSAGE") } - - changeSet(author: "vaneyck (generated)", id: "1400489400949-19") { - dropTable(tableName: "SMSSYNC_DISPATCH") - } } From c17715286c0e4cc41875e56c4cc4f5bd474ee9c4 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 11:53:34 +0300 Subject: [PATCH 2639/2668] CORE-1990 Replaced fixed-duration sleep with an incrementing sleep that waits to a maximum of 2750ms before throwing NPE --- .../DispatchRouterService.groovy | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy index 7abd99344..53414368b 100644 --- a/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy +++ b/plugins/frontlinesms-core/grails-app/services/frontlinesms2/DispatchRouterService.groovy @@ -55,8 +55,7 @@ class DispatchRouterService { logWithPrefix "Route Id selected: $routeId" if(routeId) { if(exchange.in.body instanceof Dispatch) { - sleep 40 - def dispatch = exchange.in.body + def dispatch = waitForDispatchToBePersisted(exchange.in.body.id) logWithPrefix " dispatch.fconnectionId:::: $route" dispatch.fconnectionId = route as Long dispatch.save(failOnError:true, flush:true) @@ -157,5 +156,24 @@ class DispatchRouterService { log.info "Chosen Route ## $routeToTake" routeToTake? routeToTake.id: null } + + private waitForDispatchToBePersisted(dispatchId, attemptCount=0) { + log.info "Checking for Dispatch $dispatchId in db..." + def d = Dispatch.get(dispatchId) + if (d) { + log.info "Dispatch $dispatchId successfully retrieved from db." + return d + } + else if(attemptCount < 10){ + def timeToSleep = 50 + (50 * attemptCount) + log.info "Dispatch not found in database. Waiting for $timeToSleep ms before checking again for dispatch $dispatchId in db" + sleep(timeToSleep) + return waitForDispatchToBePersisted(dispatchId, attemptCount+1) + } + else { + log.info "Dispatch not found in db after 10 attempts, throwing exception" + throw new NullPointerException("Dispatch not found in database") + } + } } From 12a8a1d0030ab738594b23fe9d8c23b904a8ece0 Mon Sep 17 00:00:00 2001 From: Vaneyck Date: Tue, 20 May 2014 11:57:37 +0300 Subject: [PATCH 2640/2668] Roll up version to 4.0 --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 93683535d..8973ca340 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,7 +3,7 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=4.0-RC1 +app.version=4.0 plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 From 44f1b87f0a4396dcb30cf6b3ed17806ddcb98b56 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 14:17:29 +0300 Subject: [PATCH 2641/2668] Corrected name of 4.0 migrations file --- .../migrations/{changelog-v2.4.groovy => changelog-4.0.groovy} | 0 .../frontlinesms-core/grails-app/migrations/changelog.groovy | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename plugins/frontlinesms-core/grails-app/migrations/{changelog-v2.4.groovy => changelog-4.0.groovy} (100%) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-4.0.groovy similarity index 100% rename from plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy rename to plugins/frontlinesms-core/grails-app/migrations/changelog-4.0.groovy diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy index 60ce82197..8990c7378 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy @@ -27,6 +27,6 @@ databaseChangeLog = { include file: 'changelog-3.1.groovy' - include file: 'changelog-v2.4.groovy' + include file: 'changelog-4.0.groovy' } From 6ebf4d8655cca4a7ee3c308e49ae807045da4158 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 14:17:48 +0300 Subject: [PATCH 2642/2668] Post-release version name --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 8973ca340..2ad0d2107 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,7 +3,7 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=4.0 +app.version=5.0-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 From 1b4f8aef71fbcffa30d8c19eb1fe0161d71c4612 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 14:19:18 +0300 Subject: [PATCH 2643/2668] core-4.x Updated post-release version for maintenance branch --- plugins/frontlinesms-core/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 8973ca340..2cd301f50 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -3,7 +3,7 @@ app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=4.0 +app.version=4.1-SNAPSHOT plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 From cddcbe167f1d2e76f9aea4b3f380977ee82304f5 Mon Sep 17 00:00:00 2001 From: Pitkin Date: Tue, 20 May 2014 14:52:48 +0300 Subject: [PATCH 2644/2668] 2.4.0 content added from Jira ticket search --- .../grails-app/conf/help/features/new.txt | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt index 6d4dc1e60..c506a19b1 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt @@ -1,10 +1,35 @@ # New features in FrontlineSMS v 2.4 ## A new Android gateway! ### FrontlineSync -Details of FrontlineSync +FrontlineSync is an Android app (running on v. 2.3 and up) which lets you easily send and receive messages to and from FrontlineSMS — even if your Android phone is in a different location from you. FrontlineSync also registers missed calls to the phone in your FrontlineSync or FrontlineCloud workspace. -## Numerous UI improvements and bug fixes +There are some basic requirements for this to work: your Android phone will need to be on, and have access both to a mobile signal and wifi or data signal, with an appropriate plan; also, you will need the FrontlineSync application to be installed and synced with FrontlineSMS. After that, any messages you send will be routed through your Android phone … and incoming messages will be routed back to your inbox. All with a local number! +## New features +1. Now you can register Missed Calls in FrontlineSMS using FrontlineSync +2. Alongside SMSSync and USB modems, FrontlineSync provides another even more stable way of sending and receiving SMS +3. FrontlineSync has performed faster in our tests when sending multiple SMS +4. Import contacts using the vCard/VCF file format + +## General improvements and interface updates +1. The link to the Connections management screen was moved up into the top navigation to make it easier to access. The old 'Status' information is now positioned to in the Settings section under 'Usage Statistics' +2. There is now more comprehensive support (UCS2) of special characters such as Arabic when handling message sending, viewing and exporting +3. New Send Message window is now just 1 simple screen to send a Quick Message +4. Improvements to the contact import review screen allow faster and more detailed editing of contacts +5. Routing rules on the Connections tab are new and improved +6. We added a new icon set to associate objects in the app more clearly and consistently +7. Activities listed in the Messages view no longer have the type of Activity shown to save space +8. Added a short-cut in Activity builders to allow you to create new groups without having to navigate back to the Contacts section +9. Message count in top navigation is now grey when no new messages exist +10. You can now edit the name of a connection directly in the Connections list +11. While editing inline on the Contacts or Connections screen, you can now undo your edits with the ESC key + +## Important bug fixes + * Importing large numbers of contacts is now much more stable and works in the background. Meaning it returns the response once done and does not require you to wait. + * Some variable replacement was not working when using the 'magic wand' feature in Activities + * Notifications on new messages were sometimes counting from the wrong folders + * Various bug fixes in the contact and groups management interface + ## And stay tuned ... We have improved our release process to ensure FrontlineSMS receives more bug fixes more quickly. From e570eeebab84e3016660e2eb9f3aa442f01a6172 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 14:56:45 +0300 Subject: [PATCH 2645/2668] Added do/workOn --- plugins/frontlinesms-core/do/workOn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 plugins/frontlinesms-core/do/workOn diff --git a/plugins/frontlinesms-core/do/workOn b/plugins/frontlinesms-core/do/workOn new file mode 100755 index 000000000..9f1d92eb6 --- /dev/null +++ b/plugins/frontlinesms-core/do/workOn @@ -0,0 +1,25 @@ +#!/bin/bash +if [ -z "$1" ]; then + echo "# Usage: do/workOn TOOLS-XYZ" + exit 1 +fi +echo "Is $1 a User Story [s] or a Bug [b]? [s/b]" +read storyFlag + +if [ "$storyFlag" == "s" ]; then + echo "Treating new ticket as story, will branch from master" + git co master +elif [ "$storyFlag" == "b" ]; then + echo "Treating new ticket as bug, will branch from core-4.x maintenance branch" + git co core-4.x +else + echo "invalid input, exiting" + exit 1 +fi + +git pull +git co -b $1 +git push -u origin $1 + +echo "Created new branch $1 on origin. Happy coding!" + From 02af8f175e1e24c64e77c80b2440f11b7acb11c3 Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:24:04 +0300 Subject: [PATCH 2646/2668] Images for Connecting to FrontlineSync doc --- .../frontlinesync/1.1.Add-New-Connection.jpg | Bin 0 -> 10876 bytes .../frontlinesync/1.2.Select-Modem-Type.jpg | Bin 0 -> 19730 bytes .../help/frontlinesync/1.3.Connection-Name.jpg | Bin 0 -> 32641 bytes .../frontlinesync/1.4.orange_connection.jpg | Bin 0 -> 13945 bytes .../images/help/frontlinesync/2.1.config.jpg | Bin 0 -> 15358 bytes .../help/frontlinesync/2.2.passcode_and_ip.jpg | Bin 0 -> 26446 bytes .../images/help/frontlinesync/2.3.options.jpg | Bin 0 -> 17786 bytes .../help/frontlinesync/3.1.green_connection.jpg | Bin 0 -> 29866 bytes .../help/frontlinesync/3.2.too_many_sms.jpg | Bin 0 -> 25951 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.1.Add-New-Connection.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.2.Select-Modem-Type.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.3.Connection-Name.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.4.orange_connection.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.1.config.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.2.passcode_and_ip.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.3.options.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.1.green_connection.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.2.too_many_sms.jpg diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.1.Add-New-Connection.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.1.Add-New-Connection.jpg new file mode 100644 index 0000000000000000000000000000000000000000..35e86fab65cc745e655b9330f657ffcb3c02f947 GIT binary patch literal 10876 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 Xn&S74y=%7W;N~%ua5p~Zxt#bvTZv*g literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.2.Select-Modem-Type.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.2.Select-Modem-Type.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6591bf7d3b761b82577de7cdfde4d8d9a9e5f613 GIT binary patch literal 19730 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�=Ro1`(`c#72mV!SU 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 AX8-^I literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.1.config.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.1.config.jpg new file mode 100644 index 0000000000000000000000000000000000000000..03ebd12f5c60a229974d453eebf0f1bfc48479be GIT binary patch literal 15358 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 V6BY3Pc~ZG}D^>ml!27wZ{1=qCbcFx_ literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.3.options.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.3.options.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b3daf5df187a5aaed7395bb3a721ea3d83994c56 GIT binary patch literal 17786 zcmch;1y~zh*ETu{?!nz%i#x^LwRmxd;@U!R*W%Iw#jUtgT#CCx@uDp)QtJQE=X;;` zd9Pp3xz2xflG%GNx!1kcP9~Gg%!F55s=Zb006rK0I2H#faeMTmhK!AXozZ(RKfQW>Q^54k; zP!2&th5-;n@Bu|cKt=fDg8&u@5g!+i0EtLS3&zbyNJGnOky6M*M=#6o&VURC0}!Do zh{z~NCP*# z0R|-Zl-*C(cpw`H(mzP@04Y*h?u8Isd^r!X}*{Te$- z?{6^}uKDD}>z1YkYT`#ZYZT36ix${?>3{3VHF8eBO+2&w>=R&C|Mr*+5?ga9UjMh+ zRe)e^?eqYN=5GlA1gBa3V+H^y+bRDs$Bg-p>3{eF00I0zv^xJWgQzRU1lnt3&b*M| zGn)7Qx2bOW*H?~vRIwK?w71<~4YMzog!LI;?w*I{+y5~z706;*{62)N{>x=5cLPlX-brsbV z-*)EZqs=K9iy9!CaR7k(bRbfHkWs-cL=b3%>#ZKmQa!NH_<8dteJ) z`eE@VdIaftI~yyGjJGoB~+~pwxfXoY#(Dwz*HSUzmkkpb*Z>l*dF!4V+C`d*N z{m+6R0`PkZBIR}SQwmQKzofe4&2egU{ENC#=?Sx1erm3k~1UPW4iH7R1mZSr0yF;$}VD~Pv-HTpeFu0Z$Ad-}FUriVsiqKwGucdRJ zF1T`_Hw*@cM@!celp?W8OH1F^78O-W29!p!u&SVghHx-zu)!h_X=v{S>4k-bP`DJx z5mg5Iml=o$<^$4+K%|9$-uGZC=vrW0upThb6O`(t6O^(_tK6^FUlBm5ik41#DH00{ zPrT3Q7(y-yt#jDRWwdLto$RPLE*0pL>7(B8)dt6K`j0PAs|1U!NkWDTMb zl(K;Bewjd<2pU?5^nDDFF<9Ea;NTHRV5awQU}patxUlqlIHZ5V-LnJH{=p6f+`)rX z!EXv^xDdTqdFIYHr$JI?s|rQL$q$FfJVK_f=t89EJk8i7v9BP*hmU^^ht^L<{+c|S z&F4h4qAnv4njUJC&)GU%8D$SSQ@p-?{824+NH%fyQ**gZP;H70@5=+z2u)VWM*LI6 z0Omg1J{!yZm-Ww2b-rCylco_`<8A#ox2`m0JYyJ+HYk;A%G%KEy(k-V7k<2if2#X! zzgarTHkF? z|D6ra54en+wcC6Uy$f$sr`QYkC!u2Y32sLHI>U90q9fKTH<>mpE6>vs{Q>nY?Q)wN zh(YSqqT2JbARW1D^dIqN;V%pV1G+nBOt4!c(AfG?f4x)W{+2R!J~_qpCLtb>LH2dz zr-ckIbxtyp4w#QUDQ{(0n9RNv;ao>LM`^SYu1jC8xh1jrnNIW0hl=%`zf_woM71IA zr8{a_Pi+q6E9(!bzKq8SFFod}*S&;aZ_q{FY3Or)CR-Xv+6|)cYV*&1Hu^1~mN{sM zHdvZ;o2)=SHdP~)X|H6DU-Wo{@L0`Df{2|e0*j0FlVV*uM=VKt4i2EERo11}%5s=`;TWv{5sSR^|G@F7L<<0b-qf;5l&nH=Q^rErE+e8x0ioY~;>2@NEA4rAAi z7ge_x);3?gwvO~HqNjZnAuT9g9aX1@Dmc*PfMdn2;1F0T#ydf<5Z~L7ck=qGoHcmf zWSN%MkU{0k*dUHY5N@@V|Yx8@cuwFwyV+{K;nKJiFnsqQ!YVG-bs^@jg2aX>hyGRjiO>v{i5RMAf?2 zwCM;8=GjzOQf%IXOxZ;uO5CZ|a<~kv$XM8Kx~=<>ACi1lfm814fBjT~9K(kC;Jcfy zOBR1nV`77}*O)VRSJRzLV7xK);}Ysu z{Vz#lXp;KAC6h*4`RAkM^vJ_51&Q@agDrAV0=a3d<;#Q%KF`;G+UCSxlmvO7WHbGQ zv)*cERQD7eh04j3`y8U=lTpC=={%Gg>zQO5Ne5G~Qkzg{IYy8VAa+DQUYX{8H}4}8 zK{??-m(x_6-lS*C*i<1*Msb>6ytDI$2~Ug)&d)I{I^p3t$yu-0^6^x5Ptar{Wtj&g z@gKesP~-1k{teXq$l;;+HTD~L4r|P7YOHzWcf*8c_rnAu-qORRjx%GZu|4w<-uRx8 zPNlt@NKulj==ldTqImh@IfrIr&VLTd3ppPxRc9ayZ`>v{J%6ZN^W2E3QQao@tw5$T z$FfmPlaXCxs%`GLe0u!9rc<_b6aUbH#uEZ*&J4@{~0=GVn0LUh;Noe$GDWN?t^lTN1Sa%+@!G0w$nu~i8Xy|?oLRSMv^}=s9va0Dvc}Uq zSNO=Ic1YndN-!N#pV!?Nx8OPWfHyEIb;qh)zz}2VMML$_E;2{n^3+N15oz8QND@j|=nNYstgMr+#wLJ7D!!rx_o;MQ)=dA^nMA)M$@g?;O-yjXEnrq?oq zbzO(2??q-Kk;y#N!YR5`sW~^J$l$SJSSk?*+%M z@@xX88pV&+sJvW~MOqc}H|YQGDSiVLSRRuZa;vwfsw<*)8o39R9o$OQ5sk-DC!u#S z2-MWSigP|XB`94>>@GB%xC%V*wely$BUXy;7K$McH=)Aavn~h;NJoqOlBX5_2%gee zba)r>(|6wtznNf}Z&1yo$GYPEwU<__x!nASOwZy_I18yS)H56P}{>_%+gUS`N-glo-ouBG09a9~~eoC0nQfc9&sP6?bg!uBC&*HNbDcAHRJGr5# zA{3ZxG-)hpN&RQt&KHUEIDY4fA9&J(AHSZ}|LFNLN5#-5jrZAd`h;q$h|bpQ4AW7P z?;W@DRkZ|df!-qY0z>Dx3vL2kLfUKgoVyXpb{^iIIm-jlodbrfFV~3G&s?9RBPdP4 zMr2*Y2;V8_vFoG?O$4#DiOHF@56j>o(|-hcd!?<$);n@aWS@jiw636Vn7c%z9KQ5M z&>&#n9702xz~WvuShI*=Z_h-Gy?oE%74K`C*f)u@ll8rLizvRQZ<5HuB1%Db@>bTZ zV_^A+deQ3Ds3~tt@q=nM3|*3}-BFg#?#5)B`ElDEt#_v0)2@3*$AXIqjuXNP&$%wv z7cj9J5l~-p6sM3HTZG{_EUXbNF^(xeo%s=!zL9T6QO0VU;kG%54(Iy~@N+jN5OQs_ zuGCLSxq$63e%$@y8~3$118%D3}OwrBGw-;5OUwP;b_g zX74;clC;t5!(2%3_Jd!U=rGkn9V4DhPk&G+6C=rs{>JAXSKm zZds-~{a~v{WZQkf0wFANOv6aNX)<@+o`tdaC>ganJES)2H_)WtNOdORw!@mXkoml3 z_^1s5t9N3yoM`h#69$&)DPbxlvdcS+BV^o#*)j7ohlKM@882TGfuW_7uPGo(r#7FU+vJ<@-pAt%C>TOrL?JEF>D**^NiySDplc9O@1@zJX-a(M}PBiknCEM z{&zs6_@8 zaQzfkFaK4k!If0N((<;gOIgk78M3zLZfiiVK=}7XBH&Ktfw5e9sd=fg3dRGDb^J}d z+?6U$eX-0c&!U=!mL%1QJ!72gU=YP@yl@cTU*gDr=mP9cs0R`e8DWC8RZ^ZsO z`JP};oppAtQ*orGQ{`uenZ*5}Slx?Q^nmdiN2W+@MpV()y{^j9QY0rxg7A$l0EuPT z0ivKzZ^P-)aDRrC(}zY0j&KesbGTnP{stUO-Br;nb#(@8x%(LDbjf&L;4Tn1I=1~be?s(&^)Ec$J_qIiT z4HoZI@+X@x9MEgl4@HGEPx11-@NTf zz=s<~gBm!|AjwE%Cl|S^NPa_ZXly*)JWEjA^o@p0RCzBxMo8@Z=7H5+@w@)E>HKN- zB+Bm%&uZ86APy(O57UtA#!TSs8i$x?f?5J8LS2kRQW$2#b{uTpTf75s4IX#nR=hmu zVZW!v$8h+qe3Z8SDAAmKZ3$0u46b>n-sD)Uh6UzR`m$hrvjYoe&RK=*6FBs_rAdyb zC-a@tnEwD`=Fbh4g~e&a`uO?QW+R^_7lb?k8b7RKXSKK|2u?aoX zuHCUC9afULq89AWO`mf%DT^ie#5CB=Q^%W7dEv?P{xII;7Yc85a{YozJJG;nqxibRM63=Q4QDKi<3r%T@-%8 zRy%xmHI(0%b$$bCCU(;#(Z((}zeu}5j+`)6b3wzj( z&a6^R7kltJdyN>M%x#0{Y7c78Rlf{04A*gH|2Wi{m2gx1w!n$L$L5 zWJxbQWW+Kw?AVx*5TJuRNX~>@R%~{Ik_ZG@grrKE=30HCnWjTGQaWeabHatfui30J z-O06i%&hXuh0#s*HtF2;ge$#ZCfUsilY4bm3+eA6?1U5%YNW|Js;vhqVWk?R6B?pL z@wmFitb3Ys_^y{KZRBW#TEdofT&h0nsOm5+=}I3);Xa9_u9 z&AbbYuE(h&TBD2Pk_{T^_ziSo=^;#@GH6)L=xG7s6RmZm8dkaX#X4J|Pkhs{37d0o zPNymDn5JB#56VJL;tfg#TECFgzw8meyom33l4lbvn?N2;c@kOqoF60ii;QPj1q3pb zPb`=4eho*R4a;*O-o{3OvVBybav+?w$$dtx%STZ-Iq<`wTDAzur1gh^&nJ2Wnt1MJ zcziFPKCxdrHMpqlTtAevLcwhLGV&FDK)>cQXG-*4_2u2CaSSgaRn`|jim;F}vRUa2 z)h5o8WHu_|ocIvpdpjR;_T_qnPk39Qq6FRb)a#k)NHN5oPP5x*r#NCBtjTN~aXyKA z{gglvb0V9n&2F!@jc5?s=DD2}T+!s6fnMmPWn*No)>Tf-If*aJ*cF+#%{Rf)pv2Eo z^^3eKpX4wfNtabrP|~LypQ65`=ty-BU8B7QmrHl!ljF0LM%yh_wvc_t>{bk{Y46{_ zVSZ7@8uPe`D(m+sk7-A4&!mAeJljQNlo1TP;>{S;CgJBI`-7X3eQcqsU6XLeSK{CI z^cFg6d!upFi#VaA*(pH`%*at#9EXI<(8WiT7US$3EYr2PW>(Kr^U0;A7Lg@JNc1oY znF@sEeJ}yeB;B|(f&%Wd6l0t9({ZFGF1!yz<5E)M!`r(fB0h1yfoL_X-EJna2>nT8 zd)65ZcalwG6MEr2(uMu%CFIl26RhYMI*)j$V>6Te2MGm2Gy>L+Zoa$cbNk3eOesdo zQ(1fC2+NBr{-DeCCrJBNVIgXIM=3>qx>;!n1y0lHnKeCXu$n`x7~f7>^NM#q&JC!p1aD{obm-bK2^;Y9P&7im{*7|&E@hrxYrjhK}_cwz&8 zc}}m&Kq{f7(e}=3nll!`-2Yr%T zj*^7I7San&$t3DEuV<0z480hYvJP*4SjPkp<@-9|=4(BbaM1RQ`6->eNOHfSem5ei z6%qoDfBvw(LHY9Oj|k^yzeMUNS)qbQzCG#4|6ubiVquMf=S%NU_W#u6f8;iFJ+X); zf=X#1UWPtsn)jf5&hryK(P9JTobchyQ}oicQ^~AF63j6k=MvqAWqH0+ul)(rkHi=$ zeI8d6hg|d~dDm2aO8yZ&IdNor$y^}b(7z@!EgBn1>}pKW8j!V{f00P}$!AV+vR74% z^CR&n*Q!CA=ew*=oEykCyYYJ-R7GE(sq7m4cvM?nC-uy{@~gFoBJLW6qKyY->X7gM zt)aX`+HYVj`p>@`5Cn)Mt*sP+2q((+M%Kzw`TrVMs?)Nx|bEd0bDF|oQ%~B)jpZ= zQK7M6ZsY4ps5p{^&unR-2}L~I%`*Qz+52!EcEiA#G+BpfRnJ(tVr`am6-K=O^}z3o zh)GTNoyMz$@1n_?=RNZVPeYL2ZSIvXN8|0~kjbo#nJM|9k_uQFGVM zq;{=(?SMh)8zz#*;Xn*h(Q#Bg_^r|Gh^@I~wV`hFxgy_G%!(F)_3N!KUmgp;NX3hyB5xv5ORxJ19SK#QSJZ*a%IUmg2N>P9d7_wnZm!p=C>} zwnI&OLeg4?nHW}&zY(ef;@2Fl^_`=SvND_!6u8npMt@MS8O_IH9!VQU4xKp1R~+Qn1!L6{7>yYZ3IuH8b&78AdH_9@*S3f;lw zb8ix9Xdu#Xw1OP_3O9c9nm6{0^{-L{o*MeB6-`>EvvfkF51#E|7=-J;M9qVqS^i)X z#Zf|LbQjbDT32Z76AdfX53KVzCdhefpIOb?ex?h<%E8kmmZ`xCTQa8Eh7?uM6c?58 zMR=<&F374VDp{i{x(hhjvr|NAdYe4A#3CE?+Fll{)SoAt^2JJ0b%{5zI7DnebulTH zk1~dT|ecj+=cAisZQQ+OT@I^#HgSkXlW6xFY%6nCpRaTU*#io zhIJ7ThZDOLvggngD@^lb6!qG6s}P?EWRgKHXLf$#INZ&1~swd8@nh?&)n5{|)@ z{D;~=xu#jHYv&lnNfA9P7s$*hv@U#j?;(qABqOr=^QDrGLU^%;7g=BWgxUt4GWXI%_`RE~}idG_H1-u}vGh*^$IuIyI>8 z{*+?XLO0=V^Ie=EtNBba0HMrO$)wQxm`>#JK;51bw_IoHXd?S~wQ87AxML%RX9-ce zmhSWn&$ZuD>uJ8~uG=}eXwT;)x>wGxo>VTFd(>BPFGmUSY4S3<8qS`kmipL^Ja}aB zKF?wB*H7ZdgQB+r19P$+(ZlX-@j)WoqT2iAPegwTR9~G}G@uo!)QD~PfAfLw)pU~6 zXOZ+)m!*`Rc)iEtM}X#4zeK9gL>ki9X=+8(Y)(*t<{j~HuG({2E46RPu)JbxZ*I

      58mRH=Z;jjjFV5i+po9maxcf>oetq_R1k< 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 e-~7xX6}uau-5Qeng%SHI-%wf_d9p4@=| literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.1.green_connection.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.1.green_connection.jpg new file mode 100644 index 0000000000000000000000000000000000000000..47fe63c818f25e2b2286ebde5a98741c5159b5f1 GIT binary patch literal 29866 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

      k>s3Dpij`R8*o&{@;@Xri7grjRb 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 Date: Tue, 20 May 2014 15:25:26 +0300 Subject: [PATCH 2647/2668] Connecting to FrontineSync doc --- .../4c.connecting_to_frontlinesync.txt | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt new file mode 100644 index 000000000..d92fb04fe --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt @@ -0,0 +1,71 @@ +# Creating a FrontlineSync Connection on FrontlineSMS + +FrontlineSync is an Android app which allows users to connect their device to FrontlineSMS in order to use the device as a connection for sending and receiving SMSs and tracking missed calls. Please note you will need FrontlineSMS in addition to FrontlineSync in order to use this service. + +FrontlineSync does not directly limit the number of messages that can be sent via the app, however, your Android device or mobile service provider may limit the number of messages that can be sent during a given period. + +# Setting up a new FrontlineSync Connection on FrontlineSMS + +Enabling the use of FrontlineSync as an SMS and missed call gateway is a 2 step process; you must create a FrontlineSync connection in your FrontlineSMS workspace, then you will need to download and install the FrontlineSync Android app on your Android through the Play Store. Information from your new connection will then need to be entered into the Android app: + +# Step 1, creating your connection in FrontlineSMS + +Navigate to the connections tab in FrontlineSMS and click on the 'Add new connection' button. + +![Add-New-Connection][1] + +A list of the available connections will appear as below. Select FrontlineSync and click ‘Next’. + +![Select connection][2] +This will create a new connection by default named 'FrontlineSync'. Click 'Next' unless you wish to set a particular name for the connection. + +![connection name][3] +You can ignore the next screen and click 'Create' to complete the set up as the page simply confirms your options + +Your new connection will now appear on your Connections page. The connection will have be set to 'Connecting status (Orange light)' while it waits to complete the connection to the Android App. + +![Connecting state][4] +Your work on FrontlineSMS is now done and you now need to enter details into the Android app. + +#Step 2: Installing FrontlineSync and connecting the app + +If not downloaded already, please visit the Google Play Store and download FrontlineSync onto your Android. FrontlineSync is compatible with Android versions 2.3.0 and above. After completing the installation, open the application to configure your connection: + +![Select type][5] + +Select the the Frontline product which you would like to link FrontlineSync to, in this case, FrontlineSMS +Enter your Android Identifier and Passcode which were generated in the final step of setting up your new connection in your FrontlineSMS workspace. You will also need to enter the address of your FrontlineSMS computer; see further details on how to get this address. +You can define a port number of your choice in this step, however the application will append port 8130 by default if not set. The protocol expected is http:// and this will also be auto-completed if missing. + +![Connect with passcode][6] + +The app will now try to contact your FrontlineSMS workspace. It will only proceed to Step 3 if successful. Progressing from Step 2/4 will also auto the connection status in FrontlineSMS from Orange to Green. +Once a connection has been reached you need to set the data that you would like FrontlineSync to handle. Here you can also set the frequency that the FrontlineSync will communicate with FrontlineSMS; a lower number here will mean FrontlineSync checks with FrontlineSMS more regularly but can affect your Android's battery life. + +You are all set! Next you will be taken to the app's dashboard. See more details on the dashboard. + +![Options][7] + +If you now return to FrontlineSMS, you will now see that the FrontlineSync connection status is now green showing that there is communication with your Android phone. If you expand the connection options link, you will see that the Options you chose in set up match what you set up on the Android. +![green connected][8] + +# Troubleshooting tips +If you notice that your FrontlineSync connection is not sending or receiving messages and uploading missed calls: +* Check that the application on your Android app has not been switched off. +* Check that you have configured your sync settings. +* Ensure that you have got enough mobile phone credit and that the phone is connected to Internet. +* Ensure that the connection is not disabled on FrontlineSMS. +* Check that the Connection is placed first on top of your routing rules. +* The sending limit for bulk messages depends on your Android version. FrontlineSMS alerts you when you exceed the limit and when you click deny the items will remain in the pending messages folder. + +![SMS exceeded][9] + +[1]: ../images/help/smssync/1.1.Add-New-Connection.jpg +[2]: ../images/help/smssync/1.2.Select-Modem-Type.jpg +[3]: ../images/help/smssync/1.3.Connection-Name.jpg +[4]: ../images/help/smssync/1.4.orange_connection.jpg +[5]: ../images/help/smssync/2.1.config.jpg +[6]: ../images/help/smssync/2.2.passcode_and_ip.jpg +[7]: ../images/help/smssync/2.3.options.jpg +[8]: ../images/help/smssync/3.1.green_connection.jpg +[9]: ../images/help/smssync/3.2.too_many_sms.jpg From 3b64ed0183980c4eba4f4bf2efe9237156e9f71c Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:28:29 +0300 Subject: [PATCH 2648/2668] article on how to find your FrontlineSMS on a LAN --- .../help/settings/4d.finding_on_a_lan.txt | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt new file mode 100644 index 000000000..1e96561e5 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt @@ -0,0 +1,39 @@ +# Connecting FrontlineSync to FrontlineSMS on a local network + +A smartphone running FrontlineSync can communicate with your computer running FrontlineSMS over an existing local network (LAN), via smartphone tethering, or through a public-facing IP over the Internet. + +#RECOMMENDED: Connecting FrontlineSMS and FrontlineSync over an existing local network (LAN). + +1. Ensure that your computer running FrontlineSMS is connected to your local network, your LAN is probably handled using by a router. + +2. Connect your Android smartphone running FrontlineSync to your local network via WiFi. + +3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) + +4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. + +5. Please note that your router may assign a new IP address to your FrontlineSMS machine every so often, or if your machine reconnects to the local network. If this occurs, you will need to repeat steps 3 and 4 to check the IP hasn't changed. If it has changed it is a simple update that only needs to be done on the FrontlineSync connection configuration settings on your Android. +It is possible to configure your router to assign the same local IP address to your machine each time. Contact your network administrator or consult your router’s manual for more details. + + #Connecting FrontlineSMS and FrontlineSync via smartphone tethering. + +1. Set up your smartphone as a wireless hotspot or source a connecting USB cable. (Note: Some carriers may restrict this functionality or require an additional fee to enable it.) + +2. Connect your computer running FrontlineSMS to the smartphone-created WiFi network or via the cable. (Note that your computer’s internet connection will transfer from WiFi to your smartphone’s data connection if using the hotspot route.) + +3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) + +4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. + +#ADVANCED USERS: Connecting FrontlineSMS and FrontlineSync via public IP + +1. If your computer running FrontlineSMS is accessible over the Internet via a public IP address (or a DNS service), you can connect to it with any Internet-connected smartphone running FrontlineSync wherever located. Consider contacting your network administrator if you wish to take advantage of this setup. + +2. Connect your smartphone running FrontlineSync to the Internet. + +3. Look up the public IP address you wish to use. Google will automatically report your public IP address if you search for “what is my IP”. [This Google search shows useful results]. You will probably need to set this up manually with network administration and/or you FrontlineSMS computer's DNS settings. + +4. You will probably need to set up ‘port forwarding’ on your network’s router to forward to the host computer. FrontlineSMS uses port 8130 by default so if you want to use the public IP on a different port it is easiest to forward port 8130 to your required port. 8130 will be the internal port whereas the service port will be your new chosen port. + +5. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. + From 34112acb6d5c9970e1d8d346327f768b76a99305 Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:31:47 +0300 Subject: [PATCH 2649/2668] Added link in creation page to pan page --- .../help/settings/10.Custom_routing_rules | 54 ------------------- .../4c.connecting_to_frontlinesync.txt | 3 +- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules b/plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules deleted file mode 100644 index 72991cc30..000000000 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules +++ /dev/null @@ -1,54 +0,0 @@ -# Creating Rules for Sending Messages Through Multiple Phone Numbers or Connections - -FrontlineSMS is highly configurable, meaning many features in the application will help you send messages in a useful way. One of the most powerful tools for this is configuring routing rules, in which you can select how to messages through a variety of your phone numbers. - -If you only have a single connection, such as through one modem, then messages will always send and receive through that single connection. But once you add an additional connection, such as an additional modem or an Android phone using SMSSync, FrontlineSMS will allow you to create rules for sending outgoing messages. - -In other words, routing rules allow you to set your own preferences for sending messages, and improve the chances that your messages will be delivered to the people you are trying to reach. - -This help file explains how to create these routing rules. - -If you would like to set routing rules, click "Settings" in the upper right-hand corner of your screen, then "Phones and Connections." Your screen should now look something like the one below (although perhaps with fewer connections than our test account): - -![Connection routing rules][1] - -Now you can create routing rules following the steps below. - -1. First, make sure you have all of your connections configured. This could be multiple modems, a modem and an instance of SMSSync, or a combination of these. - -You will then see a list of options, as in the screenshot above. - -2. Next, decide whether outgoing messages should be sent through the most recent number used by the people you are trying to reach. - -In many cases, the people you are trying to reach will message the number they are most familiar with. Therefore, you can instruct FrontlineSMS to send outgoing messages through that same number. - -For instance, if Jane is trying to reach you and has your Android telephone number, you probably want to respond to Jane through that same number. If you respond through a different phone number, she may not know who you are! To always reply to someone through the same number they messaged most recently, select the very first box, as indicated in the screenshot below. - -![Connection routing rules 2][2] - -3. Now decide the priority order for other connections in your list. - -You can also set the priority order for the other phone numbers you have connections with. Note that you can do this whether or not you have selected the box to send messages through the most recent number contacts have messaged. This is useful for: - -- situations in which you are messaging contacts for the first time, because you can prioritize the least expensive or most reliable phone number -- forcing FrontlineSMS to use your preferred phone number, no matter how other contacts have reached you -- prioritizing how FrontlineSMS will message someone if a phone number fails; in other words, if FrontlineSMS cannot reach someone through your first preferred connection, it will try again on the second most preferred connection, and so on - -In order to create a prioritized list, you can 'drag and drop' your phone numbers to create your preferred order. Below is one example. Let's say the third connection on your list is actually the one you prefer to use for sending most messages. You can 'grab' the number by hovering over the left-hand tab with your cursor, where the arrow is pointing in the screenshot below. - -4. Finally, be sure to deselect any phone numbers you do not want FrontlineSMS to use. - -In the event that you do NOT want FrontlineSMS to use a certain phone number, you can simply deselect it in the list by clicking on the relevant box and ensuring the checkmark disappears. - -**Note: remember to save your selection!** - -## Related topics: -[Manually Adding A Device][3] -[SMSSync][4] - - -[1]: ../images/help/ConnectionsRoutingRules.png -[2]: ../images/help/ConnectionsRoutingRules2.png -[3]: ../settings/5.manually_adding_device.txt -[4]: ../settings/9.smssync.txt - diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt index d92fb04fe..8841b2206 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt @@ -34,7 +34,7 @@ If not downloaded already, please visit the Google Play Store and download Front ![Select type][5] Select the the Frontline product which you would like to link FrontlineSync to, in this case, FrontlineSMS -Enter your Android Identifier and Passcode which were generated in the final step of setting up your new connection in your FrontlineSMS workspace. You will also need to enter the address of your FrontlineSMS computer; see further details on how to get this address. +Enter your Android Identifier and Passcode which were generated in the final step of setting up your new connection in your FrontlineSMS workspace. You will also need to enter the address of your FrontlineSMS computer; [see further details on how to get this address][10]. You can define a port number of your choice in this step, however the application will append port 8130 by default if not set. The protocol expected is http:// and this will also be auto-completed if missing. ![Connect with passcode][6] @@ -69,3 +69,4 @@ If you notice that your FrontlineSync connection is not sending or receiving mes [7]: ../images/help/smssync/2.3.options.jpg [8]: ../images/help/smssync/3.1.green_connection.jpg [9]: ../images/help/smssync/3.2.too_many_sms.jpg +[10]: settings/4d.finding_on_a_lan From f96d06abab2b25e97ab9e3e2980c7af2abca18ea Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:36:08 +0300 Subject: [PATCH 2650/2668] Edits to the Index page --- .../grails-app/views/help/_index.gsp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index e67b25b73..47b7c1ec5 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -71,18 +71,20 @@ * [How do I perform a simple search?][72] * ### Advanced * [How do I perform a much more detailed search?][74] -* ### Status - * [What is the Status Tab?][82] - * [How do I see how many messages I have sent or received?][87] -* ### Settings - * [How do I change the Language?][91] - * [How do I import Messages and Contacts?][92] - * [How do I password-protect my FrontlineSMS installation?][103] +* ### Connections + * [How do I set up FrontlineSync to work with FrontlineSMS?][106] + * [How do I locate my FrontlineSMS workspace so that I can connect it to FrontlineSync?][107] * [How do I use my modem/phone with FrontlineSMS?][94] * [How do I use my Android phone/SMSSync with FrontlineSMS?][95] * [How do I connect FrontlineSMS to a Short Message Service Center (SMSC)?][96] * [How do I edit/delete a Connection?][97] * [How do I get FrontlineSMS to detect my device?][98] +* ### Settings + * [How do I change the Language?][91] + * [How do I import Messages and Contacts?][92] + * [What are Usage Statistics?][82] + * [How do I see how many messages I have sent or received?][87] + * [How do I password-protect my FrontlineSMS installation?][103] * [How do I translate the interface into my language?][99] * [How do I create rules for sending messages through multiple Connections][104] @@ -152,4 +154,6 @@ [103]: settings/8.basic_auth [104]: settings/10.custom_routing_rules [105]: activities/11.custom_activity_builder +[106]: settings/4c.connecting_to_frontlinesync +[107]: settings/4d.finding_on_a_lan From 2b27c4b17c29f38e45313d6ebf1260864f97472c Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 15:40:08 +0300 Subject: [PATCH 2651/2668] TOOLS-1261 Fixed poor for loop when listing message recipients --- .../views/interaction/_single_interaction_details.gsp | 7 +++++-- .../views/missedCall/_single_interaction_details.gsp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/interaction/_single_interaction_details.gsp b/plugins/frontlinesms-core/grails-app/views/interaction/_single_interaction_details.gsp index 6817a666b..c0b186042 100644 --- a/plugins/frontlinesms-core/grails-app/views/interaction/_single_interaction_details.gsp +++ b/plugins/frontlinesms-core/grails-app/views/interaction/_single_interaction_details.gsp @@ -64,8 +64,11 @@ function showRecipientList(list) { - var html = '

        '; - for(r in list) { r=list[r]; html += "
      • " + r.display + " (" + r.status + ")
        • "; } + var html = '
          ', recipient, i; + for(i = 0; i < list.length; i++) { + recipient=list[i]; + html += "
        • " + recipient.display + " (" + recipient.status + ")
          • "; + } html += '
        '; launchSmallPopup(i18n('smallpopup.recipients.title'), html, i18n('action.done'), cancel); } diff --git a/plugins/frontlinesms-core/grails-app/views/missedCall/_single_interaction_details.gsp b/plugins/frontlinesms-core/grails-app/views/missedCall/_single_interaction_details.gsp index 679e3ce2a..ee9f7e54e 100644 --- a/plugins/frontlinesms-core/grails-app/views/missedCall/_single_interaction_details.gsp +++ b/plugins/frontlinesms-core/grails-app/views/missedCall/_single_interaction_details.gsp @@ -52,8 +52,11 @@ function showRecipientList(list) { - var html = '
          '; - for(r in list) { r=list[r]; html += "
        • " + r.display + " (" + r.status + ")
          • "; } + var html = '
            ', recipient, i; + for(i = 0; i < list.length; i++) { + recipient=list[i]; + html += "
          • " + recipient.display + " (" + recipient.status + ")
            • "; + } html += '
          '; launchSmallPopup(i18n('smallpopup.recipients.title'), html, i18n('action.done'), cancel); } From 91e2efeb2a72dfeaf136dcf5cdc600227985acef Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:24:04 +0300 Subject: [PATCH 2652/2668] Images for Connecting to FrontlineSync doc --- .../frontlinesync/1.1.Add-New-Connection.jpg | Bin 0 -> 10876 bytes .../frontlinesync/1.2.Select-Modem-Type.jpg | Bin 0 -> 19730 bytes .../help/frontlinesync/1.3.Connection-Name.jpg | Bin 0 -> 32641 bytes .../frontlinesync/1.4.orange_connection.jpg | Bin 0 -> 13945 bytes .../images/help/frontlinesync/2.1.config.jpg | Bin 0 -> 15358 bytes .../help/frontlinesync/2.2.passcode_and_ip.jpg | Bin 0 -> 26446 bytes .../images/help/frontlinesync/2.3.options.jpg | Bin 0 -> 17786 bytes .../help/frontlinesync/3.1.green_connection.jpg | Bin 0 -> 29866 bytes .../help/frontlinesync/3.2.too_many_sms.jpg | Bin 0 -> 25951 bytes 9 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.1.Add-New-Connection.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.2.Select-Modem-Type.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.3.Connection-Name.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.4.orange_connection.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.1.config.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.2.passcode_and_ip.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.3.options.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.1.green_connection.jpg create mode 100644 plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.2.too_many_sms.jpg diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.1.Add-New-Connection.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.1.Add-New-Connection.jpg new file mode 100644 index 0000000000000000000000000000000000000000..35e86fab65cc745e655b9330f657ffcb3c02f947 GIT binary patch literal 10876 zcmdsc2UJu`m+on3a%wU{1C5e%PAbr(Za{L9BqAUnNk9}O2gyltj*@ebD1t~vG9o#n zOr$XI0m!x*Wfp2Ox^_3i1F54FJqg1-RS< zh-IBkt)BxR01N=YEflm3FvHF4AD9DXEhq$p4v>Swh10Ot?@NG$+>jv4^iUtCTB zegGyI48{OsVqjq6V4`k3Y)njSJbYYSJX~CS2>wrk;1d!-hzRjXNy*4aNue|}G*J3K z3511(MSxF01%XgelM|Cu|Ec)T3YV<_F*cxt4nqeK18Bq`bYjqD8!!QYei3Q_zX^nf z4#vRz3ygXcU~~)!YM5X&5IQ;r2=vPy4V@H3d;?5Eh5@-x4wF)gWZ=6lz{^jJvPZ`P zVSuqPG10FqL8zpB{0y%$Nzi4oufx?HhDaeM-qO1j?=>FWh=$#FtP}wAs`+FMlP$Dr zk^pEwoql%-0PaUV1`(5@Vt~*vekT8!9t03G?DE0YP2TT89EQAKRlua~XD;wQR*Srx z1n|+XQlb;1QlCFsUB^{(YSE}wVxKl z(>3Cns>3oX+n2^OEX2gA*ls|_9AfAA0x>iYt^&*OA|uPl!MKWyi>u+K;R8WuWLp!& z)rbV7q_DB2%>0pN-G4lzZ!zc`$Hw;ADk28aKW2?@Ru2HU(zL;5i)NdS;&cSgu6Y4j zrip{leuO5A%tOL}8(?84aa!*UUb7)D%b~&U6+s7Ho9^+U>|tp@8iI=4@;fqmkDBF> zqMD2s1_LM?(Hp^aKQ}_*dy_}ma3}rffXIz}3F5)-u2UAL#KCX$w^kmm93)62R&Au? zAHS}8{rTP36$^u^{oH{l%VUd#LDkpqq6_x1rKHgrQ4dAxcM4hn1IXwG*Z>9;0>T9V zG%^6d98g0wK7NY<06}NK3pM0F%rW~jemnjh1FgVNzEy)VOm0n|`S2Zg?nJ%x4_a0~MM-U2;_Yownk-x%kz~5tmp^(Q?aU&X`HL^pbvdYAQ|GC!HS!ZQD3 zaPd}X?pT;?bABO6Yal?e3tR3TMEapbLN55tHV!_fY z`!KnotVyy$ovi%?wb?A1CpldEHe#fNx0XU)(%@|fPrY$)c7m_mF4n0zQ)Y8ak2bK< zr(C$VqDtNdFg}NINsp2(DclsFHnU6(XEm_S)HWEhtC_jU=~&v|M2bi%nEF&nZ|+QLP)Jf> z7o0;~;sR?m^4XewOR9olr4{3#ohO7lA<8`W(?;Aqm4@`->5!!wdu8?lWAds`M0fS`mZP69M)FR}d5hPXQQP|T(yCv=3BUT!ijW?K;0gj6uDeJ=+3EQZV znm{)rh!mEZ_-wOL<2)t4mHM>5(ZZ;z^xuGo{|x-a0tGy{X3M@J6HBNiruGMeKh^$A zIFcSx0}9a;6&BP>|2VTX0GD_$j8Wmb0tqroHj42TW6<9;!h~n^gR+*H)+DQM3!f>hL&rK zbVX=$ce=OJdERK{b#LkfPfT*GJYCd{nO-Vg4s|6tPW=`xQvNyG+3w~_-1uB<;ha;C zHv2J4p<7SzbKU0^?`pMXobWG!h%?*G72f@F38`cBWunw)UGy-wjdxN<4SKlx5rgw z_)GqOV&^>j)6F^O+{VKzsA^rBo2fx_X!O)uu*pjLfcvfym$ALZ>rtjm1grKsdC5g< zm`+x-y+dw%_T0%ik>{_@qG3v+xzqpZ+Lg>X%o(>ve+m3VKp+%y9>m7RDp#>xp`f6E zWW!+kM}oa3^NG~Jg(KOeU;p)D!$AI_!|3sL%rMNSWdB#fE63M{1(fV^JwFB9$O2Tr z>mTs@9-H0X4oIR^_KwgskGupT;eFm#)npwno~InOLN){3ZjL%t68F+Dhu|ffBg$1T zSbtRIj_e=h^MeN#=7JwOoFg!W`-h8R`uaDH)O^RCsEFt@5#O(wc*l=aSgq9=6e*{6 z$*9MTGwpAwTPGk!`h-fH48KxgKWmkIP=m%cX>X@C60=Ta9&UIEX!s{uht87)YzYe0 zr>$W`MKlqa4336HgjZ`|mH zR1?o5CcUg@$7+JJ# z(iM z_^O?S9{!k$Zx&DwStEANdOxcsQFY&Zbhb@@23e<^5tzqM9nM+Aiv5V6_x7%)M0YHI zxGmEBS}F-A?S@G4bY=L%K2OaVKCyEpkwX6S)f!w*50hDJb_=Y85>DZuvUR2R#OotBF`BWX)$`uv#$!kZ9qL<`WFc;YT zI_VQ8Tr;iCg=^{Nk%bm5*##SN+xf&JX8flYavLNPc9CCkD-VK(Ll*geBw#1RQ+18( zCS9zQnn=73+?BAZI6U|0y(qKG%`5s;K(VsfCHI{eVQ|Oij*XjgI05M;Al;WO z#^$~`|E3CPj+KBu_+#g}H+*D|yM64G`@-IoJ`ew6Sa@uvSYmR#TE)N<7~F=9eob|R zXzgi4E|ycHs<&{7vZ@Zod=)2WmjThWDM6Q&gh0pE!eG>2%O_9aeH={W`ASol!2N*GnQ$VfDnuK^O{WYA zTc?GSj1#Ya?NzZxJm-+x9v-oJSd{i9e6bU6QTN=fxNp$iWs+YIzw(TCSH%z7BIqAm z?&SD2^ux=S2eJxQ6}unDyi7Q_W!e}PHVIA8T5i~zgudPh-ZwnrzrjbytkXSY`364u zvL7Sv&|lj0U3*^cp$K=RwLH?t@$}0r3S?(N=es=8sijRith4ZJpW^uw9ANO^bfySyaYF^4nOf{h8%_$=n?#__@e)cA~Y$ZZ%Kk zS;Z?OJsGaU@`z$~jPCT-+nK)F4P4y`lp?~WROYH&u1;S@?KAQ2(y-9yJ=&ifza@Di z2{^uslOO)+ID()@sy9aN+zvb`n>p?;O_;0m70{=1mSM2DNs&ySKO_EKR#4-tDVLH* zIg*o8Ji9r|_9%)X%~t1;)lG)cQ8Z9}HbrtY?Kck{Yp^6=n}LlRjCB88zLw4MVW@aI zMF*@zQu*VU(+8zwY;(Ts#U}Z{HM(*A8--tLBr)GVLTLLC^)d`jA3G6Kjo%y#8o5{~ zv+nJ<-@Obz4;k&B)4T-yxB~K$Z?CnijJV>VuS|X>jTgiyC)IzE?w&a_LOWO2FxMs- z$+F)mA11(%LQK`TXs3T?b=?i>B;VEW3J-B-=SB|*Hg1?h3< zv=42DYQTqzZF3P7>8+Aa=@#M$`6y1kwhwvYzAwKs7>GKymrz=Hd;Bk&zNy%ROQ@Bb zDM#dKh*OxILrK3-eMhb6*jMW5C4&^}|Ecb(or+(RK>?bl}lW; zTFkh5^hTePNn&|qKC)_1b zuWW2ObXK3RWamzkoZgk?90gwJX3>h&^m3EB*73+2h|CJxt0bP2&Cgu|LF$!;1?u!j z5Mqn!gm3?8(AmAgNACr~2pzTFSc8z%RkPPytOH$2)UDB;dtn>hb6En91&=%6+1%kz zTT^mhva&0lNGGfKD8TNMqZ2KS43O0_L-R5*o~y zhyF!WRQ^ueX=v^CORX?!Ufmh$*P97$z~g(mc{zm5nJrx9;#=GykDt3bCi2tl4`sh7 zq6jc&-^NSLyLG*N(!$js<-0n-EF zf7{H?R!BvO_Nn)7%r;`Uv9H;)`7RoJ%|*OxN)O}@_LNx^7n-keTm z>u5Efb#=EA{c?0Ixa-kXECl6h%Nq_VDQ(Z%O&LV1GC_y=jTVam1dd6*i)MJw<}%$F z;NwS0=!=Z-L9D_Ke6hfBo%sYKV{zX&+{$Tn8QV_|G=2GY{wrHSUC(mdTP=4(^X(3W zLTE>H{WxVU$=xbd6cL=F7!Qx&cuh83uU14%dRC8wJHAtjkDwiUn(5Xf2x-8zn$-@C zgFK#Qx$#yCM#qigMR8JscuFQ6-=A^yrdWGGnb&L0b`56vG_uXpuWf~Xlz=YZEG@F! zyM^mj5Gu*puB|M)N$tXxXTjz>(me6?!N8itB_;PzsMni-#(qxAh3r~9Q8le z8T;`5>(mKB_*=SUy3#N0ca@`;y{8ppf~497OZ8^S$=(?H^OP%@LNY}OO7^2>yXHHV zwTe`$4Kb2agO61zG`5b|37 z;sbl&xaAWc4z`Bt`VW&f??CHLhqZczo3>;8MHl%>(imw(xF2&fadMCmmAk&6+1%;O zIjN`UBu{k2gr#g6Af#@RRTfqNp9xph9AoUhf`{Tlw>NY^z9OQU+FArP#`1lbbKgwq zr`9h>HFuMY{l?Ci0~Q1&aSD!n+h>iA}aw8UmJaLMyfJYvry1Pk|e)wgbdnlvK zBW0deOAk_|-6VRy!JnSZC{WIGAY$0sgH+}pVP&FLPvc%+x7_%v1Snsk-@e8uU)c5F z8H3LVmJ2D=HYJrcGH4hR6fw1E^)t$q!LM#*9^J`(I-Fav8+!@x_~jkDF-i6=uw5AA zEWRVv-c9218*yW9To9bQ>OW5_${W=+W53}uW>n5*oSgq0NJpuo<%pV=6^zA0Guu-uEEv^t^Agx`e#g zqK5TsNy$gcac8?qZ-Q{qG#}zLiiHts%Xqh8_TkFuCkb<{Z|Cw0E6gZ|K_A*%|jpuXx@csc~HTdkyy8RNc~g)=h4NBbUz zgcp8Ws9sxFugg-X149}Wx?8w)!<#MbAU7Liw^ZCJrzuT`t8+!mEoE2ZU7e^%GGn{( zurDHfA?*ovK`7StUjA?ev84?ACm&p4eKUTv8FM|26~ zU#W?HZQooiCoTj$%PZ-k&%BtF3OsxzyR^Occ{XuWmz~W}|AwxYKq5i&;mA?uB~b8d z&j0ntfg9ELhRjdnhfp1El|+r~-wv}Nwl(MWm%x1a%=%M|VIZ66^)Q zqLif^kuGsaGatM>5-Gq38$g3ILg0*1a7G^_I8p&jg3Sn#0!Jw@UR_d*yV_C^DHsG9 zh=vV#!C@p)jFC8CFR7~w?U#)LqYnr`d65XP^mf65a9{`qa6(8F8uG0dl92@GXPm20 z;3yEI5B%yULlNW`!$C0^2>|o?BNWLW!tW0JrRjz8P=G}dUIHiKJbz~th2%Fuyhi1V zlw$ld^k0opkLIu7zeN6AvO=(~W57QZ==-nx?aE#P5LN5|n$1X+my2niALn_lrZ1^o z0vLOOot9QaZ51`!zKbrc^ouNhcdnhXrI)7>-(sg<$-K~asg~?i#XU+R-y`~F47mjO z_K3dILq_NWt;*U2br-3N_Jnk;iW`-gCat&!2j_xv8kLnNsc-HPxF03CRQT6V6{P6XwtHDMEhxil*5FlM(Ey(QEtu_0p3v(W%XziN)+U= zDsWX+nzXz(B7J}Y$C|P;JxT8zgx8-Tv^>tHb-$%$5d=wgh zSV-GW;z5TxS@pRDAf!y@)4sbM zXAR$jj++R3^>a)%G(F`H>Pl~`BPVlHZ2g&|!|xWYST5$S72^&IO%N1&&;)MPg3rNw$8o|? zqa}A6$3L^ndtGWC{I>8_5K_*S3@?Ge-mlcyUk{f!(a0-ikn#S@Ko0ZpDQXRx z(49M7&WTPAQi-On$$9v>UkB|#GD6eB22X;m+EyfbO8^?a)T)2VJj%BUZEs`;=exw{ zjKSTxV!lF~mMpkLwP@Fa8z8t|LsrgganH=yULr%k1P>)YCS8(3|uAN|h>`*9Wn& zMkG7?4_S37uspCZI89C4Gf%#AX*uUQ*h z?2k~!{rWngT#6FMlKRN=N zv@BkC&23*sckGQX)(HT`QziQ2l{rFZ+04)|0f!kz+3Wmc`JY9<>@%1^1N%8P!>ofb zD`#-Y8o27-IlWiRrZy7CrG%M=nrS?kiOk@5DvAJ-Y=}&1U~io8r9tM{&Y}1unUD6G z(7V&FBVh=y5xXq@r8S38(-ZXOtq7S>c5taja1B#VMMV!*j$A>bWX+jk$C>P5+uKqy zT97c-bwdX1=OlSr{%MHPp(hZEdS>n1;(P z9AD-g1wjtN52hz~ygs)a*ACHA_MzcXT;?;LH&tfx@(BlF z?chQ(Zn8(&UfF)`@sqCFYzAW7HoQP^@fWAWt=r$)ms?HWss_8Xs1^ANPJFD~8bjhG zOoQ;YF-^-ez_4+r1MiDv!cP&pj7vRCke4dg$jgC(RQpsu7Sh$UDqoOXPFW1l|J zgIby(tOehX9lBBf=B0q!?w$j3ScrR#8EsE$!bS*Mbc+{zk0fH%HK04F6Vh$h-Oin- zhYm0u7zI8sZxIxIGA_&-EI}8E>61~47s*FuRmCb{9CrI#$C|&$sunNCH?epaT||E* zJJTas5@t?zns$HoU0>~Cyva98xLdXUqU2aF+2C?|JF)lFZX!N~P<7b-pp>jUyO7jO=0@hG^&gaf&}tpuXOGopj^7e& zw#qqG=9#qe7*RS%GOivz&;4Hp-jO9{AS5%o1XiAIP1V}XG(Hg$^y+S?YqUlUcl5ct z3WGD8?ARN3GyiBjY^2WHCO5XaWMjbb(YnqZFFsr9*Npf+<*%04-o;Ed9+*q(;f{>? zD%q?p8B9?$7tZv^On_&DaBCvfTO6iiJZ(?(StQ}}3{)=82~vE1_b6&`5`e&u*8bZ5 z_?9pBzJpSh-rGy_wCvxL5>d}Ult-+YdU#{F$%sQ?DZU}RTs>|4+2l=wa%Jpc2mOY| zB=ybjt#~b;lUqh%)~ahenWWG#F77=sj3hQ_kQB%O``Kt_f37#;UZ zzK>T*`uz9+en!5RU0r*y+B4X|^H6A@VNSSe29Ps#@0>^q|1jBlUY@#L+Ymbotz>1n zj{|%6>)Mv$JV!11+)>@H_2u8zpi4mQO8M)+7Y+3x0Qq_T%oWpX{{M9tZNv3>%n-Hy zk4Jq0JnW6@HLsj-oOrBf)BI^a(*K;u=}2myJCIq;Dt98!g5w!*T33H^k?Bvb zc~U2IvQ0R-SRRNq^;VEj_U?tR%NMSV9C+U)u+1oR=jL@x+2Wx; z8Sm^s@xO2XhW}exF{(Es#r;*{BL(8Gm`hR>#w;|PS@crnovGrljiw@gm~%+GXBg)= zt$SjBb}=1mBGL{Dj>v($*Jz@+1dOgPp=SlT^}HU?rOzFnuc^K*+Kj}+msXoPI)O~b zmfLYJ*uF`iD}FkVK$H1^edgSo#@D=g+4QaF9{ok%;?3DwlQox6(tuZc9q0(v&NX+* z{=u!2l%6TW?33Y}8?SY#wr-7k#M$DDe|uLi Xn&S74y=%7W;N~%ua5p~Zxt#bvTZv*g literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.2.Select-Modem-Type.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/1.2.Select-Modem-Type.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6591bf7d3b761b82577de7cdfde4d8d9a9e5f613 GIT binary patch literal 19730 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�=Ro1`(`c#72mV!SU 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 AX8-^I literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.1.config.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.1.config.jpg new file mode 100644 index 0000000000000000000000000000000000000000..03ebd12f5c60a229974d453eebf0f1bfc48479be GIT binary patch literal 15358 zcmch81z1#V*Y2KS=x`_{bqMM1lmQfJ=?0PRPDLG38l+pgySp1fN|0^@MMM+?L_K@( z{oe2U{!{MnphLN=8OXN<&ReO>^t-0l~(` zCL|!FfWs-M$cf3R{@(b{E`Ij{#5hnGgaZRY3_yt?7{rj@{lEtR0s$}};Pm%^V8Ae; zSlIuaAAn-OAedNi00M(RK?o-1pCAmdNib3pOgJ&wbp%q4kDrI!w3?1rz$KfWK@bbf z1zymv`8_4J$Pfh|r{>t^2$ZDjT3xt@L6aqlO+%QlpSOl6IAg1G$hO0kvMZBE)!h=*h z^3U0*>8Un#LH%9?2rxiAF$OV+JF6o;IN_w0Y>FpP`@@M*=|7zSG_4+Y)~@OKWt!-0^I2dDD;K_0eN^vA5y`awM)(01X~-3fQu!XAmrn}-chlHzsn-)>C0$TRn1ch!~|QMvtc3-Ro~ck+2( zi8-ge7r7uE*$xu>7e4?c`x^uRtpBnGm-)OITYfXbgl;J+GkU`oST)}DdLQv-jraNOrYL$%KtkV%y_a}* zCz1>Wo`6(?J+V}~JxD>qS^!e+0J;DTDs1?mFBXR1f{5J4-d=_#LL##+#7p%EK<@$? z7`WF=k2Dw7zxnb|W76#%t62g765PN8r@!Qb=Q{w61t4fQdceVFJ^)3b*XV(|DlQwn zL=W&%fM-v&j$YzjT^GQU|2SbrPFGrFzCnR)E<1yfjAum=)a~90(xx zBHNY<1x0}(vO$$FPzq7a9-yX%hlg%DC<`3mtF*K3l1L2;lqFd7O%3eZYez!E?e=)CCC!5o;FSDi-6z=L22kPXa12KE*LAV3UQKMGwv zS~0rYS9C}jkPggo)yw}4owOpF4vP90Iq9j;4Bo!4p@r!KHAPr*3`;zg!m)L*jQ+4*kwcX(Uzn!gs!8 z2ytUM4AHhM-*#2?F0E&G;*By$O3?{=>=|M5N%4)$ku;uno)Q1@H)>)3NJRff$Nw zYfoNWKF;i)V=?$pst3@u9XcHotslz0`weXS_R8vw$+`&IYH=^KYjx+*vI8jkrd4Y0@n5k;u11-{lK`D4c!p+0xpEGLGLFh!Tu6om8yvVf?_vDoB zSDV40c-wka^?M1 zah^mLx<%+Ffi3cZs;ZJu`fyYrt$m}m`?-B7u>=EauS~k!>iVa*mvO$Mm>C6?vyqrh z$S(=!SlS+gzkvjbyMk~iKE)hwAz&^Nq@I9{!-Qj?7gCKG`Z$nRPsYj>cOif&T7)iC z#zA(L7sv4@8%Ji6LV3JCQ>}_c+K6DBJ>%T}sj2eAMe4e>huCpi;{BcX=AYJ|5l4*l zN)m6Fa&JH!6I@zFm7jzb<}~9jR7EH_j}kXnJ&HG`j#~*M_)Yf$aK2yMpI&HlMI>{Z8}_vQS~tHSO-eTAO>@-cd_0tgQlY16?S45%ncB^W=QbU_sZI@(`4m>|CN`#PrrI!U0tHV zUm7r>Ul(#y&o5v*Bke@~2jAulbP|4rEI*uFiuiS(`3eR8p@0e9!ZJ!9cfWA;yztd) zk|KTV!7zT|Ia4wee*u5Gn3V6lHW_&6Q^B(O`R?0`XZODUp@(8gL5=4g<6ry3gEmu- zZu|zWOb7%teZxk-E))2Ywo)uYU}|1HeEGhXGvD+@(tobJ6w-G{eAZ*-rhFah z5Uc#Ed8(oNQ@XUwn$Ruxu;{(m*%XR5!_w^@oZ^EVtOhs!lsxnNxD;linxH=dZwnp=kbQ<`! zr=O}_${ER0!`z1Q!=m5qE=dvAn&R8l@U8C8*yQsp_cl*aE?P~wkStm~N=c+scT=W3 ztTRB^Wz+cC#&a$#QHkNF6tbq8+}}7K!j$_Bn8YPoQ_NFyNhf)=W(xbwWE8LrHZSlI z)Zu;bNDGVglH;Ogh^*)%C_*j~Fwhw_314%WP<>42z@FsXyUZVdz#B{=J;@WGm) z?%;*;BR3^sTqD)}g9R!vi4=xKYkMkHKEdH-QYURqzSgll!bQ`25sjv&vtAS|D@+!r zYF^Tj?63LF{h%vTo@1h)NW}U~U0lp5iIjCBKHO#~UZB*1at#M#pAqAIoTqtRbY2$3 z{fmeB2g4n5qa+Ju!{H{lE3U7X{jGvweeD(ppD`t0#q zp*xKxcb`L!M|!2l7*`kz;@7*Om;84ujRKi*6F9~CPa>UzI%W8QY%NDjhU68!i!JBhoD`7QX zD`|BUqu%V|@_8ID6t zBuzP^;lm&%yy~yj`%;TZ!>d}btR9NK4F~)5Y1_alNlST=zLMcii>$m2+}GO-@aO%{ zI_ST9Y6+NGFxJvAEqmBVAIwPE>$MX>scL>o`kW6=kD{q0dEE=mKn3m#k{)Z zJc(AdnKdbS@&e;;WXK9`D(vzXIS^RRimO|foXI*9zPVGsKL;Boos?BUHH}w@n+F;D zgoH^x$z~nS35z8q&9LZ>CQ>$ebZx9Gnu`aYXzeht&(l|DM#^(LLzbbXsg#$Sb%5ga z*_j(w1FV(n;~w!CldkJ4$nE%GP77;^xLL|i(Mk+SLs7h~7v78g->USYwO21QYPURf zSggv&rC3NwiHF5D9DMRWT-R*eHy|it**+$}Ez84*JGwLdax9CcmdI(Vuy!l+d5DN_ z<~(AT$WV^;%`?+4LgdlP&X9ilR3@Cu#(m;i?~+%d#VeglQQ$;6_ml8ZxZ##D|Yu#A`t`Qd{|v%y!tflS9cr)ge8oIOfL#|tE; zN``lfzC<#8?;_$Wx`o%x%41;gk;wh_*oBLL#&5u9KmQ|56ZNh5XqFe-mYfu}rM`ccf|zFXlN-(&<*Y`W&cMT$9-J)Zd&x6~J>(DyDvOiuRV@xcM{ zQr%A3jZ&$b7G5Kn*5Pj%g?BKEr*m;0sskRs0Y2wz3lvV8)?$4^&yNzE5ZD{H&*YHs zyy!=S5uqP2qQ1u0Sv(hzka{huFjQEmSera3T2exTj0`b=!=me>eTh}htC?{|8&_O1 z#mw=K&n6^%YWQ~263Q!#Ek%_skbAPMImBVI#)D?Xa=CW6Qm4IpDuV`3pDo+H9i8KL z2)pQ*AFUNdZFJV}Cv@KVVf`C$4JuR+bD)+goH%=`EyudV^7=B%%de}5>$>Ipnv<*= zE?rj7XAjve);N)zPN}r!@t$5;ew+j8qy2qLKYI*&7W;Mc)vUHh7!H(D0joHY#)5m6#0!(JTHj0Le+=< zb$nZ2tMM**I^9VB>(R<+>zU@WDCo(3rsy5smM8ghZ@lGu!cYC!C-}DPBR_34ChN4y z9uF~avx&w=&Qk_Ecn7!Ea_0-t_)>q{O6@Q0iCLxo=;7{DU9<6`Z`Zu_)_6w=l;32e zFQtZ*ZpkLnd&T(dspn zp!31w)2C>b!S)A3ba&4BKNk;pZOl>!H3UNd+-;H~3mz7n=XVl6p>oLBK9q67g!Wdy zdY%q6PtqT#vv8WW1f>>~P}48l5PPvCU$T>g517^HmFuvR|1TF$dp=DI;jBoh-kds! z4fFV+6cf`HlcG^{Q{g6A=f-}U1H>NYrp=dX(C^{6w}9v1sjG4JZcN|qv6(|flv{26=)9ABLZ%DyiV^Ggx3YlyjQx zOi%aaIm-5N0$QV8b8xBEkg_d#dPq<}`q$tlE zmvMBBbJtR{it)jkHlMx2Ifoe8Xp)7rMp&)k0F4<~-OnEzoXHw(zQ3!2l^*ik$kMPw zxh(liG4**NzJFwi*;m#sq51J8{7}net`{DVF1mXe`$s_zsv;3StE4b-<9ZF!;8@k( zXgyVT{;VL6AwoV}A@aUBdnuNL!48+QYNeH%Q-@1a-!?v7AHeog^Zvg*{RXtBS;@lh z(Z7_>*Z5y84zF3{7P6V9&g}OsO3r;(s)?)2?=2ZT`}`JP$z;>dbR^`HXFlylfoFg$ z6jS-3OVgJJ^2(OM3lf=b{y|N@ALNR)2&l-G&DplYQzOSc}VZ7w5}cRyU&U#952(cG=Brb*LA*smZSb6;?bYuwkbZ7RC<3Y z-+b$FW5kcA8=r2D<&BXfWEbDMRdmhn#~RD|{n0z>$1w?hc{{g2V{GC0)UTuK%5Aci z+%C1v_UBJD42Tq+C6Y{(6Z;^m2eqDooNYS4zR~$ad3cl4r{D8jPB`k?rMcw0_WNGn z74N^okoEzB6QFL;vY+W|1l6@e^`8iw5>qw3*ic6NG zFFa2L&sfq2pUbt2GPp_Ho^N5z+N!4cc&X8yM5r+$;p@+u`JL+%F=pLwxwJY999&vu z?`K1Aeiemyy40P_oZQ+3KjJ!WBPsF0(bwBOrzpfXNkrU#q{p2_4q+{hspBkQ6EtaG z^`m-e&^Pxaj#|#mFhTJ)N!Z<7b(a6Qpm3-W{&(N^L$@Y<-%nyO+y@^dx@x~G=zspk z-Q^zs%78{G+`?X|EUirK9oOJ^9Y?5aowmnRevQp^a0a9y=}|gU;)J5cihZPVl%_KA zJwo`>rT=7KCgb~sR)I+E2rW-q!p%}~`NaogoJ^U`T}%zN6b$yXwo^q0GA*8@SQ}!P zR#FK>L&fSz!x>|*Qh?H3*(Dv=?R__|gln|i(4oSHlIYs{8U~)}5A#_s*}Yae-o3?I z^hC9gm&j9VF)sItawa>bbFNDn!`WZ2_I{d&a7{!9}`r<814 zusk^;l-Lg9*noeJ7mG^LFPs1;S@s6734*Nm<4b7z2tSMBIZ2HMWiC5=?14oW{51QWqG0y>F zi7d9l3d>olq=+Wt9%LUCzqMS%oSZkA0Nwf>c-qmg z3*@LKMN71?hr(&dIM&1m9?7gdG9x!8@Un!+PnTyY8?(HBYx3w(_cpD|+eJ*aw}Uzt zRQGqSr|D_P?Nkub5HI%htXD!GHz8_cRg<*OB0u&F@Hk%T|v|>R@E2 z%U#B|*yEMSntr2N)$f(g@<2j#Mq^YOKb5d;&OV_m$1sObo5INU0nB85nmIW;?gN!d z3ERiz3g4OQES5ltw>Q&nJUn1YoPk)T;fCT+_a|loo-+!rA*Ua>kipTZ z+U9GYU=_zTg6zk9VsJJ6A2zWN-4Rzh zd=^`mTxUS0&lRhn9JirAls~(X5N@}c^HR5mkFYY*IU-?VY^UQ#>Fo5z?SNI4L0K3= zTKZkkC%fRiNTXD8IFvp@>Ep3#yC=O$GQ)Q{ncRGaT6C(n$C73>6BywkCDRGiF=mC!( zHPRNMLg{!b52y!!X#pXjHoV#_Y5m;;?#es%#m+UFc?-1CZ<%x&W^cT!iu1hSubRpP zPsDH5`mfkN?>%vBT>ASVevLn{{O$Rd$s3DSSzj^jO_cB2_S%2#%69Qg>$(Fd&MPEq z)D}^vab{f~hJ=w)3Z%LkO8bWKu~Y8aaoeb9hvZLcIEV%{Ig!fZaoFeu*U4prO&+LiR4nJ6yXct^?+{h)@7J#|gEW@;K|hD7f?-uMBPfUA zsEZWP=&@XpMDTpyl36jJ9#DlY1-;WS{Y+j)QIVE*JYYg=ZUOX%MW!h?R}{XAVQ};e z#S;w09AGNbp&VbxR}q3++d4&Y@&&I19sTm}nX|h*^N8h<>5eZ}5^V8wV3A<*v4p-Y z?m{{eLTgRdwCy*}U zZ}pj;?L+mqJ#_}L_c)tO4dlP%I>A78%){1vk*Y;>= zt*YMi;y3C)$oh#9SUw=D>otFA-QL0c=h4~0+Vy8Cl$uB4U4Q zs%YGwo`I9uYIWvB>&y-)v&9EewQfr#Op#b{oES5@y3XimTg+e^-=>s!JFCr-r|q3u zi|n136)>90cWfqWt7uEBqi{CLeJ$f&wGS*Za^>mRZ7Jl`2DCenlSKIU*l;Iy{02yQ zJz4YgRsxFWDr4?OiF^S9!w*9Y8ibMp4tbj9;L1sb#AT^@R9nyd12c;}Dhkyg-SOA; z6MX6IojeBH+aLZpzsP1gG*ad;j=G)$M(ecc=1(b^l~@z zv%qKHq9^0xtG26ORllcsx6gpiHv)&}McyOm*FPX8Z;8}@+5gPs-F{{NgJ*lr?VzCz$iz+tyouh5hp`EO^{=i#P>F^aCOppnynTxLPYP%gASwD8SHn zwSWWC4c@5%Jn{Prd4<2h48%ehNg#jl5P50FSOp*s_sW#U{a0k%702Hb$)9w8&9Hw% zN;AgE|I-r--gJTUhaWw|6&Pdx@S|g4|1t0{LNqcK$w(p(z(GCoFcdB$3G%8C1q2iV z3%~^f5dqTRE+YvTB8>oWVSoZy<5i#nK!S@v;rwNS0MsAd=)ABvdC*`)mxB&uj0FHR z19*cEm{Ec84+FRhI{&QyF#`Y?4)P;G5(E?p0|B7ISR7cK0uYPK2$hD#;xGnCGeSYx zNLTUFP_P?dy00 zLKsmvj35{V0N_>t4tNv*kTy;p7Kf&V!Q~m@xCp2`hy(&a02q!7b^`{LMi&C+0^ehx zW)#>ZTmU7H03c}cSZPL-{8e5Ej0A#!%Ojvj1PbgD7$^@ipi{>Ij37TKDL@{iMUY5? zsS!|I1PK7@0o!}!mxskdz|Js&+E5Tg90cq$IuH(m!CYXMaL~;Gn;(Y*HXi^}1M&zs zgb_S7;*f{{06+s202F{eh~NwYKtBKia1r2H6M#O@00=-IR(S;aaR0|Z5P$#=5LiA~ z0+?8(UgkQ(|1p<|xsRLpa z#oJgb{v;0vsl;#JM17`ex2;z?#A+}Cl*&bHQPC|%GdAU(mg)DRAtp&g_U%q^<3$?} z!IVK|z}9VaY<^T^qttxC0mg3WbhD8|`{1S!e+}$h1nT2caO6H9E2r}YF0-!&>{%x3 zxoEMagseBW(+4!j^DIldHW)lpx}?b?OJhF{Y6>HctL7xkedjR5ie)?ZJ!}U#S5_~1 zYHwP4`S$dc`OYn$ZI{oQ)%!~JBPtnr92g$r<&Pe@f8q9+UWN-ZDGu1X6yRW_Hge|P zs&7uj%b&65@)c``Waj1?2#RRm@2D|5pArA{d}QtGFV)|`t7Gp=@JieD{xb77AhrGZ z{5Qb-{LT4)9Wdy@LCC!OUm#r(%@##!bKl#yIDP%Z3K)g97;q~+3;wQZ>yM9bVYAAl ze3Za`1F1TZielB;tDt(syo!k$%$AQtg^zN6<#3yX`Up=y+XnO<<;WZFFg>}f|ctp zv)Gn8k4=V;#7o#$k239>)Voe6z-MHODa`ZIv<_;~uOUXlTgp02N1H;0bJk;r75>tr zcLmq9l{!!6t!O{i49lC<4WK^c3(v`^w!5yZ`j_e^cy%|a5y?j1k9z@X>a(_e4~C!4 zqz8?w5e9Nx;>g<(Ginbz-n%#IU)F1phZX7IM*oS17q9hR<8b|b?ac!1)-?68($nxc zjID=?^Q93_HQBU_XmjYE%GVc2+!TWobPVPOAb%PJHQCLj&Jo8DOnQ3X+fKj>(E09x zN5~~vp%$@fv&0VGbW@=rHwP@bU*2o3P><)}P9(>*fw|g~uoGM4CQX*+L{fi?IBb%m z6^;>MSKc_`37QehNo~onB`$s<2dReS+&AJ(3+@9>6dirfueG|XFsnzeGwZ4NF*led zc**;d3sq`AbG2j3Y3<6R74z7iDN@b+pS?^Pw&(w6#_Z>Bj;fb39C|#WO-I$oX%;q3 z+WQ!!Lmeq3kp0ZqQ9m3iGEV7K? zgblo$KyCio91`_V>M7zMqvrJaCcYe52?UF6D_6BI~)n&S!r|w63Ox>p&MGQ`zPeVx~aJ@XQ3ozzh$~zCBLSX_2dl z@p?EtW#?u}02FU3`3lI+7nC_;aIn5-v)T4Ce4pALGm07!rvdcOyx1iam#EGrn?lDw}yZ>D#(Vc zH`wdMOJW~8Os6anP6MTNEA|9qw6*P(`~4#86~nK!JWIyQ1mz-3oSGu+H*elTu5e?h z-8GLS|485+=x75CDNvwspZXZFcnccV?WE_lYOsk3LAB|y$5(2dV;H1iv5RK+nvbHs zx#-1c(WHzzK2R%9*lWEjaA((pl|0*_WQx|ZSaQ=f*0|GKAeen8iovzcmfv5{#?+zi zSyB!?rT8nVB?tK&2SErn(+SNnBcj}{Z70OtrCvTvk;UFFf3^WfsM{sb4m)Vb zWyq2Ihl~kM@X8NsDS%%X`@bN6yva{arh89XIvX!7`FeD5iF!HrDEWb0U2k*pG23_3 z$}A)MZZW@3&gjRa9BgVRaEy?9$D zs_ASJ`Sy@_qVC@A&CABU+e=u(_gl^LJupe=xrc*%U?x=c1^xwWaM5o#OYg?;FPF7Q zk8WIlEMs{{7HjMYO$hDQPm@oHJz+E3*(EGq_f`NW~ztWaa2erqfy{eqS1L@vumI# z_~9+huD+_Mhc`6al|K^-mCT*rjITJBWY*k%tlBjEEz|kszStVWv}fo2{EvPy3jf$P z{14lA?tTDwXTjhSFxYVWKO6h%zoVw-Eau+cC|P}0b?HJsTNV58n52VKJy9@^I2hlq zs?K#mFZ&>iE%Atb>uGv2q3YL@=Uc&XnK<+E&qH1L&GuJ>y6|>u%RM-zuPaBTJOTO? zbc_WOM*2(2i1;WE+V5NXLotFo4LF!wU6kBga#-oKFtVG!d8CBqcw|cZ_=iR3(9lGw zYKgWI_tNN*F;`R3}6 zwDS>UWJ+V*rW@C_*L_^ow;HJQbXD7LN?GmnX}14-cowv4rK%edlpt_7>r&}8`NS7? z@Yc8Y-cc@tc-VPH9E>?d+F=C(Ojb>9B?gV(eVGO|A4f$NG)|Rab8FHSo&>dy)`}eQ z2RmnMiQbOu_pxjA6v+h+pG-2T+6h-67a!g0A1`NFzfm!{SDGrbJ@oTYkXnJjs>-OX zFvj~5Vso2d-9-22$Z8?+8#`DoP2rMkWMzR?MnZ@8c6y##LXD`8R^Q|0MVf66{DGXPr+^o*#K$RY60-k5|~7HT(F1og^YU0>MO)4t=rG;`-xP^$~WYcwo&thHhJ$Q<}hF-BH7-N=(7#U(+YufK>_6 z%`bJMVpPR8C5Qd&;5TP2aA@|RGtFtF%ac<4j&R{OOoGs&`@{GTQzOz9^%@i3*huSE z5(9`<%)vrBvsjp*SN9b52{rB-mz*A*K@dsmV=`->$!|?2T28rU^BC;0Ojsn1(ig%R z0`u1G9{omvV)gIroL2Q;j4C(e!H6G)_AVFTa16g^*!&^PMV0yf!*5{dTASO}_n&@@ z4`jbswi;>3Ae&Dw$?QGh%CWWD6^h>++EU5udStFFM1t`hYZjeWG}rc&lFrXrls zpg-J42^+e0Kacn}Pg<*NAJ24gX+{j6nFK3`ocd*Wn#yZus--8TQ|``}H?4yB)XTI9 z`I!oWxJ;bH3PgJ2Q9TfukF6_WIjEk%U%SzIF)t2`3cp^RO6x2-xQX_XE&IeG-Co?I z;t36r_7%F_B_`mt@p<1LtH!K= zE^p9W{U4YQy7nfLLBPZ3`THQC2u*>;qs@N{_r0P(yZ%P_{+;CFLEZkuknP}%Z^j^#bomH>AL&5_cfdr)C{|)4m{qzaY`Y+d_ZGwrRd$ zJ^QvpP*B?g>|Rhkc28Ru^p9uVhrJt2dt`p=`XQJV zN4D4J8VaqHVyLHm1s!ygVesrqJH?rBdNmpXb{1ou_lP$J>ki@W0h)JRHmv)L1O>Y2 zBWK}9VD|1Hx}&UXVIa?!Ri|DM;EyA_A#sZoWZFXWcE5naU-bIiVL~^>w+&sJ2z=8; z;sMs3>%5VE)Z_2a)poxi^*^FOS9=TVs~1|aPc(K9Sf~$}=g;Q}Q1CND_@-jQdHy=Y z(T_=sbjQKhQua+x#p<)bUtLJ0v$;}l)qT6pFmkb>n_c%9%W-~EHR%5O$Iag8j~wA! z0m7LiVwZ0;2rm&e_B{F>3{|6AUlkLM_?7lB9#Vy$+!^`#%Hr1;``YBUHmPk#vRqxf?)AZhJ?Iqt@YxneY4?VvZf3E|$N^**F00aR5EWsD>`w+mB@v?C6 z0U!Vr001$Nbqp{`TDq890hV1L2Z9I?K@pMBu>b&n763Rz06-xa0Bn?huK>XSG876$ zf+8a!A)_IKe;BC9$fy{Y=;#>e=$N>ee;O_(HV!ThHYNc9At3<)B?Scq<%7Q)1O){J z3lobJ7nhWr2#<*T?}`6(@Vf`VLq&i>*byOk00JHa5fAda57-4D5C9PZ?*48N1Vktj zGRj~4zq#N5xbCF#`P@DP}}1?2HUYd56w>F>4Gx;4z*2~AI? z0u!VekX%perZp`*_&o7Jg#Q8&0JwqN8UhG_fB+gtLIOj$hXMicXt^cT&2UfL-p~Ye zPn~k9<<)M$OyhHZF9Vo}pg0~P9w>Grt#&Vd-_WJ$VtL~DpXLI{n^&K{A5!8DmL&f* z_1E4>#H!-(=wi*!>9LKG`yTBlcXB1o=mQ?)dU~IT%CL+-QWUD`2R{y8NuKfhyqX+N zf1_I9Gl0W&ATrJr)N!tQu3mcbM-0)fa+o7KCr2AVoCc- zXJ9H=Yf8>qI*FaTHT2Cp@&zIKG=#kX3i&9R5)1pb1(LpsM2AZ^d`12usbFd9p3PKa zFV34b`EnghK7nLJM8nXmwYjOLTj`>M09i)NAWKbgq8X-gOej-*0{~I*pth^r6h|be zT&LZmv_|etIuORL=XL9HV(Igy+@4Olh5>*E2tN0(0A?M*9t;No{ud3cdSu#XboJio)a;};{MvhY{q)MNAD1@~`n~pUgBle|b z-cBSYv_QY(8loVLKt@KIj$6#Y5|JJ+jGd5GqKL(G0zic(x~w4zwqh3aw*2wO!l?EF znG+uB2RS}9ee;&)(q`C+X`#rn0*H%XO30PRP(3LJDNRoMF9CqMVc0bsbnWWn2RX6NflZz z*)jc`EJtzCRv#HSZ!6SHsKGl zZXN+Dc}PI|ZYBiOLw8FWn#WX~Nh?O~<<*~d;Gv!L8L*b+%Vt7mdT0uT(l85QOHpp0 zt2cb*5x0n5b`e%qDVEpY$;4uktDoc}%|@Q7!G*&^pu)n~9=D81FBZ-iZ@DI2@IN%^y5FFU< z*8mtl7(PN^5@8XGq$G?Pzy-5}3&sVO4%7r?!Nmry3z!scFbxeeXio!_MSz1x$bDwO z(h%kr-RBteO9KV#Nqe6z@Vo*pMgW3@@bK%GrJfDf79&m)jF5jH{A@958&S+&`sCsD zk15o*@zP6=gQ|n_Rx4($JEQ_?#E#znfUDknE9Vz4b7?w{~`C{o5rNu5{Xw=%Tlxg3!ZMnuKPc2|} z42L?~1984Jg@dJ}35yTDqJ0^Z3}tgX^AD^zeJ@>$AJj>5BhLuMb7pH)a#i zu!%RtUr@^(%-4Q>yZzSO{-UJFUZDJYG7ToR>DPUqp!Xl>f8Lesppm3~d^&chovisA zureGyT(JM<)zLe;e`)X4G1Cd5OpV)09(l@Ic(L~aQ3~@nkT;=XMph(B)pjR0l>O1F zK)(uYr3v#T-Qp9;;C9I|9XgnI`qmm^_YqQ#?m%AzEermnJX766hAJsWvRv8KchQcK zPcbC3ifr)`*Q&=1-7K#my~`K`4aEM7wI01s3@|=^;<`dc9B?bi?38NrjlEP+-(kvK zl*_U(ZS*jfU!40o7bZ{kWOT)7SF8j*fno+C#b(AkUjEps@@twbbBn!bT*+gHx#{iV zK8Dg?GbLo$p2c4d$mM>ur!r~~;}~X)>wXsIM@{5a{FXqUoqhz3nkNdx)NC>vt$9v! zG=ccC(DG_*w9#y9m6M6RfMtbGtLnkyv5d;94BmE@?JH}h8%JoP++U zMtd1t(@v{;FO-Z!x`#i2@FZ$DLe(eeV=ooz-{P&x@Th8@@L)5rTk&m;8u zqXiZx2vYI52lZschCPpk<%TnOI9ifq1wMM@5Dt?LAO(M^@pB*EK{l#ODj-VoSrqe* z6A$XMj-WXY;?#Fv?U_+I51bIY3jUU*6)u#w7`?WG{FM2eMUIX6JWJTFdw$6L6@&MS z`3U~N!+w$}7+xJq?gWTwl`R-{-P)aP8<$p%eBDX9U_$C@NsYP-~9< zke8`OvAEGe#C>FnGr8Chg|h6!=~24;BBzV}CvN`00(^~fQK&~+NlebvDN=S5qw|ay zWla``fg6I%;(TQXt=+O08lCR7|0iK$6Bh~l^Z=qOR}B~!dxrtVi+{-a0gSxlep7pOXTtgVeW$y`5mN79FK47RN!v9If1cr_5Z9pXGevMWhsa)XXEk{vdvHv$>=smeHD7m9Fl) z+EOR(GGX#UCT_paSRcpSM^lXIwmQ%czlyx{O*Vxfcd^c;rfE^kJ%o>NFh`BTg%RLE zT!9E~-))hf0^VDVb@QW!9LkM6v;Wm;{zd(7J3|h~zZAgEmRDjAt-izDLB+W0oONDs zuw_;J*R$t?sDWcjg6+Z))n`994r0n`4Z1&6y-kxs_x@ahA!Dxlo;RUCp`ijdfzodP zJIJv*==BZ7nCVIOs$Oxo)G&taRUFxqF?wP=(x4k-^@II5u7z;$(rB*?BW;p^52cS@ z!7(T8``gq|^AE!)(0_w%6gH>1J5TOy&@i0A$ zr2SaUWChWB*U!kmfjbTl^dk~s^4@v74o9iAVrY&G4#(R=Y4vXYQEVZ@OtMOnJc?rJ z1|MZc_QR|~Dmbxf#**);aG~mWI<~-}YHwD3iQQ*~L%cBuVo`6byQC<(*&B^7)I*d{ zt?LD(W(VFCdpkrFuj7Vs4Y@UHf1%*t6q%&Xb{!1;5~_mAGr&fAHWh7%%3~{=!mTHr zWnLRAH25&ucm$b2PAK*PHY8DdVCWz!S`TX9hZF&;)Qz#uq7N8F4oFKjV@A0Ujxko=H-p0|sUap@^U5~VjUJeu(xvA)|7Yk&NE@Mj8($h+5 z#OU>Z(ZFo`GE;DLARiEscZR*%)L7+UF#jLy8YVaHm^5vxP7ODk`&}YG6TN5i)491P z+wqLUtNV1#*=mUvBM)W0>HdZBx6nUzc5lN@gno*L-SppSW`XB!#slSrL&`a)&y3#L z^|4!`Us>Ms`RDZBd7tezn8AYIbhI(Zo-Mvn3jYd2Fuytd@e+I5D}tCo?~S=^05Mb# z&-716WU3vYgQWNG-9JVCD1dq@7r%kZ4}U(Hq2{JoK*Pcx^WZHLB!rU}@~H>aZCNi~Bj9}J zOHuf20`_8>vJ`h6IH~#{9_&w>lmw>kt-JeESZZyN7}7P#Iz}!L)v;OX3{}1PpO7&h zZ&f7ziVFc*0^y6wUm)(sJwd$x))HO*%t9dG>~sAeBUWb?lyZdln6z%6FR%}|Rq+NX z-IU%fsvdCBZ|v1=pCiVqT#~`Ii5e)zIGvq#FC<6v+1tlZIv4s4Pzf6~&GcGFUaF)J zl4MCkjJPKrs9|okg{8Le<2d@1d=G7C>q2wvjV+kA$z%TnrJxL_)w=&!@kh}i8aaWpR zTJuFG&g~2XgLPR$O#UHC%6&fEBSUl>tavZg0!i$J8zmd!#m(hsKQMX&fJ1Tc!`r;! z^At|LYX;TC@-U5cJGbHCVDaOUjSOdC{mD~>2Wrpt0|d>%SMp<0>k_0kBU>T|s4sI7=-wl;3qcM!N26zJp-oLx(h*#&=skQ#h-(+H$-Zt4% zu5CyciZ$9Hh`4->=@tC!#@yIzKBcpn5&@#8LNjhYUh9!I-?{L>4VA!(1`@4Df==uc zYf*GK9Y2@3vQ6gwc4SiWqQ5z6yxq~51gmM8c&sUjAj+lLXF+4v2Q~0bqetMjX!@^G z6MS036%yg+K3TWX&(R1QtIJ<;|N0vC8>rc8oH=E^cqO@J^L3M3Y3Odhs-_PEOoAA+CbSX*rt(0{H*oq_zX~!A)f7$R~ZnJ&2 zIit=0&{saaaqDR1H=qjBP2{&P%wIcUsZ?plHh(1kb?yAU+3;3&P*5DIa~ExnvAwOv*x=%Tw(x&8WbYv#1P*wG_pyNgU_nUN)w-8f+VVB4u4b;!dmOXFUvcl~h+srU@t^)!$5-)_H|DjzrNA z)W{XdRG3musGe};cfF!jRaCKn<9=G=s&I}pGUd99!ajWDspE|8CD}c@7q3dRw?e|6 zI6|izZfKzR=<2$M`;h+ zhDT&71!2Ej)BGF>#ox^`;6QB}Ez#X9+Bj0ELz`DodUz)Vj&@}fcc%u^o;KjBMS z4oP;Z#CE!r$MFZ|bHkkREvj)W6ExX zLnmnSrEnw~e22@SdCc5Vo&FcIKn9XFazhr=a$G)Vf8qfb6L}2)I0YCrRqWh^cZpD$KXK+I6JwxQnVv(nm8Y zdnz9vWR@jEN!gU-SyM8T`Pio@aemgC<=3n83oI38i!;cMi#XN@&1#S6=pV-FJNQH{ zeT_5OBhI8PJ8J#ePMb5cTQ5j(lt35h&!}n#+vE%BVwn)Gu8Pj3B3%(q6%;y08YpHp zc#y{Tq^Y#oFxw4l!qlv2gc`m@i`7D9kS|oKy-NU}Z*26F)ux16MbA?n_{w6sv5CKY z9NgF~*$0zbw;vlPn8Jo6xJro#cuG3)FxRuOKa8fALc3iY#Hl0uS-^P%TkZb1)a%K? zTmIp=+ad^hts?!N@}P7+QQeJioPg9JAr~mDrsr(I@9zInx%qOPjq6~!eg$9`jO@0;%wHLc}qwWoT~b?-Gfv?ZcBl(Oqeg^}<;%(~Y0K?__{q5J=ycX=1e!#Jj{t--pn$bSp^76OQ${k9uMPDR@PtQQs_f z;gwy;(XOPgFuwcQF+@2vx^FZclztIo7Eb?yQ<@RryOOnXn7gqg3gc zEcJEPb3YT`n5rhalz1|cMNk#SbW>b{e75SDlo1@|C6XXp_le~f3z|zHzr~QrtmUt+ zH`ZS|1hh&BA0i^gE~L8pOy{On)~tkwiEs6ML8@2iepM#@3?nLLrxu%VU(s8VKUvO0 zu86!beS@)wT}=4c^ktBu(cp`N(A3tui6<(B`m5tFYXdLcqc+Nt8IY2+`nTOpM*B&o zaPlU+3hhbW5iU>caogVW>$DAupvm_Cqa;=d#-ad!^TO4W-MpMrxRf@FHR<0`YhltDFQ~OYX9HLg1%>Dy#p(!R*M@Rkj7BOKiksg1agt>wQ|7cw%h_wQX5q;TTD>v#|ttq|qZXzsP3V#D7J0uUR zSy2ivy!y4#y$6j{x~xbC^0Qr|gv#?&7xVKpw6gKErLt@F;x!&lYB0f~ea(np(kXk< zycuIrO{e@pV^7e7Cv^y?C@-(MOY6emO%gWZLwXJiE*cZoW{hY-g-B&V?O7HGtE=K8 ziP7=c&C5eXO;

          8tg5M61*34aSN6raQ!`&Zi4fSGBS2LULVoKNd}u@-8f;(q&piJFy5>B?Nt((lXbRb zVM^Bel&yGmv$RYIii`agHgom%va7deQ~Wo{U`&}E$80~YpLBHxvLzSO?}M<_s)?q* zs33Qim2=KEIU!d_XKRQNA+;15yc#IuXmNhD*&_M0jm$XDP2Z7(phrLMj7H3GyD5w( zXgcw&78NjiC1&&tcQ$1;FMLX4t)guIttUN_1ok3xBD?#WHqu}Eeyhe#{qLt$6;|`Q zE6J-?@P&v)EF7^&jRdidax0s*-&iPVT1Q3PH2nDG@i~N6moyKDh{#H3$klxhxGYnY zqLt;q8A{m{%@ryq_JG!EKs1usr(o$fBgY61c!3WMp%Nm^YYjAL4R}=bcq!S881uA+^H}k@ zY$`)l8RyDW2fG`!o=48gD^Bf;G-=l)C#+s1l;bc1M#Oq5f~a7nHqEoCK<}=XZ#8=l z9^O9Dd{3!&HvQv(USwE&l-UaVEl)EpfT&0co7dHrf$Ov;PLVs~E|Cb@0fNVY9IXiS zd?8e=zX5>#F??gRWnM^#R{z0=Ll^Piz`n~*;$M9pr-iKYk!z<49o<~d?+2UBelMy% zQ?orE{C`AXSx{0NwNSn7(fD4D9`gZ~emDG6bId;o=bU*3i`_w*W5S_N=M6R2jN5pH zR6IgN5uVE?o5|=C+qqd@yPQM1_r9wvV^;JVZ1Fi0X%1Ky_2V8A-Z5!d>fhax^qQSE z7q?Oo_F*0sJagBw%g#DmJqAi<)Xzfs7owhW1yz^Z=pC#Oc}PA?y-~FD=;Bcc6Jp<1 zFlHB2q0`dhQNEJScKhM9NP=pPt6Fv~iF}pvc&d{4rA&D|0dt!co6lP$sXYTVMok5u z?eq5pMAQAoEV3hN!|FfQzw@Fil-h0)R# zPFmiB(7>N^UzQK>6AeneztZR<>)Nr4BEI-_bn?Vm+qG%KtB@SEw}ea;!{Fq=e8rff zFgXmT$4BUO+A%?^V7IGZ%-QrX!|le$ZKPtSgoe3Vac=*ax7tvRJ@!GF+ypyJjz+iP zpj5+VSoykugNIKMAfojYQ-}0g`EB+Tp;7@~$OJYOmmFV8;8e0KN->W@Wpq~xs}+%k z-fJ#t6zsHFDg5jfNyz|?hZh5iS!g7}i^w57@GIA}VT+a?)C4)jGcQ=NBdz2JYpRil z8*@-W#n;r)Pzgr5mx_IrbWe7~!yBQ>^t~JiTUyx0G8%~l*4(yHR)`q(d==L9Pur-G z8Xevlv>F7owBdr&Iu2+yuIHqOVn-)u<-svmJn#+$j-<^`Flenhm zr+-;(?hM<#^1OaSjl&!on#iFzM?yAIeDvr+i@Hc#$$NCYEkn-6lZIO+YmFWxok0eX z4FrW)EJd$M0}}F0q$b{{j}-0hK6{cMmX-B=PU@|pa82UxXegc`-&XQ$HDbI8<{y|7 zXbo8{P!8kFLWpR$6j-unG$e?We!f5=(fqD6OT{9}cbYPV!ujB?{j>9}imFH2+yafR z&>7tfY=?im^ZNy7RehMqTCt%^QhZS^+bRhMygzYUtOD`4v-cVZ{E=12UQZ=qM%?Da zLr0iuB$vYdj+J~S9Cu;%dXlAqS|{FHw&(M?v0ULTzky9=sPMY0LUDCEUNp*z zJ^3P@{j&%9FKgYGb&j0`R)T}bzwCuR`wj5T)C-nq zX`HHzlorM#6S;Z8&WSV16T}&5H;$&px5AW^5T2*ywWATBAS9B>@=priwZVx@ZF@_H)DL+(SG$bQ8Pk&0G(L(^Lsp;@CHx>Qdy5_iFb>M?x6RG})l%5gqlT8ykc z4Z?MZTDH2PM^BBR zR4$xy@U65wb-^xqF(G^h{ry2dV!DPE;&6%JN0*U4%>rTU>xO0BiP#wZ>KZjmDJdtd zE#VFs&{S9&z>AE**W~6v- zfuVv^p1K=S{X!sQkT*la7coqZCt#bKUh{(j?{Sze&AiAJbvOFQoqVL4yJu563F_l+ zS5`>|)f=h85e!~9fOp}uCprBMb}~+?H0^bd&|CADroXEyB_w$WcTc!B8R7bgtOj2q zO&}GosgJR5=V~xlRFH~H)~#ffGU;uKPUF%WU?4F>G>${FTSqu0vf>1?zBtm=#O(+* z$WBig5^XSH3L4D09eSnPVQGoF2RVf!+QQUWzeHclHbv#HP^mvk;TUnV|8kQv`E)8d zZ7CXKrbxYxwZ$wNBQ3QwQPHzDg(ub&eZ(@rY6`OrIh7GWyPydzrB^CqQrTOiGgW&P zPo$eG>y#)JjVBNr?ooq=o6UE$zZgBS$;w9(ft`jB9er z`Dv-KAqmF>Qd?aER|d>2k>|bTW;d}O(;AC7%EHGD+n>r;Ci69&Hf9CfZe#UNF|ulq^c%*&2}la#WJBI z%M3{*ihXk|ne0NOUBg%9q14N;&84OW~=kFc3s z7dQhnQLM#JCQLb6b)%W6CVe+Q{sw3+NZV3Yo#%f%6R0d9l2{_oTYq2V!dEzXDL;~tR2*gm=0)0hPDg5^ApqzZ|=fYTT?9x z(OV66FHtJrF0YZU7XF-}B*-9aw7En3XhKgqGF5n0_3^t>ro~O~oB!9F_QQ9FWj~`I z_da0$VRK2^@FT{k!l3@jV$8^a)XB$Y`cxzwz|Rg9J87aAZW!e5tCE>466`KqdE!`E zJ80OJh}w3IckAFS++g$85BYJTp*>Pm5f9tK#h0xIsw;8_aj9lVO_m8=tgNW#DlI!a zb1M}v6_ujSR@rsVwiU6in@W50@Olcm>;9J%ugbjgm;$pi>GG8*{4!&P$0I&@EFCGVp%M#Wx{|JQcUi!%&?xopgVW5v zzB@vMNYFmaSuM=h_}{kY)Y>cnv*h$^yZ7c>F$K!xW8SR)5cIj$TQ_RG$WCp(6@BD# zB_c-o<5&OAnl*NcX1I4PCwcG~Bh}$@ zPq`!2Q7V!dr_e14=(1ET)`q67BDYJ$)G|cL=ml}!L?%%VG;x2@jnV$3Jh#C-dr)*n z67UUuQNgk~^i!6y+)fgPCc+zg?4sT`%FVra6yl6Mt)7>!yLZ-1lVijczlS2ftNZr$ zMUjJx?#2eP(X+2|(O(VjKHombi5n+Qm^OH#Xve`=*pTuc4heW7Wb)OSlav_o{|^IJ z(Vyv`V^WPSZXDaT5g0Km3yVmUhH^e!iJr8;6#KbuyHSGqLRB*>M-zI?QwjO6M)_Zk zzkYZo99iAt%?YbZtWps6ZIS;uC%IpD^*z;YEsNe&s%fmcaP+MI{#w-I0UFicl_%5c4gy_>SpR& z=3YBZVL;-?)}YvcWzo>E51ux5g-zwrhF0_DT^sckk7WpG{7N)df{dotqlyHg9`Z55eox@2of%U)bi>)OeEMRQKyLX`WjlU1u68vcn%;x^$9P)-aEtLP?;ue z9dzKZaFW!-RzksBC6Cajm!b_18L`sGjJ4DmRujOO3se&MFan8AS~tHcVOYeXNy%`q z%UykqR17%MR|?|(kSibNu#c{qK#Yt-{T@9;9EHmUbUUy^v2qG5ZH=D+5!ta0sE6Nj z=tB22(n8xc*q4=ST+38cBW%?g^tGA^ifbl?QINmkrrB!gKM#EODCBe4L?MwAE8ozcdJeHaj5dVY5?u*c2Kog*3L-HHc$=>hg)enh(KBxRe;!nxR zzW*YuncI1O*2TIwB2yLU9P`4;EEPpvkkrywqSYdWj8jVW$i2Z-e(#ksp=uGkBm6+f zD!#M<5l4>hnF*WwbwztjZb3gyUz>&+Ie&2O>Qr5NlBh37=%_`0pCV4I4R7vAdr(*B zqbKC^FM@Su=i4csKGU}qLNqfYck_iq+?y1I*X@mO@k!LTYSoxRxO20^a9&{fmS3X@ zSy(SQkC>Vqvm5mqlQz7lm`0uJ+RhB~eV3(N)u9&H^|i9ZtV3>Oj;VrhuTNiJvOmUe zG5tGkBaEX4O&9Qw5YOTaT?-UbOwsA%d2FMWhkf`cSu^jn{R9=UaGI;Oe@@k^yj2Sz zGnigQQSE!@UQ}Dp9;YV~VbI*Z#<^=ndGzjUhUAK-{ke8gfyQEY&J5xYZmtk!0?rS? z6Rx!>AYoD9RV|exx%X6S9)lzUzBO?*Avt%M? zrn_b7DL5DQCgBm;TQjc|>I z`LoN%!VSi1@8$37C^aK`L#S!2>djLvwfV8sb#wM;I(a=aGEBP+v?*QgHE7&cnjzYZ zvY`W%ojC8~XW(-|(K8vFzXbhJy$iPe<)0;z!7=(fHaic{Qbq%u z2;J1}_Y5!4jH`8Dr1R+#N52WLWDT77oaU&1fR~j!S;G{?X3;~uhEh)~e)~GBs3}iV z2JKnIs}16CW+|sp43t-N1!i=5gvAuwdTGUOQF*n>;4Pb_DOncs_X??E<3J zMA@c7b~n%hu)mEW88jo-Z^-qk=swcd#7U<{-KlI-DpHF_MojddqO5Foj^VZmeAG)|4}@a94sM?450$8a`7o&>7;SG0`BXvmb1f zfh?;7WwCoJN?7GtzLHzTsUgsetiR_izOAMUw}ex>h8AbMpE|_y*kfmBfn*3-RepIn z%iEkQ)m!00+y4Ynn-BvDF?LVig390uRfG64EN1;E$H}|_X{>AV=Rj71HNq@mc~C^O zCcBiLCPK5lD2JBEU3fk{TRstg8^>X@Jc|Ak6mEMlp|p)TOcvPO9GZGn0Mk<{5-Z`; z=j#Cu@;VPwkb7TncG_zjtH&>XklB~kW&317!6skT<%lsXEl&5`fbLR{{aVf~Kx z7LV-{j)}&rnOg|kCtsZ>E_XAy$y`098YAB@i9b@AUPO9X3*-+W%QG47Mr^&&CsRd@ zx%Q1ZD0}H8m+VWS@C-gXed#Lmg!e12-J=l*3St1yt+QKgyY$5Rq@nzyLIBpnp&yYX zoACWAkXEgsZXZZ;D;77Wr>#i-#u6UuJ~zaQ0q{M+QTQR`{N{7lx86`K68W&Ned1bg z9h2|!y>`@PtqB;@SN(|U6I*np?84*b__MW` z8=GBmS)%Idl#Hbt>Isfdg<><9=iS^>Dgbw=IHDdcnbb*la5aYD^m7SF((~mZ+0+OM zx|S469GX)gUL>;2m>wfTZh7UBbm2o~p?h~RpD+3A?z1r+837x#kksD`*Lg&}+AjY_(5DxGWBn<^1V} zc}BHQ-g$p{lhJExi^6bh3FN*%LQ>Td zVUA;d6fjKwsqTjAhP;YM6a6SE+;((do7l~`dDh}z3Ga-U*iWz(xuU6mk4UO@!XV_8VuJze_(-_aC zV~SIr@|L+m11_*z(<9QSGZ;oTRKoUXzFlVDaBJxZwS<~%Nkm}w@|Nk8S6}$W7kB~S zd3i=1^WkMrIDd0B6Kl34>}fg$_j8Rp@ITy(2Jk|1ZEaC?f=i7_w$CJAydq#nA=CKL zQ&a{%IHROnzRAU5ALRY48!Ns`97y#k`VCAzzvcaa5y?R!XYz&;Ph(_xb@$i6w<{}Q z_)_v}+0BJ_h=UF7kEi`5n=_|&Hw||N{u~m>Z-bt8m#oj6*xm5mk^5u)cZLDTAbuP5 zPZeK(aS7`54~UE!cRoKe-!5g}Fk5v4jW#a9CyCMz;gM+8AEV;C8n!!R+MF{SD!qwb zJgWF1Wh|)Y@NQT1X#SeE-=zjo+ixqNek5$B35J^bcWV-t16K~FuA~JB5T?aGgpMt zW~6FaS^dze?p#GDpLkP5q>zBwC=~5s>5gb#ch3nO+#h4P00oy8OOE43#P()H`4ntl z>);26VBW018oxmmRS`BHd%)IM*LFpb%OHNXAL$n{@njL%yituwLGG8)MS0LS+Xohr6M?^v*-ddv#=S(GR-%O+=v2Y_Eyy5h;>v1#+As&bsfhn zT;nn8<-rhn=3p`?AQ%v|Y)YZEzSWPZ%FFFPfksLcLb@h{km=m&XM97G^mW^yGww7y z+OM934OaXpjRg5AP9>3jrU3in+A7ztZt7BHxlYX7`@M$JhRo!`&)UCnSkiUs=Y4ym zTH}f{?lnye6p-uCtJ-8>Ww{#pDLHz5<3X?Id{7zls$0#Wu-^N@7K7w@#x@$QGR#^!b2Y>8zgfj+ZO2 z+MZ3vHPW^chV`QTWZSA}WZVS5-J;8djPMtVerkW+J|d(7&Ap#bIw4Z8zO~wuK{%pcx>O%I>^Gw{ zv3ix<|3k0YKfz|gVbkY zU9x#k54E+`Wr@^f3IAmy(!Ost!P)Y+r#rs^%$;uE2Qb3#0;&jzlCO~?;L&W4Jgm!g z_>&Kwl)%55UQ>lRehue|u?b&XACXLYti}rW3ys3YY@cnAjW@Lw!Xzv2Ug&C`({oXe znBap%w&=XmkJMAl}^Y13KD|_&9VM5VV_?BfE~QNp&FWsaiHj(eE(Ca}_&@ zq&iJ~1L!**N#uPD7e6EW@nU3kt*YcC)WA+^ZVx_J7nNin{J|`%hhk*pu z0?q0%Hgt&;sGcb3>4*4DcT{ES)1<9wR(U6b}~vw%Cp&M-1v;VLMFQuaz#kS%XZ zB?Gcs+Qp((s{WbqVdbD094(%;$90d&BQ(@M&f3XX^#w$4sC1i%bKaP?iBm$)lx_e? zCV92*x!NbBCzD@NA9qMMVl+7R^qeTY>9xeH3?;ZSEL^2RcwN-G6fS=qU6N#{#+;_6D@Tw`&X@5srG@Km!qypA@N6T5zEf6|IuB^Px*Z zmg}*rVL1l&7?z}{gMX*_mDYgJKrJgQ3d{X&eQpIaCqA4u-sS9rzP#K~-0TB9#-5?+ zngRH?r$vT!p515TdMEWro}6~+2j6JcoAWPIC%91TFIgf!^L%0c;r8{#ew9q-D{Pk9 z+G+jOK2HP;K4JS$iE1u-R`x%!_NfHGhb<=cUa$Y`rTG3UBgC*%7OQ>X?!Ef7wYEIb zE9ta?eJ*c|34OS|FsTO8>PW)Zz=mJ?;b&};BdI3C0=RvA(Cw4{uOVmC`?!)Y{TiP2 z^zmL!@1eLIWxn-C?uKh7%udGEb?t(?3hBuUwS5&nN@ezU6_aB!HW|bcd1bNBlh#U` z&ckzpEyzhZ+T4~AjO~u9oI1l}5l{0!(qr_IhxCZ>JBL}i^dfZ#^L#K#%Qb|rU>Io| zZ{7Ob&1tnrHEJ_gCs$AEI!ZsuuaC`Uaz$s+D^8>;Hkub&bBJ}|_FS~Bg$>XOvyywp zy0e^xjV~pKxUKG-qA^m`r=&g;rR&W%GvEdN*kP=5_M`o^`)#uf z<&5W5tdW^6P2o%V%#hMb{6@PRb3O+mVeX2`v#us~fo>aug0e(K8HECE$vbI=Y`94z ze6Y}aDTczf05({%uV3xw10R)oyIB8k|E|w<2B|QKlc@J#`%z+*o#L&(WMh@xVu~+{nlN1|()K<7M21 z6bASxR~&=6jI^J>Xv{1$2;(K2?P_x%K-lMpIVUpBW(T)=w=RCBPt`~(n2A_Ja{KWc z=n>QU&^hrloR0IbPd-oEd`#MWUjNJXsLe;>KiK|O0o6ex;MV(1Y~wn| z^!6jytDUslqS0oP?z;qONqF)t_1V_=Z@}V{R@sNc z)Zai;^TmgS!_U*d0h2nT*~0 z(|@F=8R~MSVB>2q`x{t!dj0nE;pb1UU)LFkKeR(CSDp4wY{)J=dT1xAxcnax3N*;y zeglanpv!;$2nH^`B16Jon*wEmBJ#@LBsh>K)7_>xeBzXc=#1ciUt2hGO+&Hpp_H^q1u0CK<| zGr)z>BuIkJX#f~aJaDfbF9{?7P;eHm0D#8vAvCy(G;maCg2KH=1b_w(gTle5;X$*K z3<=}bD1a(|NB|nIC=;*v$D<+?4q*WB zXc7R>*S$vo4YI~q_XMQCy=Bt`42V|%0Wid)fde1`LKBY$1%*Lo0t_0cK$Cz58ifXe zNr2D*Xbkvh-~b4e1aMJ7F#vRp0RA9^A_JIV0K$*}CP5O45844s4Eh37q(Bo0V?aOy z_fXJ6AnLuHK(IQXeKaVpBos7`fC>#%1mY#Zz-hqbfMkLK6qF1^1sy?g6#xK~1nmI# z*5GIiAlmzZA}B@^r~sM*!7zXr;uUFd0RRD1Q3Nvv;KOKe(Ev~YR}oAL6bujn0)`2~ zV}PSU0mb_g<3pf<00aIXkGL=f_=<<`cAV z?+(NahR*QdSLgD|bl&cPCvTOTeFk*C!(Iun1TUtaxa=^&Z(j_h3 z4H5$p0U0qycZkFg1e8V)R7xZTB+ciW&-1?T7yo|Sz1=&%-?>g)*Uo*;y4ve{&V^p?8S5VEULG=p!IcY zP9Y0M<<%wM?!L`;Urn^TGPy1nDO`0Qy;dnV-25l!pTh70uazn!HGJ%f>b_+}IS~yJ z)FJF%IG!2S#sYLKVV(?Q#b=LXB*tgV8=J9U?lC~}9b&@e93i41@9txYBh8w}i!+!h zE7cxl-gR=Fx7AJ;HZA3V*g4xV&JAm#b`pYi?R^FeF)(HgvB@SIour*OvHPaHLQD9| zgY_$)HnE%p_#*wx`pT46<|^y})3Nqa_Pri1oIa+Qo&k(qnxt^v=DtDRb zz8#5U070p3-SRk4^e7?#XH>6*wsQ7fka;7t+o~$+0X+(8g#N&>9rfI}M+;|@r}|h% zbae}Go{u)V5=VNEuJhPveWmj9S>ou6(+;iv;J!NJD%klqaib`)2Kr?(k#0Ln;+NFl*tSKC?{M`r5G*Q@1+}ENd)?G?b z&$xF^I&yO#KX25i^TY=uB#$m~-&;d}Pi{)cj27bE2fRXlFCYJE`S`=>#pPJ^5q?Hq zWyjB4c*Z&8_xRt;jX%ucznIqlFu8xr-1=K)1uyg848FAgCG)4Wf9m;1Mt$||B?9yB z$Lq2eZC)3rQ!RHpUq=cM#m$B}sDrTpMl8b>06p%AQV4bK#*G%q0Pai^kChU@? z;8Ah(kTGlXlUQXUmb-pevvWS+&SFrSrgMNSR~VHg81;P(za){u+6a`0qSPwb#X3MN z$e2uWI*ND12Yq$>Q-}wp6?AO;jkEDc!6v}thxDW}LC|g^xH}`M#^8emNS1IBc9K4H zH&~bgc#Yq6?$(5>Gou30i4sfyAfC2g=?uSSzmTjDfIh#=mgy>(P(TSd4kQcDlrVNl zn^@<@qm7x0$$5&&dU(>DRHtAJ zgQ>dos|YU6d@=%ua@PL7yFodWL^UqyxQeo{DRLqQ`zkUguOthjLXza%Z0f06bHW*7 zI7RNUha`D3$RZeWO-CfDAq;wl1Y>MzIyAI-7=ncmWjlj}hQ(<&1%pMU0?Mv2 zUW(h0;Fc?jbj}Z%lcI8P+hV}QCik&D#NYT3VkTS zs|?qo`evJCK*QCNlv=8eMsojnRlT9Ddc54YI^wX@u~9KjOy!qkkSWb^&}}(J7AnOm zOhH~giqOKC{b8We$5&?2ckHRA?I|%0Y4ikvIz5io`qSoa8$BUfyOTw-mY)<9Hrf`W zbN3cps#!gaX9{#cltuzUSu?laU4Vqg{l(}l$`18bD3{n_erTQKm)`fDx~n1PL>ZYp z>}d<%1~A80KUGcw;qr^nLr7<)*Gd#7v$WcNR0pb5)ft33I#Wza2L@kDDkWZ}B`A`U z0b}d$>_U3GC+dfcbcFhQb2sfb4D{L)Un-BJ*07Q5tCw!U)+>dzjq5-=cHj?06*ib~ zhM=Fy>pCq=7BCN_&E1rCDFmmDD;>)makGCwt-UC%HjHBvxBQtnU`bP`vbLu~+(Dil zH52>m%4rc2w=nh57S=|EPHrqpLl$gYE(BTBm-yZ3QF;|S{=8*6(zBq8ww zn9I>xLG?DLcL>xQD~6MUX-^JoZdqD{9xb|%dEjaV2@N&TpLABAhUUREnzuD8IbR7= zCFsyq0Qv;yC|e6*C^!WIuymQxNx zouCK^X+V$ir+k(lYf@}EJAQA?3f|010~Jqb@+`QM1eOOS9u6}i3OX&whU!Bz`eVqo zsU};zJIoj1E_8FYjb>jZ52SNjw;L3y3EWfgD-Bsc6zl9BM0!;WSGYetEiHLR$hAHX zX83FeAt}2I@)2{{pXedro#di}1sD=H1hKw)0Cpgk(u&ZL$RJq8i$IBFD}Lox z&x+m?oeC4i(pC_vipK=x!v>!Zc7oGua`STx(k>fC6uM)3Wkl*RJ@g|KiVG*~nyB5f zTBv)Q=Ht(1SvD{XrN&Z~d2I70`nMT7sFOSHBh(TFF6iDD4p(XcE$b$tCp7ButCJa? z37oDG8>3xayuw&xmQ9}Jndmid{-C|Cx=Y5omY82M9g6`w#q<7&fQwkV^> zmeJ-1^)V^$`(YGYC3G1V;V8TdPLfq4iJd>`(FYl_*nw z1wq0Xf2__nz=hidMLP5s0M4a^iGxQCo42#Km+-mDO)|6ezPA!+6XydHm)ugLB*`Zb zAa|bt26LN&8yXXm@7oc^;e<^v1UnyRta%*>JQ@L9DL0&QRfOPNm9s7itqMkT0E}?H z=|;pe1~B97du9}5zhtfx%5V?Ls~J}gkeT_ZtQsjDAK(TueovZRGB zDZWnSa3Z$d{I~*%TKz>$J4qIaueuLW@*2O-YF89V~Ng( z4~}XRpToj&Smw2iF7uJ&3I8Dnm}MaeByGweu>idoF{wYPMfV_IdFnFpB+ z=#1XASarWG0*T6cIw+QQrxoBMm@&TCrqrDWi*rVT=0@6)<-2s_&rnBaX|AAcNikg3;-fZ}}^H=R@T zGnCP*RE`T1Gc=Hrj}q8%oS70K6v&;iXIaB%j02l5e3|ubG8oG2QDwa#z8IU}&)IDd z)Lgws;}atg>)0K{^O zzA{1LorQNGu#jDrnmmie0}9$BS$;r z*)Jz(NtIRt@Vp+2lmO>;=k-e!yFsP*2h5tCeAq37$)d9=Iy?tiJ=?2vNC9zf)Aq_U!uaQ%I)QzI950Y4Q$#d3hsp1?_;#g9~+IHfs_9{7l`rBHm z6zGb{UUZxeUBaMocSx50z~lTOTC9DQ$XukejfpdQ*Q5Xl3Hb6CY?_j}EFT)V6ieD6IuEBZdsj=7P8fMoHM zH&?=9XvFLU0;HYVZ!`{(R0xHl_IgBnL*89BOavKs56|D&CKURSJQ4A+)ba6qSAG#U z8e!c+5}&y%Wdq9`QDCRp=0^3wBeg`n8x8MI`VEVhwpxx1E(%MHRD1$K=_R7u`cFp5s>dt-OMtbJNN;G3bc zJQGztWwr3}Lgzd)bQK*{fzy1~WWA5&(^2Xv@)PwL%c1cMQL=g@dBMJZOaY!wb9x=Y9=LUSllRVWO# zzDQ91LEzLPe#nL#A;utSYPg?k`FdHVabfl;+DH1$JmbX>G7RrS96~+njdmf%z70JE zCkst+1K?lmWiM#A>_Jflk-mdJSyhn)CsGiBUWz7nC3C3=%Bd3-t(ODf0wJ?H`^M|T zi(g!XFJI^mfUoT{SC<5gYVTL>pQ(JhDAFcc`Yb4wpNx9Zvm=f@gD!=oAE=C8B$vGC z*>1vqwO9)CJW%PlC_{Xo7JcYeIM6m}Z}kaJy#3!q*+APXd#jx$>=|An{eV+4I&cb~ z7RN@Se@zQMbju%T6IcNk^g?@^puYAgCu%IeSWcS~ub-0m+S3o>lc#ldvO*S_QRyd# z7bgVjQjI_pYAdpzk@B6MJf;SG^6MRlZIkb1vYS#cSYE1z!CXe2NtLG*3v+e*4h@%4 zil~6}#I;3cs2T;Xo|RC`$!2VG$Lr!`?Dc0M-(TwfOOO_g{821xhLCvYbLZeSOg>M+ zB4P1-5>tgJ1Fhd>2y$>TMTEL>qB*M=^^GBx-!BfAb1o@7tYw~cfV#0D>^O9Lc*-V1 z5c#g-XI!kjzlJtobRQkO4e2B|6P_{?H6lNvhlHiTDB>agLU)Aq-GQ{0i-m+ng&Q`s ze&)9Gi93?$P*_w2EaCyK{hcg6e#)RRt4NTQl|?$n9o(1Ij5n<&*0m@o>vTK=@-e=DcGn}x98pc zYOMRo&(_hnX{u<#Q9$c5x(6PMplfD1GqYRFJb#x?o)*!8_{u?Xh!C2yz?(|RY|=~Yd#i;CwW=&Xf~sBo3i zWD4K7$!)|9Vi3)b56i+)!n;9@*mKaJ;()4?XOgwkqvB=X*nxp&*_iFU8oQP$@Uq;g zcx$Fj+N{UG@`9NNF+|u*U4UTb1pnlXTHAfL(&60!f&> zWw_r?!re>qmV|LiC5N=^rDc;wBT>l=$L?U|%9hU>*8M5ZUKaLNNx=Z1J-pHc}U`zpr+DHnb9_(snT3JvN+iaETF0a>1?&-QG zna*n+lT}q2&*Z;;{eolKKIWtfum6-MjUkFIj9g@2z``9FlyflA9ondSGfNzS!1e8!Ojm5qxszwcvj zIM*UKeoZSpbZ89&(}X0PXUBJ8xld>kRJ4X)7+f>GR1;6{TB1o%LfqNJ)ByWlslh$ zBtW{SGC68{YLGwqXg0OQNc%`;RVw^JHZ#$KH}c|PLIpeI`c>4Rw1ekW-%3iLDk!hk$qPKy&W$m_GSH5QKa{u+6ts*L_8n1G+#1K)JA%SS|x@541`JmF~hSr2K z+yl#HMxIk)0jTZHB?QAW(dSEt9l*xNbLNXx%s8K*M#1;*0mrEJ4Vggq=X4=KwKCJVo&zQ(G&u42nC6WG!?vo+DgekRXmH`eB#=7FJzPIxe*+sZIGi@vW{E@)Q~qW^ z56Sr~vT;w$FXU3vLlma201a{pUDEJ{H@zU1beA{Cl&MRK6GeS-uGr=A6jO{ue(Y7T zm_d$P;C<^tXbcVaThmbISI1P#{+;iLV&8-tD3i-;zDp zq>y)mVSns@ekF4)Jjhzl|PQ_i3W2*lVq~${~(ToA?dbwT5(v=+Ohw>`I zt3hVw*@z3l);b*thTADQLmy;|_u^?E1@*b$B-jzh0E{I3%GD+J1FE$YiCD>BZIg+3Ui&KkB+E?L{#~n4-vdn#Q*&PuaTY8|L))RoX#%Rn2#xk{N%9Ms)M}H+MD}s*>F6Jj-@-_)tKdpXS z6Sw=jN_ONM2Unl2?or$cu+D{K7_^~Ypz6Nx>)oqGyHhE`P6!N^=7qH%F+qn8P(%?+ zW<)amU1@>}J}C3G=VlYhx)UcJc2dmxXdjcn6XN2~ikx|f+|(LW@!$oRgX%+4H8ech z;O8p#jQDKpFC|ZdzhCnrs~Wzo2MVY{>KCj?n_n@YH>LKRV@;R(E}CWG_8+*i-Nuo* zgVxT|Lb-SRN@0g1Mo}$eT$b)56atEQ87j2sH3vpE8grQjPxg^G>|&yx4ic>Zs25us46TKjzt$PkWzkri8U-Fp>OpHU_`oJ>r>dh z_waD+DmbOLfOkp%t}XPK?Tjuzxm%DNrb_`2QlBe_XSPuY1nbMRvy1mTZN9{JgA?j& z84Ex-5EiQFwKX$%9Ak~VAKx z;ApuTvk)J%#jOUu-O{e+&^n^#zD&;fp*8-nVq0zIE2n!Hb-POPyMGa=ANOwj)S7x& zllz+=e-!`w_&a%HM{Rx_?;ePM(c%TaQMX4Xzf;pXQprB$nm{4IF(G*;~dzYF`v^vkEA(IpQ*Z%p_9 zRJ?kctaf(#`9qY-kLeLSp7lTR6FkoL2M@arJibZwZz}ux^M{+C@!;7p=jn8R^qATi zKIhGyr=foVN*-?gzJ2vH5f9aTh~oV*NKnrICQ#As#5t6MWH7XhBrT?1qvP5>@g$Nn zenQF6P2@L4HsRnkHT@8gaS|;@xjM<6Vx6yT{!k9+@GT{1urP)uf(%(>Fz6k=rr2gm zl;Eci)z1#$6OiXZdo&B35pSGi^yJT*hjUO5U#n3MePZXAE{rC=HHfco_+gxJmER*~ zH3o`q1=HAI`W!28-ui-urd1-)yojz6TyhZ?ifgUj;=XSX;;reLw~fYBZ|hK7)k5@2 zfp5Q^M9B}GM5;Wi+6kC|#aDPV;?$@cd$$H(l1CEIua7Y!f8wGgIj3%&(f;!R@9f}s z6P5mZ?Bz(7K(o`j%XH#LHBJR}2EY@RBgN8Y{D=>wNx)ktiVts`t*K85-0PYgL@M_P zHzS#Tia0U-WP4+YkKWF`u7x{M;~&Z%#2Yb+%1z)8cFI}($E53H>pKA#cr$Bql2K>k z*F<>ikK7;AuWN0n{VD1X#+m*fPY@b>*v<(k(X#mbxsTb!J+mJBR$aw4|Cjgxd6A)#$e^2w`l_%|cscM&fA+RG>`eLs*gx)VS`t^6Mrxm}V z#-7a5M|x$^2Uz}w~8Mul#lwaV(K@d{24#~YX6osz0yDCc8IFp3p{&7$;^K4 V6BY3Pc~ZG}D^>ml!27wZ{1=qCbcFx_ literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.3.options.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/2.3.options.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b3daf5df187a5aaed7395bb3a721ea3d83994c56 GIT binary patch literal 17786 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

          58mRH=Z;jjjFV5i+po9maxcf>oetq_R1k< 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 e-~7xX6}uau-5Qeng%SHI-%wf_d9p4@=| literal 0 HcmV?d00001 diff --git a/plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.1.green_connection.jpg b/plugins/frontlinesms-core/web-app/images/help/frontlinesync/3.1.green_connection.jpg new file mode 100644 index 0000000000000000000000000000000000000000..47fe63c818f25e2b2286ebde5a98741c5159b5f1 GIT binary patch literal 29866 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

          k>s3Dpij`R8*o&{@;@Xri7grjRb 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 Date: Tue, 20 May 2014 15:25:26 +0300 Subject: [PATCH 2653/2668] Connecting to FrontineSync doc --- .../4c.connecting_to_frontlinesync.txt | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt new file mode 100644 index 000000000..d92fb04fe --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt @@ -0,0 +1,71 @@ +# Creating a FrontlineSync Connection on FrontlineSMS + +FrontlineSync is an Android app which allows users to connect their device to FrontlineSMS in order to use the device as a connection for sending and receiving SMSs and tracking missed calls. Please note you will need FrontlineSMS in addition to FrontlineSync in order to use this service. + +FrontlineSync does not directly limit the number of messages that can be sent via the app, however, your Android device or mobile service provider may limit the number of messages that can be sent during a given period. + +# Setting up a new FrontlineSync Connection on FrontlineSMS + +Enabling the use of FrontlineSync as an SMS and missed call gateway is a 2 step process; you must create a FrontlineSync connection in your FrontlineSMS workspace, then you will need to download and install the FrontlineSync Android app on your Android through the Play Store. Information from your new connection will then need to be entered into the Android app: + +# Step 1, creating your connection in FrontlineSMS + +Navigate to the connections tab in FrontlineSMS and click on the 'Add new connection' button. + +![Add-New-Connection][1] + +A list of the available connections will appear as below. Select FrontlineSync and click ‘Next’. + +![Select connection][2] +This will create a new connection by default named 'FrontlineSync'. Click 'Next' unless you wish to set a particular name for the connection. + +![connection name][3] +You can ignore the next screen and click 'Create' to complete the set up as the page simply confirms your options + +Your new connection will now appear on your Connections page. The connection will have be set to 'Connecting status (Orange light)' while it waits to complete the connection to the Android App. + +![Connecting state][4] +Your work on FrontlineSMS is now done and you now need to enter details into the Android app. + +#Step 2: Installing FrontlineSync and connecting the app + +If not downloaded already, please visit the Google Play Store and download FrontlineSync onto your Android. FrontlineSync is compatible with Android versions 2.3.0 and above. After completing the installation, open the application to configure your connection: + +![Select type][5] + +Select the the Frontline product which you would like to link FrontlineSync to, in this case, FrontlineSMS +Enter your Android Identifier and Passcode which were generated in the final step of setting up your new connection in your FrontlineSMS workspace. You will also need to enter the address of your FrontlineSMS computer; see further details on how to get this address. +You can define a port number of your choice in this step, however the application will append port 8130 by default if not set. The protocol expected is http:// and this will also be auto-completed if missing. + +![Connect with passcode][6] + +The app will now try to contact your FrontlineSMS workspace. It will only proceed to Step 3 if successful. Progressing from Step 2/4 will also auto the connection status in FrontlineSMS from Orange to Green. +Once a connection has been reached you need to set the data that you would like FrontlineSync to handle. Here you can also set the frequency that the FrontlineSync will communicate with FrontlineSMS; a lower number here will mean FrontlineSync checks with FrontlineSMS more regularly but can affect your Android's battery life. + +You are all set! Next you will be taken to the app's dashboard. See more details on the dashboard. + +![Options][7] + +If you now return to FrontlineSMS, you will now see that the FrontlineSync connection status is now green showing that there is communication with your Android phone. If you expand the connection options link, you will see that the Options you chose in set up match what you set up on the Android. +![green connected][8] + +# Troubleshooting tips +If you notice that your FrontlineSync connection is not sending or receiving messages and uploading missed calls: +* Check that the application on your Android app has not been switched off. +* Check that you have configured your sync settings. +* Ensure that you have got enough mobile phone credit and that the phone is connected to Internet. +* Ensure that the connection is not disabled on FrontlineSMS. +* Check that the Connection is placed first on top of your routing rules. +* The sending limit for bulk messages depends on your Android version. FrontlineSMS alerts you when you exceed the limit and when you click deny the items will remain in the pending messages folder. + +![SMS exceeded][9] + +[1]: ../images/help/smssync/1.1.Add-New-Connection.jpg +[2]: ../images/help/smssync/1.2.Select-Modem-Type.jpg +[3]: ../images/help/smssync/1.3.Connection-Name.jpg +[4]: ../images/help/smssync/1.4.orange_connection.jpg +[5]: ../images/help/smssync/2.1.config.jpg +[6]: ../images/help/smssync/2.2.passcode_and_ip.jpg +[7]: ../images/help/smssync/2.3.options.jpg +[8]: ../images/help/smssync/3.1.green_connection.jpg +[9]: ../images/help/smssync/3.2.too_many_sms.jpg From 5cb6e63623844d2f612ff7b86c6f7248dd4d269f Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:28:29 +0300 Subject: [PATCH 2654/2668] article on how to find your FrontlineSMS on a LAN --- .../help/settings/4d.finding_on_a_lan.txt | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt new file mode 100644 index 000000000..1e96561e5 --- /dev/null +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt @@ -0,0 +1,39 @@ +# Connecting FrontlineSync to FrontlineSMS on a local network + +A smartphone running FrontlineSync can communicate with your computer running FrontlineSMS over an existing local network (LAN), via smartphone tethering, or through a public-facing IP over the Internet. + +#RECOMMENDED: Connecting FrontlineSMS and FrontlineSync over an existing local network (LAN). + +1. Ensure that your computer running FrontlineSMS is connected to your local network, your LAN is probably handled using by a router. + +2. Connect your Android smartphone running FrontlineSync to your local network via WiFi. + +3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) + +4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. + +5. Please note that your router may assign a new IP address to your FrontlineSMS machine every so often, or if your machine reconnects to the local network. If this occurs, you will need to repeat steps 3 and 4 to check the IP hasn't changed. If it has changed it is a simple update that only needs to be done on the FrontlineSync connection configuration settings on your Android. +It is possible to configure your router to assign the same local IP address to your machine each time. Contact your network administrator or consult your router’s manual for more details. + + #Connecting FrontlineSMS and FrontlineSync via smartphone tethering. + +1. Set up your smartphone as a wireless hotspot or source a connecting USB cable. (Note: Some carriers may restrict this functionality or require an additional fee to enable it.) + +2. Connect your computer running FrontlineSMS to the smartphone-created WiFi network or via the cable. (Note that your computer’s internet connection will transfer from WiFi to your smartphone’s data connection if using the hotspot route.) + +3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) + +4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. + +#ADVANCED USERS: Connecting FrontlineSMS and FrontlineSync via public IP + +1. If your computer running FrontlineSMS is accessible over the Internet via a public IP address (or a DNS service), you can connect to it with any Internet-connected smartphone running FrontlineSync wherever located. Consider contacting your network administrator if you wish to take advantage of this setup. + +2. Connect your smartphone running FrontlineSync to the Internet. + +3. Look up the public IP address you wish to use. Google will automatically report your public IP address if you search for “what is my IP”. [This Google search shows useful results]. You will probably need to set this up manually with network administration and/or you FrontlineSMS computer's DNS settings. + +4. You will probably need to set up ‘port forwarding’ on your network’s router to forward to the host computer. FrontlineSMS uses port 8130 by default so if you want to use the public IP on a different port it is easiest to forward port 8130 to your required port. 8130 will be the internal port whereas the service port will be your new chosen port. + +5. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. + From 8393b01c7922289dae79d284a2313a0b2c45118f Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:31:47 +0300 Subject: [PATCH 2655/2668] Added link in creation page to pan page --- .../help/settings/10.Custom_routing_rules | 54 ------------------- .../4c.connecting_to_frontlinesync.txt | 3 +- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules b/plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules deleted file mode 100644 index 72991cc30..000000000 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/10.Custom_routing_rules +++ /dev/null @@ -1,54 +0,0 @@ -# Creating Rules for Sending Messages Through Multiple Phone Numbers or Connections - -FrontlineSMS is highly configurable, meaning many features in the application will help you send messages in a useful way. One of the most powerful tools for this is configuring routing rules, in which you can select how to messages through a variety of your phone numbers. - -If you only have a single connection, such as through one modem, then messages will always send and receive through that single connection. But once you add an additional connection, such as an additional modem or an Android phone using SMSSync, FrontlineSMS will allow you to create rules for sending outgoing messages. - -In other words, routing rules allow you to set your own preferences for sending messages, and improve the chances that your messages will be delivered to the people you are trying to reach. - -This help file explains how to create these routing rules. - -If you would like to set routing rules, click "Settings" in the upper right-hand corner of your screen, then "Phones and Connections." Your screen should now look something like the one below (although perhaps with fewer connections than our test account): - -![Connection routing rules][1] - -Now you can create routing rules following the steps below. - -1. First, make sure you have all of your connections configured. This could be multiple modems, a modem and an instance of SMSSync, or a combination of these. - -You will then see a list of options, as in the screenshot above. - -2. Next, decide whether outgoing messages should be sent through the most recent number used by the people you are trying to reach. - -In many cases, the people you are trying to reach will message the number they are most familiar with. Therefore, you can instruct FrontlineSMS to send outgoing messages through that same number. - -For instance, if Jane is trying to reach you and has your Android telephone number, you probably want to respond to Jane through that same number. If you respond through a different phone number, she may not know who you are! To always reply to someone through the same number they messaged most recently, select the very first box, as indicated in the screenshot below. - -![Connection routing rules 2][2] - -3. Now decide the priority order for other connections in your list. - -You can also set the priority order for the other phone numbers you have connections with. Note that you can do this whether or not you have selected the box to send messages through the most recent number contacts have messaged. This is useful for: - -- situations in which you are messaging contacts for the first time, because you can prioritize the least expensive or most reliable phone number -- forcing FrontlineSMS to use your preferred phone number, no matter how other contacts have reached you -- prioritizing how FrontlineSMS will message someone if a phone number fails; in other words, if FrontlineSMS cannot reach someone through your first preferred connection, it will try again on the second most preferred connection, and so on - -In order to create a prioritized list, you can 'drag and drop' your phone numbers to create your preferred order. Below is one example. Let's say the third connection on your list is actually the one you prefer to use for sending most messages. You can 'grab' the number by hovering over the left-hand tab with your cursor, where the arrow is pointing in the screenshot below. - -4. Finally, be sure to deselect any phone numbers you do not want FrontlineSMS to use. - -In the event that you do NOT want FrontlineSMS to use a certain phone number, you can simply deselect it in the list by clicking on the relevant box and ensuring the checkmark disappears. - -**Note: remember to save your selection!** - -## Related topics: -[Manually Adding A Device][3] -[SMSSync][4] - - -[1]: ../images/help/ConnectionsRoutingRules.png -[2]: ../images/help/ConnectionsRoutingRules2.png -[3]: ../settings/5.manually_adding_device.txt -[4]: ../settings/9.smssync.txt - diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt index d92fb04fe..8841b2206 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt @@ -34,7 +34,7 @@ If not downloaded already, please visit the Google Play Store and download Front ![Select type][5] Select the the Frontline product which you would like to link FrontlineSync to, in this case, FrontlineSMS -Enter your Android Identifier and Passcode which were generated in the final step of setting up your new connection in your FrontlineSMS workspace. You will also need to enter the address of your FrontlineSMS computer; see further details on how to get this address. +Enter your Android Identifier and Passcode which were generated in the final step of setting up your new connection in your FrontlineSMS workspace. You will also need to enter the address of your FrontlineSMS computer; [see further details on how to get this address][10]. You can define a port number of your choice in this step, however the application will append port 8130 by default if not set. The protocol expected is http:// and this will also be auto-completed if missing. ![Connect with passcode][6] @@ -69,3 +69,4 @@ If you notice that your FrontlineSync connection is not sending or receiving mes [7]: ../images/help/smssync/2.3.options.jpg [8]: ../images/help/smssync/3.1.green_connection.jpg [9]: ../images/help/smssync/3.2.too_many_sms.jpg +[10]: settings/4d.finding_on_a_lan From 47bc1ba0eb19ec29df8d79e7e276686c70c8383f Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 15:36:08 +0300 Subject: [PATCH 2656/2668] Edits to the Index page --- .../grails-app/views/help/_index.gsp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp index e67b25b73..47b7c1ec5 100644 --- a/plugins/frontlinesms-core/grails-app/views/help/_index.gsp +++ b/plugins/frontlinesms-core/grails-app/views/help/_index.gsp @@ -71,18 +71,20 @@ * [How do I perform a simple search?][72] * ### Advanced * [How do I perform a much more detailed search?][74] -* ### Status - * [What is the Status Tab?][82] - * [How do I see how many messages I have sent or received?][87] -* ### Settings - * [How do I change the Language?][91] - * [How do I import Messages and Contacts?][92] - * [How do I password-protect my FrontlineSMS installation?][103] +* ### Connections + * [How do I set up FrontlineSync to work with FrontlineSMS?][106] + * [How do I locate my FrontlineSMS workspace so that I can connect it to FrontlineSync?][107] * [How do I use my modem/phone with FrontlineSMS?][94] * [How do I use my Android phone/SMSSync with FrontlineSMS?][95] * [How do I connect FrontlineSMS to a Short Message Service Center (SMSC)?][96] * [How do I edit/delete a Connection?][97] * [How do I get FrontlineSMS to detect my device?][98] +* ### Settings + * [How do I change the Language?][91] + * [How do I import Messages and Contacts?][92] + * [What are Usage Statistics?][82] + * [How do I see how many messages I have sent or received?][87] + * [How do I password-protect my FrontlineSMS installation?][103] * [How do I translate the interface into my language?][99] * [How do I create rules for sending messages through multiple Connections][104] @@ -152,4 +154,6 @@ [103]: settings/8.basic_auth [104]: settings/10.custom_routing_rules [105]: activities/11.custom_activity_builder +[106]: settings/4c.connecting_to_frontlinesync +[107]: settings/4d.finding_on_a_lan From f1c2b88b7542cd0bf8bc2ddbc51a0ad86b41e916 Mon Sep 17 00:00:00 2001 From: Pitkin Date: Tue, 20 May 2014 14:52:48 +0300 Subject: [PATCH 2657/2668] 2.4.0 content added from Jira ticket search --- .../grails-app/conf/help/features/new.txt | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt index 6d4dc1e60..c506a19b1 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt @@ -1,10 +1,35 @@ # New features in FrontlineSMS v 2.4 ## A new Android gateway! ### FrontlineSync -Details of FrontlineSync +FrontlineSync is an Android app (running on v. 2.3 and up) which lets you easily send and receive messages to and from FrontlineSMS — even if your Android phone is in a different location from you. FrontlineSync also registers missed calls to the phone in your FrontlineSync or FrontlineCloud workspace. -## Numerous UI improvements and bug fixes +There are some basic requirements for this to work: your Android phone will need to be on, and have access both to a mobile signal and wifi or data signal, with an appropriate plan; also, you will need the FrontlineSync application to be installed and synced with FrontlineSMS. After that, any messages you send will be routed through your Android phone … and incoming messages will be routed back to your inbox. All with a local number! +## New features +1. Now you can register Missed Calls in FrontlineSMS using FrontlineSync +2. Alongside SMSSync and USB modems, FrontlineSync provides another even more stable way of sending and receiving SMS +3. FrontlineSync has performed faster in our tests when sending multiple SMS +4. Import contacts using the vCard/VCF file format + +## General improvements and interface updates +1. The link to the Connections management screen was moved up into the top navigation to make it easier to access. The old 'Status' information is now positioned to in the Settings section under 'Usage Statistics' +2. There is now more comprehensive support (UCS2) of special characters such as Arabic when handling message sending, viewing and exporting +3. New Send Message window is now just 1 simple screen to send a Quick Message +4. Improvements to the contact import review screen allow faster and more detailed editing of contacts +5. Routing rules on the Connections tab are new and improved +6. We added a new icon set to associate objects in the app more clearly and consistently +7. Activities listed in the Messages view no longer have the type of Activity shown to save space +8. Added a short-cut in Activity builders to allow you to create new groups without having to navigate back to the Contacts section +9. Message count in top navigation is now grey when no new messages exist +10. You can now edit the name of a connection directly in the Connections list +11. While editing inline on the Contacts or Connections screen, you can now undo your edits with the ESC key + +## Important bug fixes + * Importing large numbers of contacts is now much more stable and works in the background. Meaning it returns the response once done and does not require you to wait. + * Some variable replacement was not working when using the 'magic wand' feature in Activities + * Notifications on new messages were sometimes counting from the wrong folders + * Various bug fixes in the contact and groups management interface + ## And stay tuned ... We have improved our release process to ensure FrontlineSMS receives more bug fixes more quickly. From 13dcf9733f9bb8e87aea65105ba31e64589e61a8 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 14:17:29 +0300 Subject: [PATCH 2658/2668] Corrected name of 4.0 migrations file --- .../migrations/{changelog-v2.4.groovy => changelog-4.0.groovy} | 0 .../frontlinesms-core/grails-app/migrations/changelog.groovy | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename plugins/frontlinesms-core/grails-app/migrations/{changelog-v2.4.groovy => changelog-4.0.groovy} (100%) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-4.0.groovy similarity index 100% rename from plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy rename to plugins/frontlinesms-core/grails-app/migrations/changelog-4.0.groovy diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy index 60ce82197..8990c7378 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy @@ -27,6 +27,6 @@ databaseChangeLog = { include file: 'changelog-3.1.groovy' - include file: 'changelog-v2.4.groovy' + include file: 'changelog-4.0.groovy' } From 7b76b5fc62b7628151fee979a2a6fb604e6534e3 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 16:00:52 +0300 Subject: [PATCH 2659/2668] core-4.x Corrected frontlinesync help image paths --- .../4c.connecting_to_frontlinesync.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt index 8841b2206..fd7ca2b90 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt @@ -60,13 +60,13 @@ If you notice that your FrontlineSync connection is not sending or receiving mes ![SMS exceeded][9] -[1]: ../images/help/smssync/1.1.Add-New-Connection.jpg -[2]: ../images/help/smssync/1.2.Select-Modem-Type.jpg -[3]: ../images/help/smssync/1.3.Connection-Name.jpg -[4]: ../images/help/smssync/1.4.orange_connection.jpg -[5]: ../images/help/smssync/2.1.config.jpg -[6]: ../images/help/smssync/2.2.passcode_and_ip.jpg -[7]: ../images/help/smssync/2.3.options.jpg -[8]: ../images/help/smssync/3.1.green_connection.jpg -[9]: ../images/help/smssync/3.2.too_many_sms.jpg +[1]: ../images/help/frontlinesync/1.1.Add-New-Connection.jpg +[2]: ../images/help/frontlinesync/1.2.Select-Modem-Type.jpg +[3]: ../images/help/frontlinesync/1.3.Connection-Name.jpg +[4]: ../images/help/frontlinesync/1.4.orange_connection.jpg +[5]: ../images/help/frontlinesync/2.1.config.jpg +[6]: ../images/help/frontlinesync/2.2.passcode_and_ip.jpg +[7]: ../images/help/frontlinesync/2.3.options.jpg +[8]: ../images/help/frontlinesync/3.1.green_connection.jpg +[9]: ../images/help/frontlinesync/3.2.too_many_sms.jpg [10]: settings/4d.finding_on_a_lan From 7995dc48142df93f84c2ad5c876dbfb40cd2c4bf Mon Sep 17 00:00:00 2001 From: ptkn Date: Tue, 20 May 2014 16:06:54 +0300 Subject: [PATCH 2660/2668] QA fixes to wording --- .../grails-app/conf/help/features/new.txt | 4 +-- .../4c.connecting_to_frontlinesync.txt | 2 +- .../help/settings/4d.finding_on_a_lan.txt | 30 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt index c506a19b1..1cae9a363 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/features/new.txt @@ -1,9 +1,9 @@ # New features in FrontlineSMS v 2.4 ## A new Android gateway! ### FrontlineSync -FrontlineSync is an Android app (running on v. 2.3 and up) which lets you easily send and receive messages to and from FrontlineSMS — even if your Android phone is in a different location from you. FrontlineSync also registers missed calls to the phone in your FrontlineSync or FrontlineCloud workspace. +FrontlineSync is an Android app (running on v. 2.3 and up) which lets you easily send and receive messages to and from FrontlineSMS - even if your Android phone is in a different location from you. FrontlineSync also registers missed calls to the phone in your FrontlineSync or FrontlineCloud workspace. -There are some basic requirements for this to work: your Android phone will need to be on, and have access both to a mobile signal and wifi or data signal, with an appropriate plan; also, you will need the FrontlineSync application to be installed and synced with FrontlineSMS. After that, any messages you send will be routed through your Android phone … and incoming messages will be routed back to your inbox. All with a local number! +There are some basic requirements for this to work: your Android phone will need to be on, and have access both to a mobile signal and wifi or data signal, with an appropriate plan; also, you will need the FrontlineSync application to be installed and synced with FrontlineSMS. After that, any messages you send will be routed through your Android phone, and incoming messages will be routed back to your inbox. All with a local number! ## New features 1. Now you can register Missed Calls in FrontlineSMS using FrontlineSync diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt index fd7ca2b90..4a388886b 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4c.connecting_to_frontlinesync.txt @@ -14,7 +14,7 @@ Navigate to the connections tab in FrontlineSMS and click on the 'Add new conn ![Add-New-Connection][1] -A list of the available connections will appear as below. Select FrontlineSync and click ‘Next’. +A list of the available connections will appear as below. Select FrontlineSync and click 'Next'. ![Select connection][2] This will create a new connection by default named 'FrontlineSync'. Click 'Next' unless you wish to set a particular name for the connection. diff --git a/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt b/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt index 1e96561e5..abc504789 100644 --- a/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt +++ b/plugins/frontlinesms-core/grails-app/conf/help/settings/4d.finding_on_a_lan.txt @@ -4,36 +4,36 @@ A smartphone running FrontlineSync can communicate with your computer running Fr #RECOMMENDED: Connecting FrontlineSMS and FrontlineSync over an existing local network (LAN). -1. Ensure that your computer running FrontlineSMS is connected to your local network, your LAN is probably handled using by a router. +1. Ensure that your computer running FrontlineSMS is connected to your local network, your LAN is probably handled using by a router. -2. Connect your Android smartphone running FrontlineSync to your local network via WiFi. +2. Connect your Android smartphone running FrontlineSync to your local network via WiFi. -3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) +3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) -4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. +4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. -5. Please note that your router may assign a new IP address to your FrontlineSMS machine every so often, or if your machine reconnects to the local network. If this occurs, you will need to repeat steps 3 and 4 to check the IP hasn't changed. If it has changed it is a simple update that only needs to be done on the FrontlineSync connection configuration settings on your Android. +5. Please note that your router may assign a new IP address to your FrontlineSMS machine every so often, or if your machine reconnects to the local network. If this occurs, you will need to repeat steps 3 and 4 to check the IP hasn't changed. If it has changed it is a simple update that only needs to be done on the FrontlineSync connection configuration settings on your Android. It is possible to configure your router to assign the same local IP address to your machine each time. Contact your network administrator or consult your router’s manual for more details. - #Connecting FrontlineSMS and FrontlineSync via smartphone tethering. +# Connecting FrontlineSMS and FrontlineSync via smartphone tethering. -1. Set up your smartphone as a wireless hotspot or source a connecting USB cable. (Note: Some carriers may restrict this functionality or require an additional fee to enable it.) +1. Set up your smartphone as a wireless hotspot or source a connecting USB cable. (Note: Some carriers may restrict this functionality or require an additional fee to enable it.) -2. Connect your computer running FrontlineSMS to the smartphone-created WiFi network or via the cable. (Note that your computer’s internet connection will transfer from WiFi to your smartphone’s data connection if using the hotspot route.) +2. Connect your computer running FrontlineSMS to the smartphone-created WiFi network or via the cable. (Note that your computer’s internet connection will transfer from WiFi to your smartphone’s data connection if using the hotspot route.) -3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) +3. Look up your computer’s local IP address. (There is a useful document written by LinkSys on how to find this) -4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. +4. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. #ADVANCED USERS: Connecting FrontlineSMS and FrontlineSync via public IP -1. If your computer running FrontlineSMS is accessible over the Internet via a public IP address (or a DNS service), you can connect to it with any Internet-connected smartphone running FrontlineSync wherever located. Consider contacting your network administrator if you wish to take advantage of this setup. +1. If your computer running FrontlineSMS is accessible over the Internet via a public IP address (or a DNS service), you can connect to it with any Internet-connected smartphone running FrontlineSync wherever located. Consider contacting your network administrator if you wish to take advantage of this setup. -2. Connect your smartphone running FrontlineSync to the Internet. +2. Connect your smartphone running FrontlineSync to the Internet. -3. Look up the public IP address you wish to use. Google will automatically report your public IP address if you search for “what is my IP”. [This Google search shows useful results]. You will probably need to set this up manually with network administration and/or you FrontlineSMS computer's DNS settings. +3. Look up the public IP address you wish to use. Google will automatically report your public IP address if you search for “what is my IP”. [This Google search shows useful results]. You will probably need to set this up manually with network administration and/or you FrontlineSMS computer's DNS settings. -4. You will probably need to set up ‘port forwarding’ on your network’s router to forward to the host computer. FrontlineSMS uses port 8130 by default so if you want to use the public IP on a different port it is easiest to forward port 8130 to your required port. 8130 will be the internal port whereas the service port will be your new chosen port. +4. You will probably need to set up ‘port forwarding’ on your network’s router to forward to the host computer. FrontlineSMS uses port 8130 by default so if you want to use the public IP on a different port it is easiest to forward port 8130 to your required port. 8130 will be the internal port whereas the service port will be your new chosen port. -5. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. +5. On your Android phone, open FrontlineSync and select 'Connect to FrontlineSMS'. In Step 2 of 4 of the FrontlineSync configuration menu, you will need to enter the IP address of the computer running FrontlineSMS in the third field after entering the auto-generated ID and Passcode. From ed29626512fcd1a13bbe2cce104c55c4af153827 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Tue, 20 May 2014 16:28:55 +0300 Subject: [PATCH 2661/2668] core-4.x Merge CORE-1288 --- .../grails-app/taglib/frontlinesms2/FsmsTagLib.groovy | 3 ++- plugins/frontlinesms-core/web-app/js/inline_editable.js | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy index eb9707f85..2754cfbc0 100644 --- a/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy +++ b/plugins/frontlinesms-core/grails-app/taglib/frontlinesms2/FsmsTagLib.groovy @@ -709,8 +709,9 @@ class FsmsTagLib { def inlineEditable = { att -> def domainClassName = att.instance.class.name def currentValue = att.instance."${att.field}" + def currentValueSize = currentValue.length() + 20 def classes = "inline-editable ${att.class ?: ''}" - out << "" + out << "" out << '' } diff --git a/plugins/frontlinesms-core/web-app/js/inline_editable.js b/plugins/frontlinesms-core/web-app/js/inline_editable.js index 68d71c8fb..a3f4a3d4a 100644 --- a/plugins/frontlinesms-core/web-app/js/inline_editable.js +++ b/plugins/frontlinesms-core/web-app/js/inline_editable.js @@ -31,6 +31,7 @@ InlineEditable = function() { }, success:handleServerResponse }); + $(e.target).attr('size', $(this).val().length + 20); }, toggleFormEnabled = function(enabled, targetElement) { if (enabled) { @@ -66,9 +67,6 @@ InlineEditable = function() { targetElement.parent().append(""); } }, - resizeToFit = function(selector) { - $(selector).attr('size', Math.max($(this).val().length + 5, 20)); - }; init(); }; From 4119a83a8ea9ab420e1b262d564249b0d29dddd8 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 21 May 2014 10:22:01 +0300 Subject: [PATCH 2662/2668] core-4.x Reverted renamed migration file --- .../migrations/{changelog-4.0.groovy => changelog-v2.4.groovy} | 0 .../frontlinesms-core/grails-app/migrations/changelog.groovy | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename plugins/frontlinesms-core/grails-app/migrations/{changelog-4.0.groovy => changelog-v2.4.groovy} (100%) diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog-4.0.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy similarity index 100% rename from plugins/frontlinesms-core/grails-app/migrations/changelog-4.0.groovy rename to plugins/frontlinesms-core/grails-app/migrations/changelog-v2.4.groovy diff --git a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy index 8990c7378..60ce82197 100644 --- a/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy +++ b/plugins/frontlinesms-core/grails-app/migrations/changelog.groovy @@ -27,6 +27,6 @@ databaseChangeLog = { include file: 'changelog-3.1.groovy' - include file: 'changelog-4.0.groovy' + include file: 'changelog-v2.4.groovy' } From 9121cde7bc08a4d580b2781160c15f0a8beb2af3 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 21 May 2014 10:22:26 +0300 Subject: [PATCH 2663/2668] core-4.x Update version for 2.4.1 build --- plugins/frontlinesms-core/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/frontlinesms-core/application.properties b/plugins/frontlinesms-core/application.properties index 2cd301f50..4beb52470 100644 --- a/plugins/frontlinesms-core/application.properties +++ b/plugins/frontlinesms-core/application.properties @@ -1,9 +1,9 @@ #Grails Metadata file -#Tue May 13 15:24:58 EAT 2014 +#Wed May 21 09:55:52 EAT 2014 app.grails.version=2.0.3 app.name=frontlinesms-core app.servlet.version=2.5 -app.version=4.1-SNAPSHOT +app.version=4.1 plugins.rest-client-builder=1.0.2 plugins.spock=0.6 sprint.number=78 From fbb324dcac31ffc640f0715e0051f32dc657d733 Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 21 May 2014 16:24:08 +0300 Subject: [PATCH 2664/2668] core-4.x Add a README to tld of repo --- README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..e69de29bb From 23a0b180cfddfdc35bce91deece13d458536611d Mon Sep 17 00:00:00 2001 From: lesiki Date: Wed, 21 May 2014 16:33:23 +0300 Subject: [PATCH 2665/2668] Updated root README --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index e69de29bb..60feadad2 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,14 @@ +# FrontlineSMS v2 +## What is FrontlineSMS v2? +[FrontlineSMS](http://www.frontlinesms.com) is desktop/cloud based software created to lower barriers to positive social change using mobile technology. Its second version is built as a [Grails](http://grails.org/) app, which can either run stand-alone as a desktop app, or be bundled as the 'frontlinesms-core-multitenant' plugin that forms the core of [FrontlineCloud](http://cloud.frontlinesms.com). + +## Repository layout +In the plugins folder, you will find: +- *frontlinesms-core*, the Grails core codebase for FrontlineSMS v2 +- *radio*, the Grails codebase for [FrontlineSMS:Radio](http://www.frontlinesms.com/technologies/beta-products/), which uses frontlinesms-core as a plugin + +This repository is updated on every public release of FrontlineSMS v2. + +## Useful reading +- Overviews of [FrontlineSMS](http://www.frontlinesms.com/technologies/frontlinesms-overview/) and [FrontlineCloud](http://www.frontlinesms.com/technologies/frontlinecloud-overview/) +- [Grails documentation](https://grails.org/) From 994c86db93ff5601a0753d2e482b4f2a2f3394a2 Mon Sep 17 00:00:00 2001 From: lesiki Date: Wed, 21 May 2014 16:40:30 +0300 Subject: [PATCH 2666/2668] Update frontlinesms-core README --- plugins/frontlinesms-core/README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/frontlinesms-core/README.md b/plugins/frontlinesms-core/README.md index 7f222c95e..12a76d0b1 100644 --- a/plugins/frontlinesms-core/README.md +++ b/plugins/frontlinesms-core/README.md @@ -1,10 +1,11 @@ -Grails 2 Upgrade -================ +# FrontlineSMS v2 core codebase -# Testing +This folder contains +- the codebase for FrontlineSMS 2.x in the standard Grails application layout (grails-app, src, test, web-app, etc) +- Utility scripts, mainly in bash and groovy, in the 'do/' folder +- install4j & maven config for bundling the desktop version of FrontlineSMS in the 'install' folder -## Functional tests -Problems currently appear to be: -* override of `@href` in BootStrap not working - 'http://localhost:8080' is not stripped -* `$(...).jquery.*` not working - throws Exception -* database returns results in different orders now +Getting started +- Run `grails -Ddb.migrations=false run-app` to start the app in dev mode, with bootstrap data, and with database migrations disabled +- Run `grails test-app` to run our test suite, and `do/test_backup` to open the results in a browser +- Run `grails dependency-report` to view the list of plugin dependencies. If you need access to a FrontlineSMS-developed plugin that is not available in a public repo, please let us know via a github issue. From d24a7a67289c16ac4f091c914567305562ceffab Mon Sep 17 00:00:00 2001 From: Sitati Kituyi Date: Wed, 21 May 2014 16:47:12 +0300 Subject: [PATCH 2667/2668] core-4.x Added link to google group in README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 60feadad2..ddff10015 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,4 @@ This repository is updated on every public release of FrontlineSMS v2. ## Useful reading - Overviews of [FrontlineSMS](http://www.frontlinesms.com/technologies/frontlinesms-overview/) and [FrontlineCloud](http://www.frontlinesms.com/technologies/frontlinecloud-overview/) - [Grails documentation](https://grails.org/) +- [FrontlineSMS developers google group](https://groups.google.com/forum/#!forum/frontlinesms-developers) From b67345a2799c9ae1201499990cf5bb447a9c3a71 Mon Sep 17 00:00:00 2001 From: Gabe Date: Wed, 22 Apr 2015 13:33:30 -0400 Subject: [PATCH 2668/2668] Test the file --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ddff10015..d8295838f 100644 --- a/README.md +++ b/README.md @@ -13,3 +13,4 @@ This repository is updated on every public release of FrontlineSMS v2. - Overviews of [FrontlineSMS](http://www.frontlinesms.com/technologies/frontlinesms-overview/) and [FrontlineCloud](http://www.frontlinesms.com/technologies/frontlinecloud-overview/) - [Grails documentation](https://grails.org/) - [FrontlineSMS developers google group](https://groups.google.com/forum/#!forum/frontlinesms-developers) +-Just testing \ No newline at end of file

      -

      +

      +
      +


      @@ -10,12 +12,10 @@ %>
      +
      -

      -
      -
      - -
      -
      -

      +       + Android app on Google Play +