Skip to content

Commit 2dacd2e

Browse files
vaneck237vaneck237
authored
Merge branch 'main-csu' into release-csu
2 parents bc5b674 + 6038512 commit 2dacd2e

16 files changed

Lines changed: 493 additions & 576 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
name: Build APK
2-
3-
on:
4-
push:
5-
branches: [ "main-csu" ]
6-
pull_request:
7-
branches: [ "main-csu" ]
8-
9-
jobs:
10-
build:
11-
runs-on: ubuntu-latest
12-
13-
steps:
14-
- uses: actions/checkout@v4
15-
16-
- name: Set up JDK 17
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: 17
21-
22-
- name: Build APK
23-
run: ./gradlew assemblecsuDevDebug --stacktrace
24-
env:
25-
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
26-
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
27-
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
28-
29-
- name: Upload APK
30-
uses: actions/upload-artifact@v4
31-
with:
32-
name: claims-csu-test.apk
33-
path: claimManagement/build/outputs/apk/csuDev/debug/claimManagement-csuDev-debug.apk
1+
#name: Build APK
2+
#
3+
#on:
4+
# push:
5+
# branches: [ "main-csu" ]
6+
# pull_request:
7+
# branches: [ "main-csu" ]
8+
#
9+
#jobs:
10+
# build:
11+
# runs-on: ubuntu-latest
12+
#
13+
# steps:
14+
# - uses: actions/checkout@v4
15+
#
16+
# - name: Set up JDK 17
17+
# uses: actions/setup-java@v5
18+
# with:
19+
# distribution: 'temurin'
20+
# java-version: 17
21+
#
22+
# - name: Build APK
23+
# run: ./gradlew assemblecsuDevDebug --stacktrace
24+
# env:
25+
# KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
26+
# KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
27+
# KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
28+
#
29+
# - name: Upload APK
30+
# uses: actions/upload-artifact@v4
31+
# with:
32+
# name: claims-csu
33+
# path: claimManagement/build/outputs/apk/csuDev/debug/claims-csu.apk

‎.github/workflows/main.yml‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Setup JDK 17
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'temurin'
2121
java-version: '17'
@@ -29,29 +29,24 @@ jobs:
2929
run: |
3030
chmod +x gradlew
3131
32-
- name: build
33-
run: |
34-
./gradlew assemblecsuDevDebug --stacktrace
35-
36-
- name: Environment info
37-
run: |
38-
gradle --version
39-
40-
- uses: actions/upload-artifact@v4
41-
with:
42-
name: claims-csu-${{github.run_number}}.apk
43-
path: ./claimManagement/build/outputs/**/*.apk
44-
45-
- name: build
46-
run: |
47-
./gradlew bundlecsuDevDebug --stacktrace
48-
49-
- name: Environment info
50-
run: |
51-
gradle --version
52-
53-
- uses: actions/upload-artifact@v4
54-
with:
55-
name: claims-csu-${{github.run_number}}.aab
56-
path: ./claimManagement/build/outputs/**/*.aab
32+
- name: run gradle tests
33+
run: ./gradlew testCsuDevDebugUnitTest --stacktrace
34+
35+
# - name: build
36+
# run: |
37+
# ./gradlew assembleCsuDevDebug --stacktrace
38+
39+
# - uses: actions/upload-artifact@v4
40+
# with:
41+
# name: claims-csu-${{github.run_number}}.apk
42+
# path: ./claimManagement/build/outputs/**/*.apk
43+
44+
# - name: build
45+
# run: |
46+
# ./gradlew bundlecsuDevDebug --stacktrace
47+
#
48+
# - uses: actions/upload-artifact@v4
49+
# with:
50+
# name: claims-csu-${{github.run_number}}.aab
51+
# path: ./claimManagement/build/outputs/**/*.aab
5752

‎.github/workflows/manual.yml‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,66 @@ name: manualbuild
33
on:
44
workflow_dispatch:
55
inputs:
6-
api_base_url:
7-
description: URL of the REST API
6+
app_version:
7+
description: Version of application
88
required: true
9-
default: https://test-csuapps.minsante.cm/rest/
9+
default: 1.0.0
10+
release_tag:
11+
description: Tag to publish update
12+
required: true
13+
default: csu
14+
1015
# Branch is chosen by default in github manual actions
1116

