Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gambian customizations #190

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ android {
buildConfigField "String", "API_VERSION", '"3"'
buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en"'
buildConfigField "boolean", "IS_PAYMENT_ENABLED", 'false'
buildConfigField "boolean", "DISABLE_FAMILY_MODIFICATION", 'false'
resValue "string", "app_name_policies", "Policies"
resValue "string", "ReleaseDateValue", getDate()
}
Expand Down Expand Up @@ -124,7 +125,7 @@ android {
}
local {
applicationId "org.openimis.imispolicies.local"
buildConfigField "String", "API_BASE_URL", '"https://gambiatest.bluesquare.org/"'
buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
resValue "string", "app_name_policies", "Policies Local"
dimension = 'std'
Expand All @@ -150,6 +151,13 @@ android {
resValue "string", "app_name_policies", "Policies CNASS TRAIN"
dimension = 'std'
}
gambia {
applicationId "org.openimis.imispolicies.gambia"
buildConfigField "String", "API_BASE_URL", '"https://gambiatest.bluesquare.org/"'
buildConfigField "boolean", "DISABLE_FAMILY_MODIFICATION", 'true'
resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies Gambia"
dimension = 'std'
}
}
sourceSets {
chfDev.java.srcDir 'src/chf/java'
Expand Down Expand Up @@ -184,6 +192,9 @@ android {
}

mauritaniaTrain.java.srcDir 'src/master/java'

gambia.java.srcDir 'src/master/java'
gambia.res.srcDirs = ['src/master/res', 'src/localeMv/res']
}

