Skip to content

Commit 85dae05

Browse files
Valerie923dogi
Valerie923
and
dogi
authored
teams: smoother task creating (fixes #13491) (#13502)
Co-authored-by: dogi <dogi@users.noreply.github.com>
1 parent d04c83a commit 85dae05

8 files changed

Lines changed: 36 additions & 24 deletions

File tree

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId "org.ole.planet.myplanet"
1313
minSdk = 26
1414
targetSdk = 36
15-
versionCode = 5579
16-
versionName = "0.55.79"
15+
versionCode = 5580
16+
versionName = "0.55.80"
1717
ndkVersion = '26.3.11579264'
1818
vectorDrawables.useSupportLibrary = true
1919
}

‎app/src/main/java/org/ole/planet/myplanet/ui/teams/tasks/TeamsTasksFragment.kt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,22 +151,28 @@ class TeamsTasksFragment : BaseTeamFragment(), OnTaskCompletedListener {
151151

152152
val alertDialog = builder.create()
153153
alertDialog.show()
154-
155154
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
156155
val task = alertTaskBinding.etTask.text.toString()
157156
val desc = alertTaskBinding.etDescription.text.toString()
157+
var isValid = true
158158
if (task.isEmpty()) {
159159
Utilities.toast(activity, getString(R.string.task_title_is_required))
160-
} else if (deadline == null) {
160+
isValid = false
161+
}
162+
if (deadline == null) {
161163
Utilities.toast(activity, getString(R.string.deadline_is_required))
162-
} else {
164+
isValid = false }
165+
if (desc.isEmpty()) {
166+
Utilities.toast(activity, getString(R.string.desc_is_required))
167+
isValid = false
168+
}
169+
if (isValid) {
163170
createOrUpdateTask(task, desc, t, selectedAssignee?.id)
164171
alertDialog.dismiss()
165172
}
166173
}
167174
alertDialog.window?.setBackgroundDrawableResource(R.color.card_bg)
168175
}
169-
170176
private fun showMemberSelectionDialog(filteredUserList: List<RealmUser>, onAssigneeSelected: (RealmUser) -> Unit) {
171177
var dialogSelectedItem: RealmUser? = filteredUserList.firstOrNull()
172178

‎app/src/main/res/values-ar/strings.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
<string name="pulse_rate">معدل النبض (نبضة في الدقيقة)</string>
268268
<string name="blood_pressure">ضغط الدم (الضغط الانقباضي/الانبساطي)</string>
269269
<string name="save">حفظ</string>
270-
<string name="task">المهمة (مطلوبة)</string>
271-
<string name="deadline_required">الموعد النهائي (مطلوب)</string>
270+
<string name="task">* المهمة</string>
271+
<string name="deadline_required">"* الموعد النهائي "</string>
272272
<string name="click_here_to_pick_date">انقر هنا لاختيار التاريخ</string>
273273
<string name="enterprises">الشركات</string>
274274
<string name="select_member">اختر عضو الفريق</string>
@@ -1205,7 +1205,7 @@
12051205
<string name="unable_to_download_resource">غير قادر على تنزيل المورد</string>
12061206
<string name="hide_new_message">إخفاء الرسالة الجديدة</string>
12071207
<string name="cannot_assign_completed_task">لا يمكن تعيين مهمة مكتملة</string>
1208-
<string name="assign_to">تعيين إلى (اختياري)</string>
1208+
<string name="assign_to">"تعيين إلى "</string>
12091209
<string name="click_to_assign_member">انقر لتعيين عضو الفريق</string>
12101210
<string name="saving">جار الحفظ…</string>
12111211
<string name="achievement_saved">تم تحديث الإنجاز</string>
@@ -1302,5 +1302,6 @@
13021302
<string name="label_add_references">أضف أي مراجع أدناه</string>
13031303
<string name="link">الرابط</string>
13041304
<string name="server_url_not_configured">Server URL not configured</string>
1305+
<string name="desc_is_required">الوصف مطلوب</string>
13051306

13061307
</resources>

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
<string name="pulse_rate">Frecuencia del pulso (lpm)</string>
268268
<string name="blood_pressure">Presión arterial</string>
269269
<string name="save">Guardar</string>
270-
<string name="task">Tarea</string>
271-
<string name="deadline_required">Fecha límite (obligatorio)</string>
270+
<string name="task">Tarea *</string>
271+
<string name="deadline_required">"Fecha límite "</string>
272272
<string name="click_here_to_pick_date">Haz clic aquí para seleccionar la fecha</string>
273273
<string name="enterprises">Empresas</string>
274274
<string name="select_member">Seleccionar miembro del equipo</string>
@@ -1192,7 +1192,7 @@
11921192
<string name="unable_to_download_resource">No se puede descargar el recurso</string>
11931193
<string name="hide_new_message">Ocultar nuevo mensaje</string>
11941194
<string name="cannot_assign_completed_task">No se puede asignar una tarea completada</string>
1195-
<string name="assign_to">Asignar a (Opcional)</string>
1195+
<string name="assign_to">Asignar a</string>
11961196
<string name="click_to_assign_member">Haz clic para asignar un miembro del equipo</string>
11971197
<string name="saving">Guardando…</string>
11981198
<string name="achievement_saved">Logro actualizado</string>
@@ -1289,5 +1289,6 @@
12891289
<string name="label_add_references">Añada referencias abajo</string>
12901290
<string name="link">Enlace</string>
12911291
<string name="server_url_not_configured">Server URL not configured</string>
1292+
<string name="desc_is_required">La descripción es obligatoria</string>
12921293

12931294
</resources>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
<string name="pulse_rate">Fréquence cardiaque (bpm)</string>
268268
<string name="blood_pressure">Pression artérielle (Systolique/Diastolique)</string>
269269
<string name="save">Enregistrer</string>
270-
<string name="task">Tâche (obligatoire)</string>
271-
<string name="deadline_required">Date limite (obligatoire)</string>
270+
<string name="task">Tâche *</string>
271+
<string name="deadline_required">"Date limite "</string>
272272
<string name="click_here_to_pick_date">Cliquez ici pour choisir la date</string>
273273
<string name="enterprises">Entreprises</string>
274274
<string name="select_member">Sélectionnez un membre de l\'équipe</string>
@@ -1193,7 +1193,7 @@
11931193
<string name="unable_to_download_resource">Impossible de télécharger la ressource</string>
11941194
<string name="hide_new_message">Masquer le nouveau message</string>
11951195
<string name="cannot_assign_completed_task">Impossible d\'attribuer une tâche terminée</string>
1196-
<string name="assign_to">Attribuer à (Optionnel)</string>
1196+
<string name="assign_to">"Attribuer à "</string>
11971197
<string name="click_to_assign_member">Cliquez pour attribuer un membre de l\'équipe</string>
11981198
<string name="saving">Enregistrement…</string>
11991199
<string name="achievement_saved">Réalisation mise à jour</string>
@@ -1290,5 +1290,6 @@
12901290
<string name="label_add_references">Ajouter des références ci-dessous</string>
12911291
<string name="link">Lien</string>
12921292
<string name="server_url_not_configured">Server URL not configured</string>
1293+
<string name="desc_is_required">La description est obligatoire</string>
12931294

12941295
</resources>

‎app/src/main/res/values-ne/strings.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
<string name="pulse_rate">नाडी दर (bpm)</string>
268268
<string name="blood_pressure">रक्त चाप (सिस्टोलिक / डायास्टोलिक)</string>
269269
<string name="save">सुरक्षित गर्नुहोस्</string>
270-
<string name="task">कार्य (आवश्यक)</string>
271-
<string name="deadline_required">समयसीमा (आवश्यक)</string>
270+
<string name="task">कार्य *</string>
271+
<string name="deadline_required">"समयसीमा "</string>
272272
<string name="click_here_to_pick_date">मिति चयन गर्न क्लिक गर्नुहोस्</string>
273273
<string name="enterprises">उद्यमहरू</string>
274274
<string name="select_member">टिम सदस्य छान्नुहोस्</string>
@@ -1189,7 +1189,7 @@
11891189
<string name="unable_to_download_resource">स्रोत डाउनलोड गर्न असमर्थ</string>
11901190
<string name="hide_new_message">नयाँ सन्देश लुकाउनुहोस्</string>
11911191
<string name="cannot_assign_completed_task">पूरा भएको कार्य सौंप्न सकिँदैन</string>
1192-
<string name="assign_to">सौंप्नुहोस् (वैकल्पिक)</string>
1192+
<string name="assign_to">"सौंप्नुहोस् "</string>
11931193
<string name="click_to_assign_member">टोली सदस्य सौंप्न क्लिक गर्नुहोस्</string>
11941194
<string name="saving">सुरक्षित गरिदै…</string>
11951195
<string name="achievement_saved">उपलब्धि अद्यावधिक गरियो</string>
@@ -1286,5 +1286,6 @@
12861286
<string name="label_add_references">तल कुनै पनि सन्दर्भहरू थप्नुहोस्</string>
12871287
<string name="link">लिङ्क</string>
12881288
<string name="server_url_not_configured">Server URL not configured</string>
1289+
<string name="desc_is_required">विवरण आवश्यक छ</string>
12891290

12901291
</resources>

‎app/src/main/res/values-so/strings.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
<string name="pulse_rate">Dhererka Calaamadda (bpm)</string>
268268
<string name="blood_pressure">Dhererka Dhiiga (Xiran/Hoostooda)</string>
269269
<string name="save">Keyd</string>
270-
<string name="task">Hawlo (lazim)</string>
271-
<string name="deadline_required">Dib-u-heshiisi (lazim)</string>
270+
<string name="task">Hawlo *</string>
271+
<string name="deadline_required">Dib-u-heshiisi</string>
272272
<string name="click_here_to_pick_date">Si aad u doorato taariikhda</string>
273273
<string name="enterprises">Shirkado</string>
274274
<string name="select_member">Dooro Xubin Kooxda</string>
@@ -1189,7 +1189,7 @@
11891189
<string name="unable_to_download_resource">Lama soo dejin karo kheyraadka</string>
11901190
<string name="hide_new_message">Qari fariinta cusub</string>
11911191
<string name="cannot_assign_completed_task">Lama xil saari karo shaqo la dhammeeyay</string>
1192-
<string name="assign_to">U xilsaar (Ikhtiyaari)</string>
1192+
<string name="assign_to">U xilsaar</string>
11931193
<string name="click_to_assign_member">Guji si aad u doorato xubin koox</string>
11941194
<string name="saving">Keydinaya…</string>
11951195
<string name="achievement_saved">Guusha waa la cusbooneysiiyay</string>
@@ -1286,5 +1286,6 @@
12861286
<string name="label_add_references">Ku dar tixraac kasta xagga hoose</string>
12871287
<string name="link">Xiriirka</string>
12881288
<string name="server_url_not_configured">Server URL not configured</string>
1289+
<string name="desc_is_required">Sharaxaadda waa loo baahan yahay</string>
12891290

12901291
</resources>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@
267267
<string name="pulse_rate">Pulse Rate (bpm)</string>
268268
<string name="blood_pressure">Blood Pressure (Systolic/Diastolic)</string>
269269
<string name="save">Save</string>
270-
<string name="task">Task (required)</string>
271-
<string name="deadline_required">Deadline (required)</string>
270+
<string name="task">Task *</string>
271+
<string name="deadline_required">Deadline *</string>
272272
<string name="click_here_to_pick_date">Click here to pick date</string>
273273
<string name="enterprises">Enterprises</string>
274274
<string name="select_member">Select Team Member</string>
@@ -1192,7 +1192,7 @@
11921192
<string name="unable_to_download_resource">Unable to download resource</string>
11931193
<string name="hide_new_message">Hide new message</string>
11941194
<string name="cannot_assign_completed_task">Cannot assign completed task</string>
1195-
<string name="assign_to">Assign To (Optional)</string>
1195+
<string name="assign_to">"Assign To "</string>
11961196
<string name="click_to_assign_member">Click to assign a team member</string>
11971197
<string name="saving">Saving…</string>
11981198
<string name="achievement_saved">Achievement updated</string>
@@ -1286,5 +1286,6 @@
12861286
<string name="enterprise_reports">Enterprise Reports</string>
12871287
<string name="label_add_references">Add any references below</string>
12881288
<string name="server_url_not_configured">Server URL not configured</string>
1289+
<string name="desc_is_required">Description is required</string>
12891290

12901291
</resources>

0 commit comments

Comments
 (0)