Skip to content

Commit 96c0a47

Browse files
ArkeupIDComoresArkeupIDComores
authored
Merge branch 'develop-comores' into feature-10
2 parents 2ef8910 + 1770a5c commit 96c0a47

6 files changed

Lines changed: 37 additions & 20 deletions

File tree

‎claimManagement/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
minSdkVersion 23
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName "1.2.0"
30+
versionName "1.2.2"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {

‎claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,9 @@ private void fillClaimFromDatabase(String claimUUID) {
590590
case "R":
591591
rgPatientCondition.check(R.id.rbReferal);
592592
break;
593+
case "T":
594+
rgPatientCondition.check(R.id.rbTreatment);
595+
break;
593596
default:
594597
rgPatientCondition.clearCheck();
595598
}

‎claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ public void CheckUpdate(){
250250
JSONArray jsonarray = new JSONArray(response.toString());
251251
String lastVersion = "";
252252
String tag_name = "";
253+
String notes = "";
253254
for (int i = 0; i < jsonarray.length(); i++){
254255
JSONObject releaseObj = jsonarray.getJSONObject(i);
255256
if(releaseObj.getString("tag_name").equals(getResources().getString(R.string.release_tag))){
@@ -258,6 +259,7 @@ public void CheckUpdate(){
258259
if(!releaseName.equals(currentVersion)){
259260
lastVersion = releaseName;
260261
updateAvailable = true;
262+
notes = releaseObj.getString("body");
261263
}
262264
}
263265
}
@@ -266,12 +268,17 @@ public void CheckUpdate(){
266268
boolean finalUpdateAvailable = updateAvailable;
267269
String finalLastVersion = lastVersion;
268270
String finalTagName = tag_name;
271+
String finalNotes = notes;
269272
runOnUiThread(() -> {
270273
pd.dismiss();
271274
if (finalUpdateAvailable) {
272275
new AlertDialog.Builder(this)
273276
.setTitle(getResources().getString(R.string.updateAvailable))
274-
.setMessage(getResources().getString(R.string.newVersion) + " " + finalLastVersion )
277+
.setMessage(
278+
getResources().getString(R.string.newVersion) + " " + finalLastVersion + "\n \n"
279+
+ getResources().getString(R.string.News) + "\n"
280+
+ "\n" + finalNotes
281+
)
275282
.setPositiveButton(getResources().getString(R.string.download), (dialog, which) -> downloadUpdate(finalLastVersion, finalTagName))
276283
.setNegativeButton(getResources().getString(R.string.cancel), null)
277284
.show();

‎claimManagement/src/main/res/layout/activity_claim.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,13 @@
279279
android:tag="R"
280280
android:text="@string/Referral" />
281281

282+
<RadioButton
283+
android:id="@+id/rbTreatment"
284+
android:layout_width="wrap_content"
285+
android:layout_height="wrap_content"
286+
android:tag="T"
287+
android:text="@string/Treatment" />
288+
282289
</RadioGroup>
283290
</LinearLayout>
284291

‎claimManagement/src/main/res/values-fr/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
<string name="Saving">Enregistrer</string>
127127
<string name="Emergency">Urgence</string>
128128
<string name="Referral">Référer</string>
129+
<string name="Treatment">En Traitement</string>
129130
<string name="Other">Autre</string>
130131
<string name="MissingVisitType">Veuillez sélectionner le type de visite.</string>
131132
<string name="New">Nouvelle prestation</string>
@@ -213,7 +214,6 @@
213214
<string name="NoServicesPricelist">La formation sanitaire n\'a pas de liste de prix pour les services </string>
214215
<string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
215216
<string name="entered">Entrée</string>
216-
217217
<!-- Polygamous family strings -->
218218
<string name="polygamous_sub_families">Sous-familles polygames</string>
219219
<string name="sub_family_head_photo">Photo du chef de sous-famille</string>
@@ -223,10 +223,10 @@
223223
<string name="chfid_not_available">CHFID non disponible</string>
224224
<string name="unknown_gender">Genre inconnu</string>
225225
<string name="unknown_dob">Date de naissance inconnue</string>
226-
227226
<plurals name="sub_family_members_count">
228227
<item quantity="zero">Aucun membre</item>
229228
<item quantity="one">1 membre</item>
230229
<item quantity="other">%d membres</item>
231230
</plurals>
231+
<string name="News">Nouveautés:</string>
232232
</resources>

‎claimManagement/src/main/res/values/strings.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
<string name="Saving">Saving…</string>
127127
<string name="Emergency">Emergency</string>
128128
<string name="Referral">Referral</string>
129+
<string name="Treatment">In Treatment</string>
129130
<string name="Other">Other</string>
130131
<string name="MissingVisitType">Please select visit type.</string>
131132
<string name="New">New Claim</string>
@@ -260,20 +261,19 @@
260261
<string name="newVersion">New version </string>
261262
<string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
262263
<string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
263-
264-
<!-- Polygamous family strings -->
265-
<string name="polygamous_sub_families">Sous-familles polygames</string>
266-
<string name="sub_family_head_photo">Photo du chef de sous-famille</string>
267-
<string name="view_sub_family_members">Voir les membres de la sous-famille</string>
268-
<string name="unknown_name">Nom inconnu</string>
269-
<string name="chfid_format">CHFID: %s</string>
270-
<string name="chfid_not_available">CHFID non disponible</string>
271-
<string name="unknown_gender">Genre inconnu</string>
272-
<string name="unknown_dob">Date de naissance inconnue</string>
273-
274-
<plurals name="sub_family_members_count">
275-
<item quantity="zero">Aucun membre</item>
276-
<item quantity="one">1 membre</item>
277-
<item quantity="other">%d membres</item>
278-
</plurals>
264+
<!-- Polygamous family strings -->
265+
<string name="polygamous_sub_families">Polygamous sub-families</string>
266+
<string name="sub_family_head_photo">Sub-family head photo</string>
267+
<string name="view_sub_family_members">View sub-family members</string>
268+
<string name="unknown_name">Unknown name</string>
269+
<string name="chfid_format">CHFID: %s</string>
270+
<string name="chfid_not_available">CHFID not available</string>
271+
<string name="unknown_gender">Unknown gender</string>
272+
<string name="unknown_dob">Unknown date of birth</string>
273+
<plurals name="sub_family_members_count">
274+
<item quantity="zero">No members</item>
275+
<item quantity="one">1 member</item>
276+
<item quantity="other">%d members</item>
277+
</plurals>
278+
<string name="News">New changes:</string>
279279
</resources>

0 commit comments

Comments
 (0)