// Apply custom flavours
Expand Down
5 changes: 5 additions & 0 deletions app/src/localeBepha/res/values-fr-rCM/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
<string name="MissingReceiptNo">Veuillez entrer le numéro de reçu.</string>
<string name="MissingProductCode">Veuillez entrer le code du Paquet de bénéfice</string>
<string name="MissingAmount">Veuillez entrer le montant</string>
<string name="MissingPayType">Veuillez sélectionner un type de paiement</string>
<string name="InvalidReceiptNo">Ce numéro de reçu est déjà utilisé.</string>
<string name="NoFiles">Aucun fichier trouvé.</string>
<string name="Of">De</string>
Expand Down Expand Up @@ -477,4 +478,8 @@
<string name="CurrentResourceLanguage">Current resource language: %1$s</string>
<string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
<string name="SupportedLanguages">Supported languages:\n%1$s</string>
<string name="pay_type_select_one">Selectionnez un mode de paiement</string>
<string name="pay_type_cash">Cash</string>
<string name="pay_type_mobile_phone">Téléphone portable</string>
<string name="pay_type_bank_transfer">Virement banquaire</string>
</resources>
5 changes: 5 additions & 0 deletions app/src/localeMv/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
<string name="MissingReceiptNo">Veuillez entrer le numéro de reçu.</string>
<string name="MissingProductCode">Veuillez entrer le code du Paquet de bénéfice</string>
<string name="MissingAmount">Veuillez entrer le montant</string>
<string name="MissingPayType">Veuillez sélectionner un type de paiement</string>
<string name="InvalidReceiptNo">Ce numéro de reçu est déjà utilisé.</string>
<string name="NoFiles">Aucun fichier trouvé.</string>
<string name="Of">De</string>
Expand Down Expand Up @@ -477,4 +478,8 @@
<string name="CurrentResourceLanguage">Current resource language: %1$s</string>
<string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
<string name="SupportedLanguages">Supported languages:\n%1$s</string>
<string name="pay_type_select_one">Selectionnez un mode de paiement</string>
<string name="pay_type_cash">Cash</string>
<string name="pay_type_mobile_phone">Téléphone portable</string>
<string name="pay_type_bank_transfer">Virement banquaire</string>
</resources>
5 changes: 5 additions & 0 deletions app/src/localeTchad/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
<string name="MissingReceiptNo">Veuillez entrer le numéro de reçu.</string>
<string name="MissingProductCode">Veuillez entrer le code du produit</string>
<string name="MissingAmount">Veuillez entrer le montant</string>
<string name="MissingPayType">Veuillez sélectionner un type de paiement</string>
<string name="InvalidReceiptNo">Ce numéro de reçu est déjà utilisé.</string>
<string name="NoFiles">Aucun fichier trouvé.</string>
<string name="Of">De</string>
Expand Down Expand Up @@ -478,4 +479,8 @@
<string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
<string name="SupportedLanguages">Supported languages:\n%1$s</string>
<string name="DataDownloadedFailed">Data download failed</string>
<string name="pay_type_select_one">Selectionnez un mode de paiement</string>
<string name="pay_type_cash">Cash</string>
<string name="pay_type_mobile_phone">Téléphone portable</string>
<string name="pay_type_bank_transfer">Virement banquaire</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/assets/JS/exact.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ $(document).ready(function(){
var $mandatory = $('[required]');
var passed = true;
$mandatory.each(function(){
if($(this).val() == "" || $(this).val() == 0 || $(this).val() == null){//|| $(this).val() == 0
if ($(this).val() == "" || $(this).val() == 0 || $(this).val() == null) {//|| $(this).val() == 0
// if(sessionStorage.getItem("FamilyData") == null){
// passed = false;
// }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/assets/pages/Enrollment.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<p><span id="msgAlert" class="ui-icon-alert" style="float:left; margin:2px 2px 2px 0;"></span></p>
</div>
<div>
<div class="topPanel">
<div class="topPanel" id="addNewPanel">
<img src="../images/plus.png" alt="New" class="plusButton" id="btnAddNew"/>
</div>

Expand Down
22 changes: 16 additions & 6 deletions app/src/main/assets/pages/Enrollment.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ $(document).ready(function () {
LoadFamilies();

var FamilyId = 0;
$('#btnAddNew').click(function () {
var url = 'Enrollment.html?f=' + FamilyId;
Android.SetUrl(url);
window.open("Family.html?f=0", "_self");
});
if (Android.isFamilyModificationDisabled()) {
$('#addNewPanel').hide();
} else {
$('#btnAddNew').click(function () {
var url = 'Enrollment.html?f=' + FamilyId;
Android.SetUrl(url);
window.open("Family.html?f=0", "_self");
});
}


$('.ulList li').click(function () {
Expand All @@ -18,7 +22,13 @@ $(document).ready(function () {
});

AssignDotClass();
contextMenu.createContextMenu([Android.getString('Edit'), Android.getString('Delete')], function () {
var menu;
if (Android.isFamilyModificationDisabled()) {
menu = [Android.getString('Edit')];
} else {
menu = [Android.getString('Edit'), Android.getString('Delete')];
}
contextMenu.createContextMenu(menu, function () {
var clicked = $(this).text();
if (clicked == Android.getString('Edit')) {
var url = 'Enrollment.html?f=' + FamilyId;
Expand Down
92 changes: 48 additions & 44 deletions app/src/main/assets/pages/FamilyAndInsurees.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ $(document).ready(function () {
window.open('Family.html?f=' + FamilyId);
});

$('#btnNewInsuree').click(function () {
var url = 'FamilyAndInsurees.html?f=' + FamilyId;
Android.SetUrl(url);
window.open('Insuree.html?f=' + FamilyId, '_self');
});
if (Android.isFamilyModificationDisabled()) {
$('#btnNewInsuree').hide();
} else {
$('#btnNewInsuree').click(function () {
var url = 'FamilyAndInsurees.html?f=' + FamilyId;
Android.SetUrl(url);
window.open('Insuree.html?f=' + FamilyId, '_self');
});
}


$('.ulList li').click(function () {
Expand All @@ -42,54 +46,54 @@ $(document).ready(function () {
window.open('FamilyPolicies.html?f=' + FamilyId + '&l=' + LocationId + '&r=' + RegionId + '&d=' + DistrictId, '_self');
});

if (!Android.isFamilyModificationDisabled()) {
AssignDotClass();
contextMenu.createContextMenu([Android.getString('Edit'), Android.getString('Delete')], function () {
var clicked = $(this).text();
if (clicked == Android.getString('Edit')) {
var url = 'FamilyAndInsurees.html?f=' + FamilyId;
Android.SetUrl(url);
window.open("Insuree.html?i=" + InsureeId + "&f=" + FamilyId, "_self");
}
else if (clicked == Android.getString('Delete')) {
//$("#divProgress").show();
var isOffline = $('#hfIsOffline').val();
var deletedSuccess = null;
$('#spPleaseWait').text(Android.getString('Deleting'));
if (isOffline == 0 || isOffline == 2) {

AssignDotClass();
contextMenu.createContextMenu([Android.getString('Edit'), Android.getString('Delete')], function () {
var clicked = $(this).text();
if (clicked == Android.getString('Edit')) {
var url = 'FamilyAndInsurees.html?f=' + FamilyId;
Android.SetUrl(url);
window.open("Insuree.html?i=" + InsureeId + "&f=" + FamilyId, "_self");
}
else if (clicked == Android.getString('Delete')) {
//$("#divProgress").show();
var isOffline = $('#hfIsOffline').val();
var deletedSuccess = null;
$('#spPleaseWait').text(Android.getString('Deleting'));
if (isOffline == 0 || isOffline == 2) {
$("#divProgress").show();

$("#divProgress").show();
deletedSuccess = parseInt(Android.DeleteOnlineData(InsureeId, 'I'));

deletedSuccess = parseInt(Android.DeleteOnlineData(InsureeId, 'I'));

}
else {

}
else {
deletedSuccess = Android.DeleteInsuree(InsureeId);
}

deletedSuccess = Android.DeleteInsuree(InsureeId);
}

if (deletedSuccess == 1) {
if (deletedSuccess == 1) {

$("#divProgress").hide();
//Android.ShowDialog(Android.getString('InsureeDeleted'));
window.open('FamilyAndInsurees.html?f=' + FamilyId + '&l=' + LocationId + '&r=' + RegionId + '&d=' + DistrictId, '_self');
}
else if (deletedSuccess == 2) {
$("#divProgress").hide();
Android.ShowDialog(Android.getString('IsHeadDelete'));
} else if (deletedSuccess == -1) {
$("#divProgress").hide();
Android.ShowDialog(Android.getString('LoginToDeleteOnlineData'));
} else {
$("#divProgress").hide();

Android.ShowDialog(Android.getString('InsureeNotDeleted'));
}
$("#divProgress").hide();
//Android.ShowDialog(Android.getString('InsureeDeleted'));
window.open('FamilyAndInsurees.html?f=' + FamilyId + '&l=' + LocationId + '&r=' + RegionId + '&d=' + DistrictId, '_self');
}
else if (deletedSuccess == 2) {
$("#divProgress").hide();
Android.ShowDialog(Android.getString('IsHeadDelete'));
} else if (deletedSuccess == -1) {
$("#divProgress").hide();
Android.ShowDialog(Android.getString('LoginToDeleteOnlineData'));
} else {
$("#divProgress").hide();

}
});
Android.ShowDialog(Android.getString('InsureeNotDeleted'));
}

}
});
}
});

function LoadInsurees(FamilyId) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
query CheckMutation($clientMutationId: String) {
mutationLogs(clientMutationId:$clientMutationId, orderBy:["-requestDateTime"]) {
edges {
node {
status
error
}
}
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mutation MobileEnrolment($input: MobileEnrollmentMutationInput!) {
mobileEnrollment(input: $input) {
clientMutationId
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mutation RenewPolicy($input: RenewPolicyMutationInput!) {
renewPolicy(input: $input) {
mutation RenewPolicy($input: MobilePolicyRenewalAndPremiumMutationInput!) {
mobilePolicyRenewalAndPremium(input: $input) {
clientMutationId
internalId
}
Expand Down

This file was deleted.

This file was deleted.

Loading