Merge branch 'master' into 5006-empty-services-place-holder

open-learning-exchange · Jan 16, 2025 · 9a950d4 · 9a950d4
2 parents e257608 + 9aae636
commit 9a950d4
Show file tree

Hide file tree

Showing 33 changed files with 275 additions and 168 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -170,7 +170,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.recyclerview:recyclerview:1.4.0'
     implementation 'androidx.annotation:annotation:1.9.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.7'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

diff --git a/app/src/main/java/org/ole/planet/myplanet/MainApplication.kt b/app/src/main/java/org/ole/planet/myplanet/MainApplication.kt
@@ -64,6 +64,7 @@ class MainApplication : Application(), Application.ActivityLifecycleCallbacks {
         var isCollectionSwitchOn = false
         var showDownload = false
         var isSyncRunning = false
+        var showHealthDialog = true
         var listener: TeamPageListener? = null
         val androidId: String get() {
             try {

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseDialogFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseDialogFragment.kt
@@ -7,11 +7,13 @@ import androidx.fragment.app.DialogFragment
 abstract class BaseDialogFragment : DialogFragment() {
     @JvmField
     var id: String? = null
+    var teamId: String? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, R.style.AppTheme_Dialog_NoActionBar_MinWidth)
         if (arguments != null) {
             id = requireArguments().getString(key)
+            teamId = requireArguments().getString("teamId")
         }
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.kt
@@ -171,7 +171,7 @@ abstract class BaseResourceFragment : Fragment() {
         }
         AlertDialog.Builder(requireActivity()).setTitle("Pending Surveys")
             .setAdapter(arrayAdapter) { _: DialogInterface?, i: Int ->
-                AdapterMySubmission.openSurvey(homeItemClickListener, list[i].id, true)
+                AdapterMySubmission.openSurvey(homeItemClickListener, list[i].id, true, false, "")
             }.setPositiveButton(R.string.dismiss, null).show()
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmStepExam.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmStepExam.kt
@@ -29,6 +29,7 @@ open class RealmStepExam : RealmObject() {
     var passingPercentage: String? = null
     var noOfQuestions = 0
     var isFromNation = false
+    var teamId: String? = null
 
     companion object {
         val examDataList: MutableList<Array<String>> = mutableListOf()
@@ -66,6 +67,7 @@ open class RealmStepExam : RealmObject() {
             myExam?.totalMarks = JsonUtils.getInt("totalMarks", exam)
             myExam?.noOfQuestions = JsonUtils.getJsonArray("questions", exam).size()
             myExam?.isFromNation = !TextUtils.isEmpty(parentId)
+            myExam.teamId = JsonUtils.getString("teamId", exam)
             val oldQuestions: RealmResults<*>? = mRealm.where(RealmExamQuestion::class.java).equalTo("examId", JsonUtils.getString("_id", exam)).findAll()
             if (oldQuestions == null || oldQuestions.isEmpty()) {
                 RealmExamQuestion.insertExamQuestions(JsonUtils.getJsonArray("questions", exam), JsonUtils.getString("_id", exam), mRealm)
@@ -84,8 +86,10 @@ open class RealmStepExam : RealmObject() {
                 JsonUtils.getString("updatedDate", exam),
                 JsonUtils.getString("totalMarks", exam),
                 JsonUtils.getString("noOfQuestions", exam),
-                JsonUtils.getString("isFromNation", exam)
+                JsonUtils.getString("isFromNation", exam),
+                JsonUtils.getString("teamId", exam)
             )
+
             examDataList.add(csvRow)
         }
 
@@ -94,7 +98,7 @@ open class RealmStepExam : RealmObject() {
                 val file = File(filePath)
                 file.parentFile?.mkdirs()
                 val writer = CSVWriter(FileWriter(file))
-                writer.writeNext(arrayOf("_id", "_rev", "name", "passingPercentage", "type", "createdBy", "sourcePlanet", "createdDate", "updatedDate", "totalMarks", "noOfQuestions", "isFromNation"))
+                writer.writeNext(arrayOf("_id", "_rev", "name", "passingPercentage", "type", "createdBy", "sourcePlanet", "createdDate", "updatedDate", "totalMarks", "noOfQuestions", "isFromNation", "teamId"))
                 for (row in data) {
                     writer.writeNext(row)
                 }

diff --git a/app/src/main/java/org/ole/planet/myplanet/service/TransactionSyncManager.kt b/app/src/main/java/org/ole/planet/myplanet/service/TransactionSyncManager.kt
@@ -80,11 +80,12 @@ object TransactionSyncManager {
         val apiInterface = client?.create(ApiInterface::class.java)
         val response: Response<DocumentResponse>?
         try {
-            response = apiInterface?.getDocuments(header, Utilities.getUrl() + "/" + table + "/_all_docs")?.execute()
+            response = apiInterface?.getDocuments(header, "${Utilities.getUrl()}/$table/_all_docs")?.execute()
             val ob = response?.body()
             if (ob != null && ob.rows?.isNotEmpty() == true) {
                 val r = ob.rows!![0]
-                val jsonDoc = apiInterface?.getJsonObject(header, Utilities.getUrl() + "/" + table + "/" + r.id)?.execute()?.body()
+                val jsonDoc = apiInterface.getJsonObject(header, "${Utilities.getUrl()}/$table/${r.id}")
+                    .execute().body()
                 userModel?.key = getString("key", jsonDoc)
                 userModel?.iv = getString("iv", jsonDoc)
             }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/courses/AdapterCourses.kt b/app/src/main/java/org/ole/planet/myplanet/ui/courses/AdapterCourses.kt
@@ -49,7 +49,7 @@ class AdapterCourses(private val context: Context, private var courseList: List<
     private val config: ChipCloudConfig
     private var isAscending = true
     private var isTitleAscending = false
-    private var areAllSelected = true
+    private var areAllSelected = false
     var userModel: RealmUserModel?= null
 
     init {

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/courses/CourseStepFragment.kt
@@ -184,7 +184,7 @@ class CourseStepFragment : BaseContainerFragment(), ImageCaptureCallback {
 
         fragmentCourseStepBinding.btnTakeSurvey.setOnClickListener {
             if (stepSurvey.isNotEmpty()) {
-                AdapterMySubmission.openSurvey(homeItemClickListener, stepSurvey[0].id, false)
+                AdapterMySubmission.openSurvey(homeItemClickListener, stepSurvey[0].id, false, false, "")
             }
         }
         val downloadedResources: List<RealmMyLibrary> = cRealm.where(RealmMyLibrary::class.java).equalTo("stepId", stepId).equalTo("resourceOffline", true).isNotNull("resourceLocalAddress").findAll()

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt
@@ -63,6 +63,7 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
     lateinit var spnSubject: Spinner
     lateinit var searchTags: MutableList<RealmTag>
     private lateinit var confirmation: AlertDialog
+    private var isCheckboxChangedByCode = false
     override fun getLayout(): Int {
         return R.layout.fragment_my_course
     }
@@ -156,7 +157,7 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
         clearTags()
         showNoData(tvMessage, adapterCourses.itemCount, "courses")
         setupUI(requireView().findViewById(R.id.my_course_parent_layout), requireActivity())
-        changeButtonStatus()
+
         if (!isMyCourseLib) tvFragmentInfo.setText(R.string.our_courses)
         additionalSetup()
 
@@ -221,25 +222,28 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
 
         spnGrade.onItemSelectedListener = itemSelectedListener
         spnSubject.onItemSelectedListener = itemSelectedListener
-        selectAll = requireView().findViewById(R.id.selectAll)
+        selectAll = requireView().findViewById(R.id.selectAllCourse)
         if (userModel?.isGuest() == true) {
             tvAddToLib.visibility = View.GONE
             btnRemove.visibility = View.GONE
             btnArchive.visibility = View.GONE
             selectAll.visibility = View.GONE
         }
         checkList()
-        selectAll.setOnClickListener {
-            val allSelected = selectedItems?.size == adapterCourses.getCourseList().size
-            adapterCourses.selectAllItems(!allSelected)
-            if (allSelected) {
-                selectAll.isChecked = false
-                selectAll.text = getString(R.string.select_all)
-            } else {
-                selectAll.isChecked = true
+        selectAll.setOnCheckedChangeListener { _, isChecked ->
+            if (isCheckboxChangedByCode) {
+                isCheckboxChangedByCode = false
+                return@setOnCheckedChangeListener
+            }
+            if (isChecked) {
+                adapterCourses.selectAllItems(true)
                 selectAll.text = getString(R.string.unselect_all)
+            } else {
+                adapterCourses.selectAllItems(false)
+                selectAll.text = getString(R.string.select_all)
             }
         }
+
         checkList()
     }
 
@@ -338,16 +342,20 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
         showTagText(searchTags, tvSelected)
         showNoData(tvMessage, adapterCourses.itemCount, "courses")
     }
-
+    private fun updateCheckBoxState(programmaticState: Boolean) {
+        isCheckboxChangedByCode = true
+        selectAll.isChecked = programmaticState
+        isCheckboxChangedByCode = false
+    }
     private fun changeButtonStatus() {
         tvAddToLib.isEnabled = (selectedItems?.size ?: 0) > 0
         btnRemove.isEnabled = (selectedItems?.size ?: 0) > 0
         btnArchive.isEnabled = (selectedItems?.size ?: 0) > 0
         if (adapterCourses.areAllSelected()) {
-            selectAll.isChecked = true
+            updateCheckBoxState(true)
             selectAll.text = getString(R.string.unselect_all)
         } else {
-            selectAll.isChecked = false
+            updateCheckBoxState(false)
             selectAll.text = getString(R.string.select_all)
         }
     }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BaseDashboardFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BaseDashboardFragment.kt
@@ -73,7 +73,7 @@ open class BaseDashboardFragment : BaseDashboardFragmentPlugin(), NotificationCa
             v.findViewById<LinearLayout>(R.id.ll_prompt).visibility = View.VISIBLE
             v.findViewById<LinearLayout>(R.id.ll_prompt).setOnClickListener {
                 if (!childFragmentManager.isStateSaved) {
-                    UserInformationFragment.getInstance("").show(childFragmentManager, "")
+                    UserInformationFragment.getInstance("", "").show(childFragmentManager, "")
                 }
             }
         } else {

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BellDashboardFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BellDashboardFragment.kt
@@ -1,6 +1,8 @@
 package org.ole.planet.myplanet.ui.dashboard
 
+import android.content.DialogInterface
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView
 import io.realm.Case
 import io.realm.Realm
 import kotlinx.coroutines.*
+import org.ole.planet.myplanet.MainApplication
 import org.ole.planet.myplanet.R
 import org.ole.planet.myplanet.databinding.FragmentHomeBellBinding
 import org.ole.planet.myplanet.model.RealmCertification
@@ -62,6 +65,15 @@ class BellDashboardFragment : BaseDashboardFragment() {
         (activity as DashboardActivity?)?.supportActionBar?.hide()
         showBadges()
         checkPendingSurveys()
+
+        if (model?.id?.startsWith("guest") == false && TextUtils.isEmpty(model?.key) && MainApplication.showHealthDialog) {
+            AlertDialog.Builder(requireActivity())
+                .setMessage(getString(R.string.health_record_not_available_sync_health_data))
+                .setPositiveButton(getString(R.string.sync)) { _: DialogInterface?, _: Int ->
+                    syncKeyId()
+                    MainApplication.showHealthDialog = false
+                }.setNegativeButton(getString(R.string.cancel), null).show()
+        }
     }
 
     private fun setupNetworkStatusMonitoring() {
@@ -132,7 +144,7 @@ class BellDashboardFragment : BaseDashboardFragment() {
 
             val adapter = SurveyAdapter(surveyTitles, { position ->
                 val selectedSurvey = pendingSurveys[position].id
-                AdapterMySubmission.openSurvey(homeItemClickListener, selectedSurvey, true)
+                AdapterMySubmission.openSurvey(homeItemClickListener, selectedSurvey, true, false, "")
             }, alertDialog)
 
             recyclerView.adapter = adapter

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DisclaimerFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DisclaimerFragment.kt
@@ -1,20 +1,26 @@
 package org.ole.planet.myplanet.ui.dashboard
 
 import android.os.Bundle
-import android.text.Html
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
+import org.ole.planet.myplanet.R
 import org.ole.planet.myplanet.databinding.FragmentDisclaimerBinding
-import org.ole.planet.myplanet.utilities.Constants
 
 class DisclaimerFragment : Fragment() {
     private lateinit var fragmentDisclaimerBinding: FragmentDisclaimerBinding
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         fragmentDisclaimerBinding = FragmentDisclaimerBinding.inflate(inflater, container, false)
-        fragmentDisclaimerBinding.tvDisclaimer.text = Html.fromHtml(getString(Constants.DISCLAIMER), HtmlCompat.FROM_HTML_MODE_LEGACY)
         return fragmentDisclaimerBinding.root
     }
-}
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        fragmentDisclaimerBinding.tvDisclaimer.text = HtmlCompat.fromHtml(getString(R.string.disclaimer), HtmlCompat.FROM_HTML_MODE_LEGACY)
+        fragmentDisclaimerBinding.tvDisclaimer.movementMethod = LinkMovementMethod.getInstance()
+    }
+}
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/notification/NotificationsFragment.kt
@@ -111,8 +111,8 @@ class NotificationsFragment : Fragment() {
             "survey" -> {
                 val currentStepExam = mRealm.where(RealmStepExam::class.java).equalTo("name", notification.relatedId)
                     .findFirst()
-                if(context is OnHomeItemClickListener) {
-                    AdapterMySubmission.openSurvey(context as OnHomeItemClickListener, currentStepExam?.id, false)
+                if (context is OnHomeItemClickListener) {
+                    AdapterMySubmission.openSurvey(context as OnHomeItemClickListener, currentStepExam?.id, false, false, "")
                 }
             }
             "task" -> {

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/enterprises/FinanceFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/enterprises/FinanceFragment.kt
@@ -53,7 +53,6 @@ class FinanceFragment : BaseTeamFragment() {
         list = fRealm.where(RealmMyTeam::class.java).notEqualTo("status", "archived")
             .equalTo("teamId", teamId).equalTo("docType", "transaction")
             .sort("date", Sort.DESCENDING).findAllAsync()
-
         list?.addChangeListener { results ->
             updatedFinanceList(results)
         }
@@ -191,11 +190,19 @@ class FinanceFragment : BaseTeamFragment() {
 
     private fun updatedFinanceList(results: RealmResults<RealmMyTeam>) {
         activity?.runOnUiThread {
-            adapterFinance = AdapterFinance(requireActivity(), results)
-            fragmentFinanceBinding.rvFinance.layoutManager = LinearLayoutManager(activity)
-            fragmentFinanceBinding.rvFinance.adapter = adapterFinance
-            adapterFinance?.notifyDataSetChanged()
-            calculateTotal(results)
+            if (!results.isEmpty()) {
+                adapterFinance = AdapterFinance(requireActivity(), results)
+                fragmentFinanceBinding.rvFinance.layoutManager = LinearLayoutManager(activity)
+                fragmentFinanceBinding.rvFinance.adapter = adapterFinance
+                adapterFinance?.notifyDataSetChanged()
+                calculateTotal(results)
+            } else {
+                fragmentFinanceBinding.rvFinance.adapter = null
+                fragmentFinanceBinding.dataLayout.visibility= View.GONE
+                fragmentFinanceBinding.tvNodata.visibility= View.VISIBLE
+
+            }
         }
     }
+
 }
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
@@ -52,6 +52,9 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback {
     var date = Date().toString()
     private var photoPath: String? = ""
     var submitId = ""
+    private var isTeam: Boolean = false
+    private var teamId: String? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         db = DatabaseService(requireActivity())
@@ -60,6 +63,8 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback {
             stepId = requireArguments().getString("stepId")
             stepNumber = requireArguments().getInt("stepNum")
             isMySurvey = requireArguments().getBoolean("isMySurvey")
+            isTeam = requireArguments().getBoolean("isTeam", false)
+            teamId = requireArguments().getString("teamId")
             checkId()
             checkType()
         }
@@ -108,6 +113,8 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback {
     private fun continueExam() {
         if (currentIndex < (questions?.size ?: 0)) {
             startExam(questions?.get(currentIndex))
+        } else if (isTeam == true && type?.startsWith("survey") == true) {
+            showUserInfoDialog()
         } else {
             saveCourseProgress()
             AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
@@ -131,7 +138,7 @@ abstract class BaseExamFragment : Fragment(), ImageCaptureCallback {
 
     private fun showUserInfoDialog() {
         if (!isMySurvey && !exam?.isFromNation!!) {
-            UserInformationFragment.getInstance(sub?.id).show(childFragmentManager, "")
+            UserInformationFragment.getInstance(sub?.id, teamId).show(childFragmentManager, "")
         } else {
             if (!mRealm.isInTransaction) mRealm.beginTransaction()
             sub?.status = "complete"