1217
jobs:
1318
build:
1419
runs-on: ubuntu-latest
1520

1621
steps:
17-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
1823

1924
- name: Setup JDK 17
20-
uses: actions/setup-java@v2
25+
uses: actions/setup-java@v5
2126
with:
22-
distribution: 'temurin'
27+
distribution: 'zulu'
2328
java-version: '17'
2429
cache: 'gradle'
2530

2631
- name: Environment info
2732
run: |
2833
gradle --version
29-
echo url ${{ github.event.inputs.api_base_url }}
30-
31-
- name: show gradlew permission
32-
run: |
33-
chmod +x gradlew
3434
3535
- name: show gradlew permission
3636
run: |
3737
chmod +x gradlew
3838
3939
- name: build
4040
run: |
41-
./gradlew assemblecsuDevDebug --stacktrace
41+
./gradlew assembleCsuDevDebug --stacktrace
4242
env:
43-
API_BASE_URL: "${{ github.event.inputs.api_base_url }}"
43+
APP_VERSION: "${{ github.event.inputs.app_version }}"
4444

45-
- name: Environment info
46-
run: |
47-
gradle --version
45+
# Run Tests Build
46+
- name: Run gradle tests
47+
run: ./gradlew testCsuDevDebugUnitTest --stacktrace
4848

4949
- uses: actions/upload-artifact@v4
5050
with:
51-
name: claims-csu-${{github.run_number}}.apk
51+
name: claims-csu-${{github.event.inputs.app_version}}
5252
path: ./claimManagement/build/outputs/**/*.apk
53+
overwrite: true
54+
55+
#publish in release
56+
- name: Edit release ${{ github.event.inputs.app_version }}
57+
uses: softprops/action-gh-release@v1
58+
with:
59+
tag_name: ${{ github.event.inputs.release_tag }} # Sets the release tag to the pushed tag name (e.g., v1.0.0)
60+
name: ${{ github.event.inputs.app_version }} # Sets the release name to the pushed tag name (e.g., Release v1.0.0)
61+
files: ./claimManagement/build/outputs/**/*.apk
62+
draft: false
63+
prerelease: false
64+
env:
65+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5366

5467
# - name: build
5568
# run: |

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.3.1'
10+
classpath 'com.android.tools.build:gradle:8.13.0'
1111
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
1212

1313
// NOTE: Do not place your application dependencies here; they belong

‎claimManagement/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ repositories {
1919
}
2020

