diff --git a/app/release.json b/app/release.json new file mode 100644 index 00000000..a254e10f --- /dev/null +++ b/app/release.json @@ -0,0 +1,5 @@ +{ + "version": "1.26.0", + "releasedate": "22/Dec/14" +} + diff --git a/app/scripts/controllers/main/MainController.js b/app/scripts/controllers/main/MainController.js index c4dda6bc..f78d8595 100644 --- a/app/scripts/controllers/main/MainController.js +++ b/app/scripts/controllers/main/MainController.js @@ -1,10 +1,12 @@ (function (module) { mifosX.controllers = _.extend(module, { MainController: function (scope, location, sessionManager, translate, $rootScope, localStorageService, keyboardManager, $idle, tmhDynamicLocale, uiConfigService) { - $.get('VERSION.txt', function(data) { scope.version = data } ); - scope.releasedate = "22/Dec/14"; //Day/Month/Year + $.getJSON('release.json', function(data) { + scope.version = data.version; + scope.releasedate = data.releasedate; + } ); uiConfigService.init(); - //hides loader + //hides loader scope.domReady = true; scope.activity = {}; scope.activityQueue = []; @@ -128,12 +130,12 @@ if (mifosX.models.Langs[i].code == temp.code) { scope.optlang = mifosX.models.Langs[i]; tmhDynamicLocale.set(mifosX.models.Langs[i].code); - } + } } } else { scope.optlang = scope.langs[0]; tmhDynamicLocale.set(scope.langs[0].code); - } + } translate.uses(scope.optlang.code); scope.isActive = function (route) { @@ -237,81 +239,81 @@ localStorageService.addToLocalStorage('Language', lang); tmhDynamicLocale.set(lang.code); scope.optlang = lang; - }; - scope.helpf = function() - { - // first, create addresses array - var addresses = ["https://mifosforge.jira.com/wiki/display/docs/User+Setup","https://mifosforge.jira.com/wiki/display/docs/Organization", - "https://mifosforge.jira.com/wiki/display/docs/System", "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=products&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67141762","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=report&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=accounting&startIndex=0&where=docs", "https://mifosforge.jira.com/wiki/display/docs/Manage+Clients", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Groups","https://mifosforge.jira.com/wiki/display/docs/Manage+Centers", - "https://mifosforge.jira.com/wiki/display/docs/Community+App+User+Manual","https://mifosforge.jira.com/wiki/display/docs/Manage+Offices", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Holidays","https://mifosforge.jira.com/wiki/display/docs/Manage+Employees", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Funds","https://mifosforge.jira.com/wiki/display/docs/Bulk+Loan+Reassignment", - "https://mifosforge.jira.com/wiki/display/docs/Currency+Configuration","https://mifosforge.jira.com/wiki/display/docs/Standing+Instructions+History", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Data+Tables","https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67895350", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Roles+and+Permissions","https://mifosforge.jira.com/wiki/display/docs/Maker-Checker", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Hooks","https://mifosforge.jira.com/wiki/display/docs/Audit+Trails", - "https://mifosforge.jira.com/wiki/display/docs/Manage+Reports","https://mifosforge.jira.com/wiki/display/docs/Manage+Scheduler+Jobs", - "https://mifosforge.jira.com/wiki/display/docs/Global+Configuration","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=account%20number%20preferences&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=loan%20products&startIndex=0&where=docs","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=saving%20products&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=charges&startIndex=0&where=docs","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=products%20mix&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=fixed%20deposit%20products&startIndex=0&where=docs","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=recurring%20deposit%20products&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67895308","https://mifosforge.jira.com/wiki/display/docs/Add+Journal+Entries", - "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=search%20journal%20entries&startIndex=0&where=docs", "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=accounts%20linked&startIndex=0&where=docs", - "https://mifosforge.jira.com/wiki/display/docs/Chart+of+Accounts+and+General+Ledger+Setup", "https://mifosforge.jira.com/wiki/display/docs/Closing+Entries", - "https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67895308","https://mifosforge.jira.com/wiki/display/docs/Accruals"]; - // array is huge, but working good - // create second array with address models - var addrmodels = ['/users/','/organization','/system','/products','/templates', '', '/accounting', - '/clients', '/groups','/centers','','/offices', '/holidays','/employees','/managefunds/', - '/bulkloan','/currconfig','/standinginstructions/history','/datatables','/codes','/admin/roles', - '/admin/viewmctasks','/hooks','/audit', '/reports','/jobs','/global','/accountnumberpreferences','/loanproducts', - '/savingproducts','/charges','/productmix', '/fixeddepositproducts','/recurringdepositproducts','/freqposting', - '/journalentry','/searchtransaction','/financialactivityaccountmappings','/accounting_coa', '/accounts_closure','/accounting_rules','/run_periodic_accrual']; - // * text-based address-recognize system * - var actualadr = location.absUrl(); // get full URL - var lastchar = 0; - for( var i = 0; i link to Search in Documentation word 'report' - else{ - for(var i = 0; i< addrmodels.length; i++) - { - if(i != 5 && i != 10) - { - if(whereweare == addrmodels[i]) - { - addrfound = true; - window.open(addresses[i]); - break; - // model found -> open address and break - } - } - }//for - }//else - if(addrfound == false) window.open(addresses[10]); // substring not matching to any model -> open start user manual page - - };//helpf - + }; + scope.helpf = function() + { + // first, create addresses array + var addresses = ["https://mifosforge.jira.com/wiki/display/docs/User+Setup","https://mifosforge.jira.com/wiki/display/docs/Organization", + "https://mifosforge.jira.com/wiki/display/docs/System", "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=products&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67141762","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=report&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=accounting&startIndex=0&where=docs", "https://mifosforge.jira.com/wiki/display/docs/Manage+Clients", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Groups","https://mifosforge.jira.com/wiki/display/docs/Manage+Centers", + "https://mifosforge.jira.com/wiki/display/docs/Community+App+User+Manual","https://mifosforge.jira.com/wiki/display/docs/Manage+Offices", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Holidays","https://mifosforge.jira.com/wiki/display/docs/Manage+Employees", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Funds","https://mifosforge.jira.com/wiki/display/docs/Bulk+Loan+Reassignment", + "https://mifosforge.jira.com/wiki/display/docs/Currency+Configuration","https://mifosforge.jira.com/wiki/display/docs/Standing+Instructions+History", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Data+Tables","https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67895350", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Roles+and+Permissions","https://mifosforge.jira.com/wiki/display/docs/Maker-Checker", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Hooks","https://mifosforge.jira.com/wiki/display/docs/Audit+Trails", + "https://mifosforge.jira.com/wiki/display/docs/Manage+Reports","https://mifosforge.jira.com/wiki/display/docs/Manage+Scheduler+Jobs", + "https://mifosforge.jira.com/wiki/display/docs/Global+Configuration","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=account%20number%20preferences&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=loan%20products&startIndex=0&where=docs","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=saving%20products&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=charges&startIndex=0&where=docs","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=products%20mix&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=fixed%20deposit%20products&startIndex=0&where=docs","https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=recurring%20deposit%20products&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67895308","https://mifosforge.jira.com/wiki/display/docs/Add+Journal+Entries", + "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=search%20journal%20entries&startIndex=0&where=docs", "https://mifosforge.jira.com/wiki/dosearchsite.action?queryString=accounts%20linked&startIndex=0&where=docs", + "https://mifosforge.jira.com/wiki/display/docs/Chart+of+Accounts+and+General+Ledger+Setup", "https://mifosforge.jira.com/wiki/display/docs/Closing+Entries", + "https://mifosforge.jira.com/wiki/pages/viewpage.action?pageId=67895308","https://mifosforge.jira.com/wiki/display/docs/Accruals"]; + // array is huge, but working good + // create second array with address models + var addrmodels = ['/users/','/organization','/system','/products','/templates', '', '/accounting', + '/clients', '/groups','/centers','','/offices', '/holidays','/employees','/managefunds/', + '/bulkloan','/currconfig','/standinginstructions/history','/datatables','/codes','/admin/roles', + '/admin/viewmctasks','/hooks','/audit', '/reports','/jobs','/global','/accountnumberpreferences','/loanproducts', + '/savingproducts','/charges','/productmix', '/fixeddepositproducts','/recurringdepositproducts','/freqposting', + '/journalentry','/searchtransaction','/financialactivityaccountmappings','/accounting_coa', '/accounts_closure','/accounting_rules','/run_periodic_accrual']; + // * text-based address-recognize system * + var actualadr = location.absUrl(); // get full URL + var lastchar = 0; + for( var i = 0; i link to Search in Documentation word 'report' + else{ + for(var i = 0; i< addrmodels.length; i++) + { + if(i != 5 && i != 10) + { + if(whereweare == addrmodels[i]) + { + addrfound = true; + window.open(addresses[i]); + break; + // model found -> open address and break + } + } + }//for + }//else + if(addrfound == false) window.open(addresses[10]); // substring not matching to any model -> open start user manual page + + };//helpf + sessionManager.restore(function (session) { scope.currentSession = session; scope.start(scope.currentSession); diff --git a/release.sh b/release.sh index dde16c67..9d91aa2b 100755 --- a/release.sh +++ b/release.sh @@ -1,11 +1,14 @@ #!/bin/bash VERSION=$1 +RELDATE=$2 -if [ -z $VERSION ]; then - echo -e "Version required.\nUsage: $0 version" +if [ -z $VERSION -o -z $RELDATE ]; then + echo -e "Version required.\nUsage: $0 version releasedate" fi echo "Updating version to $VERSION" -echo $VERSION > app/VERSION.txt + +DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +echo -e "{\n \"version\": \"$VERSION\",\n \"releasedate\": \"$RELDATE\"\n}\n" > $DIR/app/release.json