Survey-Question-Logic-Implemented #2262

sujalagrawal2 · 2024-12-09T07:25:15Z

Fixes JIRA

Please Add Screenshots If there are any UI changes.

survey_question_video.mp4

Please make sure these boxes are checked before submitting your pull request - thanks!

Apply the MifosStyle.xml style template to your code in Android Studio.
Run the unit tests with ./gradlew check to make sure you didn't break anything
If you have multiple commits please combine them into one commit by squashing them.

itsPronay · 2024-12-09T18:13:07Z

...e/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt

    viewModel: SurveySubmitViewModel = hiltViewModel(),
+    queViewModel: SurveyQuestionViewModel = hiltViewModel(),


submitViewmodel
quesViewmodel / questionViewmodel

itsPronay · 2024-12-09T18:14:28Z

...e/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt

+    val uiState2 by queViewModel.surveyQuestionUiState.collectAsStateWithLifecycle()
    val uiState by viewModel.surveySubmitUiState.collectAsStateWithLifecycle()


choose an appropriate name, don't just do uiState , uiState2. its confusing,

itsPronay · 2024-12-09T18:29:00Z

...e/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt

@@ -79,68 +81,107 @@ import java.util.Date
 @Composable
 internal fun SurveyQuestionScreen(
    navigateBack: () -> Unit,
-    survey: Survey?,
+    id: Int,


dont pass id in here, retrieve it from viewmodel.

…tation-Issue

…tation-Issue # Conflicts: # core/data/src/main/java/com/mifos/core/data/di/DataModule.kt

…tation-Issue

…c-Implementation-Issue' into MIFOSAC-292-Survey-Question-Logic-Implementation-Issue

itsPronay · 2024-12-30T18:41:14Z

@sujalagrawal2 checks are failing. can you fix them?

sujalagrawal2 · 2025-01-01T05:28:08Z

@itsPronay checks have been fixed. Please review.

itsPronay · 2025-01-02T11:01:41Z

@itsPronay checks have been fixed. Please review.

@sujalagrawal2 still not fixed. Run
./gradlew spotlessApply and ./gradlew detekt after pulling the changes

…tation-Issue

sujalagrawal2 · 2025-01-04T17:53:46Z

@itsPronay please review

itsPronay · 2025-01-06T19:21:40Z

...lient/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionViewModel.kt

+    private val surveyQuestionRepository: SurveyQuestionRepository,
+    private val savedStateHandle: SavedStateHandle,
+) : ViewModel() {
+    val surveyId = savedStateHandle.getStateFlow(key = Constants.CLIENT_ID, initialValue = -1)


set initial to 0

itsPronay · 2025-01-06T19:26:19Z

feature/client/src/main/java/com/mifos/feature/client/navigation/ClientScreens.kt

+    data object ClientSurveyQuestionScreen : ClientScreens("client_survey_question_screen/{${Constants.CLIENT_ID}}") {
+        fun argument(surveyId: Int) = "client_survey_question_screen/$surveyId"
+    }


client ID? shouldn't this be survey_id !?

Nahi bhai, I think clientid is correct??? We are taking the survey for that particular client right??

@Darkeye14 Correct me if I am wrong, but on line 49 we are passing surveyId right?? Even in the ViewModel, we are retrieving that value and storing it in the surveyId variable. however on line 48, it says Client_ID

Shouldn’t both be the same!?!

yea in my opinion both should be the same.. either survey_id or client_id depending on what we are passing

nahi bhai, i think this is correct!!

oh... my apologies. I didn't see we are using 2 view models here. @sujalagrawal2 its correct

Darkeye14 · 2025-01-06T19:30:30Z

core/data/src/main/java/com/mifos/core/data/repository/SurveyQuestionRepository.kt

+
+interface SurveyQuestionRepository {
+
+    fun getSurvey(surveyId: Int): Observable<Survey>


@itsPronay bhai, what do you say about using Flow instead of Observables???

yea bhai, we can use that. but it shouldn't be an issue now i guess, since we are using Observable in the whole project.

Darkeye14 · 2025-01-06T19:33:12Z

feature/client/src/main/java/com/mifos/feature/client/navigation/ClientScreens.kt

+    data object ClientSurveyQuestionScreen : ClientScreens("client_survey_question_screen/{${Constants.CLIENT_ID}}") {
+        fun argument(surveyId: Int) = "client_survey_question_screen/$surveyId"
+    }


Nahi bhai, I think clientid is correct??? We are taking the survey for that particular client right??

Darkeye14 · 2025-01-06T19:34:33Z

core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveyQuestionRepositoryImp.kt

+class SurveyQuestionRepositoryImp @Inject constructor(private val dataManagerSurveys: DataManagerSurveys) :
+    SurveyQuestionRepository {
+
+    override fun getSurvey(surveyId: Int): Observable<Survey> {


Darkeye14 · 2025-01-06T20:14:31Z

feature/client/src/main/java/com/mifos/feature/client/navigation/ClientScreens.kt

+    data object ClientSurveyQuestionScreen : ClientScreens("client_survey_question_screen/{${Constants.CLIENT_ID}}") {
+        fun argument(surveyId: Int) = "client_survey_question_screen/$surveyId"
+    }


nahi bhai, i think this is correct!!

Darkeye14 · 2025-01-06T20:15:33Z

mifosng-android/src/main/java/com/mifos/mifosxdroid/components/Navigation.kt

@@ -105,7 +106,8 @@ fun Navigation(
            hasDatatables = navController::navigateDataTableList,
            onDocumentClicked = navController::navigateToDocumentListScreen,
            onCardClicked = { position, survey ->
-                //    TODO
+                val id: Int = survey[position].id


theres no need to explicitly specify the data type, i think. just a suggestion tho.

Survey-Question-Logic-Implementation

24a3491

itsPronay suggested changes Dec 9, 2024

View reviewed changes

sujalagrawal2 and others added 8 commits December 10, 2024 08:40

Merge branch 'master' into MIFOSAC-292-Survey-Question-Logic-Implemen…

496965c

…tation-Issue

Survey-Question-Logic-Implementation(modified)

32c3911

Applied spotless and detekt on feature:client

1198dd9

Merge branch 'master' into MIFOSAC-292-Survey-Question-Logic-Implemen…

47c919b

…tation-Issue # Conflicts: # core/data/src/main/java/com/mifos/core/data/di/DataModule.kt

Resolved merge conflict

a73616c

Merge branch 'master' into MIFOSAC-292-Survey-Question-Logic-Implemen…

39a35e3

…tation-Issue

Changes have been pulled.

22d7fbe

Merge remote-tracking branch 'origin/MIFOSAC-292-Survey-Question-Logi…

2b325d7

…c-Implementation-Issue' into MIFOSAC-292-Survey-Question-Logic-Implementation-Issue

Checks have been fixed.

e27ea7b

sujalagrawal2 added 2 commits January 4, 2025 23:10

Merge branch 'master' into MIFOSAC-292-Survey-Question-Logic-Implemen…

e2a34eb

…tation-Issue

Applied spotlessApply and detekt

fdcb983

itsPronay reviewed Jan 6, 2025

View reviewed changes

Darkeye14 reviewed Jan 6, 2025

View reviewed changes

Darkeye14 approved these changes Jan 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Survey-Question-Logic-Implemented #2262

Survey-Question-Logic-Implemented #2262

sujalagrawal2 commented Dec 9, 2024

itsPronay Dec 9, 2024

itsPronay Dec 9, 2024

itsPronay Dec 9, 2024

itsPronay commented Dec 30, 2024

sujalagrawal2 commented Jan 1, 2025

itsPronay commented Jan 2, 2025 •

edited

Loading

sujalagrawal2 commented Jan 4, 2025

itsPronay Jan 6, 2025

itsPronay Jan 6, 2025

Darkeye14 Jan 6, 2025 •

edited

Loading

itsPronay Jan 6, 2025

itsPronay Jan 6, 2025 •

edited

Loading

Darkeye14 Jan 6, 2025

itsPronay Jan 6, 2025 •

edited

Loading

Darkeye14 Jan 6, 2025

itsPronay Jan 6, 2025

Darkeye14 Jan 6, 2025

Darkeye14 Jan 6, 2025 •

edited

Loading

Darkeye14 Jan 6, 2025

Darkeye14 Jan 6, 2025

Darkeye14 Jan 6, 2025

		viewModel: SurveySubmitViewModel = hiltViewModel(),
		queViewModel: SurveyQuestionViewModel = hiltViewModel(),

		val uiState2 by queViewModel.surveyQuestionUiState.collectAsStateWithLifecycle()
		val uiState by viewModel.surveySubmitUiState.collectAsStateWithLifecycle()


		interface SurveyQuestionRepository {

		fun getSurvey(surveyId: Int): Observable<Survey>

Survey-Question-Logic-Implemented #2262

Are you sure you want to change the base?

Survey-Question-Logic-Implemented #2262

Conversation

sujalagrawal2 commented Dec 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itsPronay commented Dec 30, 2024

sujalagrawal2 commented Jan 1, 2025

itsPronay commented Jan 2, 2025 • edited Loading

sujalagrawal2 commented Jan 4, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Darkeye14 Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itsPronay Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itsPronay Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Darkeye14 Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itsPronay commented Jan 2, 2025 •

edited

Loading

Darkeye14 Jan 6, 2025 •

edited

Loading

itsPronay Jan 6, 2025 •

edited

Loading

itsPronay Jan 6, 2025 •

edited

Loading

Darkeye14 Jan 6, 2025 •

edited

Loading