2121
android {
22-
compileSdkVersion 32
22+
compileSdk = 34
2323
buildToolsVersion '33.0.0'
2424

2525
defaultConfig {
2626
applicationId "org.openimis.imisclaims"
2727
minSdkVersion 26
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName "2.3.5"
30+
versionName System.getenv("APP_VERSION") ?: "2.3.8"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {
@@ -111,6 +111,7 @@ android {
111111
buildConfigField "String", "API_BASE_URL", '"https://csuapps.minsante.cm/"'
112112
buildConfigField "String", "RAR_PASSWORD", '"xc3-ed@/dfr;nJ3R"'
113113
dimension 'std'
114+
resValue "string", "sentry_dsn", '"https://54612a80b36c47e78722b9779410e3d1@glitchtip-csuapps.minsante.cm/9"'
114115
}
115116
niger {
116117
applicationIdSuffix ".niger"
@@ -190,6 +191,7 @@ android {
190191
packagingOptions {
191192
exclude 'META-INF/DEPENDENCIES'
192193
}
194+
namespace 'org.openimis.imisclaims'
193195
}
194196

195197
apollo {
@@ -231,5 +233,6 @@ dependencies {
231233
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
232234
implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
233235
implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
236+
implementation 'io.sentry:sentry-android:8.25.0'
234237

235238
}

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

Lines changed: 64 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<resources>
3-
<string name="program">Programme</string>
4-
<string name="Prefix">Préfixe</string>
5-
<string name="ChequeNumber">Numéro de chèque</string>
6-
<string name="MissingChequeNumber">Veuillez entrer le numéro de chèque</string>
7-
<string name="InvalidClaimCode">Le code de la prestation doit contenir maximum 7 caractères</string>
8-
<string name="NoInsureeFound">Le numéro d\'assuré ne correspond a aucun bénéficiaire</string>
9-
<string name="ClaimNumberExist">Le numéro de prestation existe déjà</string>
10-
<string name="TestNumber">Numéro de test</string>
11-
<string name="Tdr">TDR</string>
12-
<string name="Positive">Positif</string>
13-
<string name="Negative">Négatif</string>
14-
<string name="MissingTestNumber">Veuillez entrer le numéro de test</string>
15-
<string name="MissingTdr">Veuillez cocher le résultat Tdr</string>
16-
<string name="InvalidChequeNumber">Numéro de cheque invalide</string>
17-
<string name="NonUsedChequeNumber">Le numéro de cheque ne correspond a aucun patient</string>
183
<string name="settings">Réglages</string>
194
<string name="RarPassword">Mot de passe RAR</string>
205
<string name="DefaultRarPassword">Définir le mot de passe RAR par défaut</string>
@@ -26,7 +11,7 @@
2611
<string name="ReleaseDate">Date de sortie</string>
2712
<string name="clear">Effacer</string>
2813
<string name="has_no_rights">Vous n\'avez pas les droits pour cette fonctionnalité</string>
29-
<string name="title_activity_claim_review">Verification des prestations</string>
14+
<string name="title_activity_claim_review">Vérification des prestations</string>
3015
<string name="ClaimReview">Vérifier prestations</string>
3116
<string name="claims">Prestations</string>
3217
<string name="claim">Prestation</string>
@@ -90,7 +75,7 @@
9075
<string name="GuaranteeNo">Numéro de garantie</string>
9176
<string name="ContentTitle">La nouvelle version de Claim Management est maintenant disponible.</string>
9277
<string name="ContentText">Cliquez ici pour télécharger.</string>
93-
<string name="SomethingWentWrongServer">Quelque chose a mal tourné sur le serveur.</string>
78+
<string name="SomethingWentWrongServer">Une erreur est survenue sur le serveur, merci de bien vouloir reprendre l\'action.</string>
9479
<string name="app_name_claim">Prestation</string>
9580
<string name="app_name_enquire">Renseignement</string>
9681
<string name="ClaimAdmin">Administrateur des prestations</string>
@@ -119,7 +104,6 @@
119104
<string name="MissingGuaranteeNo">Veuillez entrer le numéro de garantie</string>
120105
<string name="MissingClaimCode">Veuillez entrer le code de prestation</string>
121106
<string name="MissingCHFID">Veuillez saisir le numéro d\'assuré</string>
122-
<string name="MissingLengthCHFID">le numéro d\'assuré doit contenir uniquement des caractères numériques</string>
123107
<string name="InvalidCHFID">Numéro d\'assuré invalide</string>
124108
<string name="MissingStartDate">Veuillez entrer la date de début</string>
125109
<string name="MissingEndDate">Veuillez entrer la date de fin</string>
@@ -213,6 +197,67 @@
213197
<string name="initializing">Initialisation.....</string>
214198
<string name="initializing_complete">Initialisation Terminée</string>
215199
<string name="application">Application</string>
200+
<string name="ReadOnly">La carte SD est en mode lecture seule. Veuillez régler le mode de lecture/écriture et redémarrer l\'application.</string>
201+
<string name="NoSDCard">openIMIS Claim a besoin d\'une carte mémoire externe pour fonctionner. Veuillez insérer la carte mémoire et redémarrer l\'application.</string>
202+
<string name="FileNOtFound">Fichier non trouvé.</string>
203+
<string name="NotificationAlertText">Nouvelle mise à jour disponible.</string>
204+
<string name="FTPConnectionFailed">Impossible de connecter le serveur. Opération annulée.</string>
205+
<string name="FailToUpload">Échec du téléchargement vers le serveur.</string>
206+
<string name="ManageBatch">GÉRER LE LOT</string>
207+
<string name="ManageClaims">Gestion des prestations</string>
208+
<string name="Submit">SOUMETTRE</string>
209+
<string name="HFCode">Code de l\'établissement de santé</string>
210+
<string name="BatchCode">Code du lot</string>
211+
<string name="PeriodFrom">Période du</string>
212+
<string name="PeriodTo">Période au</string>
213+
<string name="BatchDate">Date du lot</string>
214+
<string name="Total">Total</string>
215+
<string name="Of">sur</string>
216+
<string name="Back">Retour</string>
217+
<string name="Options">Options</string>
218+
<string name="SelectDisease">Veuillez choisir le code de la maladie</string>
219+
<string name="NoItemMapped">Aucun prod. méd. lié trouvé</string>
220+
<string name="MappedItemMissing">Pour ajouter un élément à la prestation, veuillez cliquer sur le menu et sélectionner l\'option \"lier des prod. méd.\"</string>
221+
<string name="NoServiceMapped">Aucun soin liée trouvé</string>
222+
<string name="MappedServiceMissing">Pour ajouter un soin à la prestation, veuillez cliquer sur le menu et sélectionner l\'option \"lier des soins\".</string>
223+
<string name="Statistics">Statistiques</string>
224+
<string name="GetStats">Demande de statistiques</string>
225+
<string name="Go">Aller</string>
226+
<string name="claim_code">Code de prestation</string>
227+
<string name="type_here">Tapez ici</string>
228+
<string name="Logout">Déconnexion</string>
229+
<string name="Logout_Successful">Déconnexion réussie</string>
230+
<string name="action_settings">Réglages</string>
231+
<string name="permission_denied">Désolé, certaines permissions n\'ont pas été accordées</string>
232+
<string name="error">Info</string>
233+
<string name="Inserting">Insérer</string>
234+
<string name="ControlSucessfully">Contrôles insérés avec succès</string>
235+
<string name="verifying">Vérification</string>
236+
<string name="code_verified">Code de prestation accepté</string>
237+
<string name="get_master">Obtenir les données de base</string>
238+
<string name="QuitConfirmation">Êtes-vous sûr de vouloir quitter?</string>
239+
<string name="Pleasewait">Veuillez patienter...</string>
240+
<string name="PageLoading">La page se charge...</string>
241+
<string name="HeaderTitle">openIMIS</string>
242+
<string name="HeaderEmail">admin@imis.com</string>
243+
<string name="Home">Accueil</string>
244+
<string name="Enrolment">Adhésion</string>
245+
<string name="Renewal">Renouvellement</string>
246+
<string name="Feedback">Retour d\'information</string>
247+
<string name="Sync">Synchroniser</string>
248+
<string name="About">A propos</string>
249+
<string name="Quit">Quitter</string>
250+
<string name="Region">Région</string>
251+
<string name="District">District</string>
252+
<string name="Ward">Municipalité</string>
253+
<string name="Village">Village</string>
254+
<string name="PovertyStatus">Situation de pauvreté</string>
255+
<string name="ConfirmationType">Type de confirmation</string>
256+
<string name="ConfirmationNo">No. de confirmation</string>
257+
<string name="GroupType">Type de groupe</string>
258+
<string name="Ethnicity">Ethnicité</string>
259+
<string name="PermanentAddress">Adresse permanente</string>
260+
<string name="Next">Suivant</string>
216261
<string name="SelectRegion">Choisir une Région</string>
217262
<string name="SelectDistrict">Choisir un district</string>
218263
<string name="SelectWard">Choisir une Municipalité</string>
@@ -553,16 +598,4 @@
553598
<string name="NotFound">L\'entrée n\'existe pas.</string>
554599
<string name="qtyAlert">La quantité maximale pour ce produit est</string>
555600
<string name="qtyAlertAsk">La quantité autorisée pour ce produit est</string>
556-
<string name="CheckConnection">Vérifier votre connexion</string>
557-
<string name="FailedToCreateClaim">Échec lors de la création de la prestation</string>
558-
<string name="Update">Mise à jour</string>
559-
<string name="checkUpdate">Vérifier la mise à jour</string>
560-
<string name="Error">Une erreur s\'est produite</string>
561-
<string name="downloading">Téléchargement en cours</string>
562-
<string name="downloadUpdateFail">Echec de la mise à jour</string>
563-
<string name="download">Télécharger</string>
564-
<string name="cancel">Annuler</string>
565-
<string name="updateAvailable">Mise à jour disponible</string>
566-
<string name="haveLastVersion">Vous avez la dernière version </string>
567-
<string name="newVersion">Nouvelle version </string>
568-
</resources>
601+
</resources>

0 commit comments

Comments
 (0)