diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt index b0986ae8a7..bdc0c0ff85 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt +++ b/app/src/main/java/org/ole/planet/myplanet/ui/exam/BaseExamFragment.kt @@ -26,8 +26,11 @@ import org.ole.planet.myplanet.model.RealmStepExam import org.ole.planet.myplanet.model.RealmSubmission import org.ole.planet.myplanet.model.RealmSubmitPhotos import org.ole.planet.myplanet.model.RealmUserModel +import org.ole.planet.myplanet.ui.courses.TakeCourseFragment.Companion.userModel +import org.ole.planet.myplanet.ui.submission.MySubmissionFragment import org.ole.planet.myplanet.ui.survey.SurveyFragment import org.ole.planet.myplanet.utilities.CameraUtils.ImageCaptureCallback +import org.ole.planet.myplanet.utilities.DialogUtils import org.ole.planet.myplanet.utilities.NetworkUtils.getUniqueIdentifier import org.ole.planet.myplanet.utilities.Utilities import java.util.Date @@ -117,14 +120,28 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback { showUserInfoDialog() } else { saveCourseProgress() - AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme) + AlertDialog.Builder(requireActivity(), R.style.CustomAlertDialog) .setTitle(getString(R.string.thank_you_for_taking_this) + type + getString(R.string.we_wish_you_all_the_best)) - .setPositiveButton("Finish") { _: DialogInterface?, _: Int -> + .setNegativeButton("Finish") { _: DialogInterface?, _: Int -> parentFragmentManager.popBackStack() + } + .setPositiveButton(R.string.view_your_mySubmissions) { dialog: DialogInterface, _: Int -> + if (userModel?.id?.startsWith("guest") == true) { + DialogUtils.guestDialog(requireContext()) + } else { + redirectToMySubmissions(); + } }.show() } } + private fun redirectToMySubmissions(){ + val fragment = MySubmissionFragment.newInstance("exam") + parentFragmentManager.beginTransaction() + .replace(R.id.fragment_container, fragment) + .addToBackStack(null) + .commit() + } private fun saveCourseProgress() { val progress = mRealm.where(RealmCourseProgress::class.java) .equalTo("courseId", exam?.courseId) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e62dda005c..43cb1c6bf1 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -712,6 +712,7 @@ التاريخ مطلوب تمت إضافة المعاملة "شكرًا لك على إجراء هذا " + عرض تقديماتك . نتمنى لك كل التوفيق شكرًا لك على إجراء هذا الاستبيان. اكتمل diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ccefd1dfa5..a4907a5fcb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -711,6 +711,7 @@ Se requiere una fecha Transacción agregada "Gracias por realizar este " + Ver tus envíos . Te deseamos lo mejor Gracias por completar esta encuesta. completa diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9af9e832f9..cf2ec1d244 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -712,6 +712,7 @@ La date est requise Transaction ajoutée Merci d\'avoir pris ce(s) " + Voir vos soumissions . Nous vous souhaitons tout le meilleur Merci d\'avoir participé à cette enquête. complète diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index efb7f35c5e..fd72d591f3 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -712,6 +712,7 @@ मिति आवश्यक छ लेखा थपियो "यो लिनुको लागि धन्यवाद " + तपाईंका पेशाहरू हेर्नुहोस् । हामीले तपाईंलाई सबै भन्दा राम्रो शुभकामना दिन्छौं यो सर्वेक्षण लिनको लागि धन्यवाद। समाप्त diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index c483bb4a1f..193044e107 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -712,6 +712,7 @@ Taariikhdu waa loo baahan yahay Hawlasha lagu daray "Mahadsanid in aad la qaato " + Eeg soo gudbintaada . Waxaan kugu rajaynaynaa dhammaan khayrka Mahadsanid in aad iska soo qaatay suuragal Buuxi diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c232bc36bc..a2303afc4a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -712,6 +712,7 @@ Date is required Transaction added "Thank you for taking this " + View your Submissions . We wish you all the best Thank you for taking this survey. complete