diff --git a/.env.test b/.env.test index 3456888..f5f3ebc 100644 --- a/.env.test +++ b/.env.test @@ -1,7 +1,6 @@ -API_URL=https://venbait.in/nhance/dev/employeeRest/ -#CHAT_BOT_URL=https://venbait.in/nhance/dev -API_URL_Enrollment=https://venbait.in/enrollment/employeeRest/ -TICKET_API_URL=https://venbait.in/nhance/dev/api +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ +API_URL_Enrollment=https://app.nhanceindia.in/enrolment/employeeRest/ +TICKET_API_URL=https://app.nhanceindia.in/zenith/api ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH -BASE_HREF=/nhance/app/dev/ -ENV=development \ No newline at end of file +BASE_HREF=/app/ +ENV=production diff --git a/.env.uat b/.env.uat index 3456888..f5f3ebc 100644 --- a/.env.uat +++ b/.env.uat @@ -1,7 +1,6 @@ -API_URL=https://venbait.in/nhance/dev/employeeRest/ -#CHAT_BOT_URL=https://venbait.in/nhance/dev -API_URL_Enrollment=https://venbait.in/enrollment/employeeRest/ -TICKET_API_URL=https://venbait.in/nhance/dev/api +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ +API_URL_Enrollment=https://app.nhanceindia.in/enrolment/employeeRest/ +TICKET_API_URL=https://app.nhanceindia.in/zenith/api ticketToken=3YTSia2mRoZ7A4zvBgkqbGPrCd6Ewp8IDOuyjXhVFsl1nxWNcQJ95MeUftKH -BASE_HREF=/nhance/app/dev/ -ENV=development \ No newline at end of file +BASE_HREF=/app/ +ENV=production diff --git a/android/app/.cxx/Debug/145a5j35/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/145a5j35/arm64-v8a/configure_fingerprint.bin index 33b8d99..6af0a36 100644 --- a/android/app/.cxx/Debug/145a5j35/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/145a5j35/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݆3 ހ2 ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/additional_project_files.txt  2  ؒ2} +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/additional_project_files.txt  ݆3  ؒ2} { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/android_gradle_build.json  2 ؒ2 +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/android_gradle_build.json  ݆3 ؒ2  -~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/android_gradle_build_mini.json  2 ؒ2o +~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/android_gradle_build_mini.json  ݆3 ؒ2o m -k/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/build.ninja  2 ؒ2s +k/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/build.ninja  ݆3 ؒ2s q -o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/build.ninja.txt  2x +o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/build.ninja.txt  ݆3x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/build_file_index.txt  2 _ ؒ2y +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/build_file_index.txt  ݆3 _ ؒ2y w -u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/compile_commands.json  2 } +u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/compile_commands.json  ݆3 } { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/compile_commands.json.bin  2 +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/compile_commands.json.bin  ݆3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/metadata_generation_command.txt  2  ؒ2v +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/metadata_generation_command.txt  ݆3  ؒ2v t -r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/prefab_config.json  2  ( ؒ2{ +r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/prefab_config.json  ݆3  ( ؒ2{ y -w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/symbol_folder_index.txt  2  n ؒ2 \ No newline at end of file +w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/arm64-v8a/symbol_folder_index.txt  ݆3  n ؒ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/145a5j35/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/145a5j35/armeabi-v7a/configure_fingerprint.bin index 6df9fe3..5473dca 100644 --- a/android/app/.cxx/Debug/145a5j35/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/145a5j35/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݆3 ހ2  -~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/additional_project_files.txt  2  ڒ2 +~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/additional_project_files.txt  ݆3  ڒ2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/android_gradle_build.json  2 ڒ2 +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/android_gradle_build.json  ݆3 ڒ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/android_gradle_build_mini.json  2 ڒ2q +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/android_gradle_build_mini.json  ݆3 ڒ2q o -m/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/build.ninja  2 ڒ2u +m/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/build.ninja  ݆3 ڒ2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/build.ninja.txt  2z +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/build.ninja.txt  ݆3z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/build_file_index.txt  2 _ ڒ2{ +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/build_file_index.txt  ݆3 _ ڒ2{ y -w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/compile_commands.json  2  +w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/compile_commands.json  ݆3  } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/compile_commands.json.bin  2 +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/compile_commands.json.bin  ݆3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/metadata_generation_command.txt  2  ڒ2x +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/metadata_generation_command.txt  ݆3  ڒ2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/prefab_config.json  2  ( ڒ2} +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/prefab_config.json  ݆3  ( ڒ2} { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/symbol_folder_index.txt  2  p ڒ2 \ No newline at end of file +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/armeabi-v7a/symbol_folder_index.txt  ݆3  p ڒ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/145a5j35/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/145a5j35/x86/configure_fingerprint.bin index bae2000..e4a7485 100644 --- a/android/app/.cxx/Debug/145a5j35/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/145a5j35/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݆3 ހ2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/additional_project_files.txt  2  ܒ2w +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/additional_project_files.txt  ݆3  ܒ2w u -s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/android_gradle_build.json  2 ܒ2| +s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/android_gradle_build.json  ݆3 ܒ2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/android_gradle_build_mini.json  2 ܒ2i +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/android_gradle_build_mini.json  ݆3 ܒ2i g -e/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/build.ninja  2 ܒ2m +e/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/build.ninja  ݆3 ܒ2m k -i/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/build.ninja.txt  2r +i/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/build.ninja.txt  ݆3r p -n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/build_file_index.txt  2 _ ܒ2s +n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/build_file_index.txt  ݆3 _ ܒ2s q -o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/compile_commands.json  2 w +o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/compile_commands.json  ݆3 w u -s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/compile_commands.json.bin  2 +s/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/compile_commands.json.bin  ݆3 } { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/metadata_generation_command.txt  2  ܒ2p +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/metadata_generation_command.txt  ݆3  ܒ2p n -l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/prefab_config.json  2  ( ܒ2u +l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/prefab_config.json  ݆3  ( ܒ2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/symbol_folder_index.txt  2  h ܒ2 \ No newline at end of file +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86/symbol_folder_index.txt  ݆3  h ܒ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/145a5j35/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/145a5j35/x86_64/configure_fingerprint.bin index 5d62e29..f945bda 100644 --- a/android/app/.cxx/Debug/145a5j35/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/145a5j35/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2 ހ2} +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ݆3 ހ2} { -y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/additional_project_files.txt  2  ޒ2z +y/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/additional_project_files.txt  ݆3  ޒ2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/android_gradle_build.json  2 ޒ2 +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/android_gradle_build.json  ݆3 ޒ2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/android_gradle_build_mini.json  2 ޒ2l +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/android_gradle_build_mini.json  ݆3 ޒ2l j -h/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/build.ninja  2 ޒ2p +h/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/build.ninja  ݆3 ޒ2p n -l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/build.ninja.txt  2u +l/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/build.ninja.txt  ݆3u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/build_file_index.txt  2 _ ޒ2v +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/build_file_index.txt  ݆3 _ ޒ2v t -r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/compile_commands.json  2 z +r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/compile_commands.json  ݆3 z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/compile_commands.json.bin  2 +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/compile_commands.json.bin  ݆3  ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/metadata_generation_command.txt  2  ޒ2s +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/metadata_generation_command.txt  ݆3  ޒ2s q -o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/prefab_config.json  2  ( ޒ2x +o/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/prefab_config.json  ݆3  ( ޒ2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/symbol_folder_index.txt  2  k ޒ2 \ No newline at end of file +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/Debug/145a5j35/x86_64/symbol_folder_index.txt  ݆3  k ޒ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/configure_fingerprint.bin index 937673a..6f4486c 100644 --- a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ϔ2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/additional_project_files.txt  ϔ2  ´2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/additional_project_files.txt  3  ´2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/android_gradle_build.json  ϔ2 ´2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/android_gradle_build.json  3 ´2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/android_gradle_build_mini.json  ϔ2 ´2x +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/android_gradle_build_mini.json  3 ´2x v -t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/build.ninja  ϔ2 ´2| +t/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/build.ninja  3 ´2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/build.ninja.txt  ϔ2 +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/build.ninja.txt  3  -}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/build_file_index.txt  ϔ2 _ ´2 +}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/build_file_index.txt  3 _ ´2  -~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/compile_commands.json  ϔ2  +~/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/compile_commands.json  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/compile_commands.json.bin  ϔ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/compile_commands.json.bin  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/metadata_generation_command.txt  ϔ2  ´2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/metadata_generation_command.txt  3  ´2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/prefab_config.json  ϔ2  ( ´2 +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/prefab_config.json  3  ( ´2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/symbol_folder_index.txt  ϔ2  w ´2 \ No newline at end of file +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/arm64-v8a/symbol_folder_index.txt  3  w ´2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/configure_fingerprint.bin index 4046084..63446e5 100644 --- a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ͳϔ2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/additional_project_files.txt  ͳϔ2  Ǵ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/additional_project_files.txt  3  Ǵ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/android_gradle_build.json  ͳϔ2 Ǵ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/android_gradle_build.json  3 Ǵ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/android_gradle_build_mini.json  ͳϔ2 Ǵ2z +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/android_gradle_build_mini.json  3 Ǵ2z x -v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/build.ninja  ͳϔ2 Ǵ2~ +v/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/build.ninja  3 Ǵ2~ | -z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/build.ninja.txt  ͳϔ2 +z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/build.ninja.txt  3  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/build_file_index.txt  ͳϔ2 _ Ǵ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/build_file_index.txt  3 _ Ǵ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/compile_commands.json  ͳϔ2  +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/compile_commands.json  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/compile_commands.json.bin  ͳϔ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/compile_commands.json.bin  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/metadata_generation_command.txt  ͳϔ2  Ǵ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/metadata_generation_command.txt  3  Ǵ2  -}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/prefab_config.json  ͳϔ2  ( Ǵ2 +}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/prefab_config.json  3  ( Ǵ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/symbol_folder_index.txt  ͳϔ2  y Ǵ2 \ No newline at end of file +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/armeabi-v7a/symbol_folder_index.txt  3  y Ǵ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/configure_fingerprint.bin index d0c563f..adc2972 100644 --- a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ճϔ2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/additional_project_files.txt  ճϔ2  ˴2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/additional_project_files.txt  3  ˴2 ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/android_gradle_build.json  ճϔ2 ˴2 +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/android_gradle_build.json  3 ˴2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/android_gradle_build_mini.json  ճϔ2 ˴2r +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/android_gradle_build_mini.json  3 ˴2r p -n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/build.ninja  ճϔ2 ˴2v +n/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/build.ninja  3 ˴2v t -r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/build.ninja.txt  ճϔ2{ +r/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/build.ninja.txt  3{ y -w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/build_file_index.txt  ճϔ2 _ ˴2| +w/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/build_file_index.txt  3 _ ˴2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/compile_commands.json  ճϔ2  +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/compile_commands.json  3  ~ -|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/compile_commands.json.bin  ֳϔ2 +|/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/compile_commands.json.bin  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/metadata_generation_command.txt  ֳϔ2  ˴2y +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/metadata_generation_command.txt  3  ˴2y w -u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/prefab_config.json  ֳϔ2  ( ˴2~ +u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/prefab_config.json  3  ( ˴2~ | -z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/symbol_folder_index.txt  ֳϔ2  q ˴2 \ No newline at end of file +z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86/symbol_folder_index.txt  3  q ˴2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/configure_fingerprint.bin index 033aaac..a2b64f7 100644 --- a/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߳ϔ2 ހ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3 ހ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/additional_project_files.txt  ߳ϔ2  ϴ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/additional_project_files.txt  3  ϴ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/android_gradle_build.json  ߳ϔ2 ϴ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/android_gradle_build.json  3 ϴ2  -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/android_gradle_build_mini.json  ߳ϔ2 ϴ2u +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/android_gradle_build_mini.json  3 ϴ2u s -q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/build.ninja  ߳ϔ2 δ2y +q/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/build.ninja  3 δ2y w -u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/build.ninja.txt  ߳ϔ2~ +u/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/build.ninja.txt  3~ | -z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/build_file_index.txt  ߳ϔ2 _ ϴ2 +z/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/build_file_index.txt  3 _ ϴ2 } -{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/compile_commands.json  ߳ϔ2  +{/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/compile_commands.json  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/compile_commands.json.bin  ߳ϔ2 +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/compile_commands.json.bin  3   -/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/metadata_generation_command.txt  ߳ϔ2  ϴ2| +/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/metadata_generation_command.txt  3  ϴ2| z -x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/prefab_config.json  ߳ϔ2  ( ϴ2 +x/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/prefab_config.json  3  ( ϴ2  -}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/symbol_folder_index.txt  ߳ϔ2  t ϴ2 \ No newline at end of file +}/Users/venbateam/Documents/nhance/post_enrollment_app/android/app/.cxx/RelWithDebInfo/h5v1s1u6/x86_64/symbol_folder_index.txt  3  t ϴ2 \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 6e89555..030598a 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -19,12 +19,12 @@ if (project.hasProperty('google-services.json')) { def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '19' + flutterVersionCode = '22' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '1.0.19' + flutterVersionName = '1.0.22' } def keystoreProperties = new Properties() diff --git a/assets/botman_chat.html b/assets/botman_chat.html index fa655ce..d9cce43 100755 --- a/assets/botman_chat.html +++ b/assets/botman_chat.html @@ -1,38 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + Ask ILA + - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/pages/enrollment/addons.dart b/lib/pages/enrollment/addons.dart index 9216cf7..b8e4184 100755 --- a/lib/pages/enrollment/addons.dart +++ b/lib/pages/enrollment/addons.dart @@ -4315,17 +4315,17 @@ class _addOnsDetailsState extends State { ), ), ]), - floatingActionButton: Responsive.isDesktop(context) - ? null - : isTokenAvailable - ? FloatingActionButton( - onPressed: () => Navigator.push( - context, - MaterialPageRoute(builder: (context) => chatbot()), - ), - child: Icon(Icons.chat), - ) - : null, + // floatingActionButton: Responsive.isDesktop(context) + // ? null + // : isTokenAvailable + // ? FloatingActionButton( + // onPressed: () => Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => chatbot()), + // ), + // child: Icon(Icons.chat), + // ) + // : null, floatingActionButtonLocation: Responsive.isDesktop(context) ? null : isTokenAvailable diff --git a/lib/pages/enrollment/empDetails.dart b/lib/pages/enrollment/empDetails.dart index 6aa04d0..93ef59a 100755 --- a/lib/pages/enrollment/empDetails.dart +++ b/lib/pages/enrollment/empDetails.dart @@ -834,17 +834,17 @@ class _empDetailsState extends State { ), ), ]), - floatingActionButton: Responsive.isDesktop(context) - ? null - : isTokenAvailable - ? FloatingActionButton( - onPressed: () => Navigator.push( - context, - MaterialPageRoute(builder: (context) => chatbot()), - ), - child: Icon(Icons.chat), - ) - : null, + // floatingActionButton: Responsive.isDesktop(context) + // ? null + // : isTokenAvailable + // ? FloatingActionButton( + // onPressed: () => Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => chatbot()), + // ), + // child: Icon(Icons.chat), + // ) + // : null, floatingActionButtonLocation: Responsive.isDesktop(context) ? null : isTokenAvailable diff --git a/lib/pages/enrollment/empReview.dart b/lib/pages/enrollment/empReview.dart index ae20c58..b839350 100755 --- a/lib/pages/enrollment/empReview.dart +++ b/lib/pages/enrollment/empReview.dart @@ -2785,17 +2785,17 @@ class _empReviewDetailsState extends State { ), ), ]), - floatingActionButton: Responsive.isDesktop(context) - ? null - : isTokenAvailable - ? FloatingActionButton( - onPressed: () => Navigator.push( - context, - MaterialPageRoute(builder: (context) => chatbot()), - ), - child: Icon(Icons.chat), - ) - : null, + // floatingActionButton: Responsive.isDesktop(context) + // ? null + // : isTokenAvailable + // ? FloatingActionButton( + // onPressed: () => Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => chatbot()), + // ), + // child: Icon(Icons.chat), + // ) + // : null, floatingActionButtonLocation: Responsive.isDesktop(context) ? null : isTokenAvailable diff --git a/lib/pages/postEnrollment/botman_widget_app.dart b/lib/pages/postEnrollment/botman_widget_app.dart index e77bf42..3408d83 100644 --- a/lib/pages/postEnrollment/botman_widget_app.dart +++ b/lib/pages/postEnrollment/botman_widget_app.dart @@ -1,48 +1,352 @@ -import 'dart:io'; -import 'package:flutter/material.dart'; -import 'package:webview_flutter/webview_flutter.dart'; -import 'package:webview_flutter_android/webview_flutter_android.dart'; -import 'package:flutter/services.dart' show rootBundle; +// import 'dart:io'; +// import 'dart:math'; +// import 'package:flutter/material.dart'; +// import 'package:webview_flutter/webview_flutter.dart'; +// import 'package:webview_flutter_android/webview_flutter_android.dart'; +// import 'package:flutter/services.dart' show rootBundle; +// +// class ChatPage extends StatefulWidget { +// +// final String employeeId; +// final String empCode; +// final String clientId; +// final String clientBranchId; +// final String empName; +// +// const ChatPage({ +// super.key, +// required this.employeeId, +// required this.empCode, +// required this.clientId, +// required this.clientBranchId, +// required this.empName, +// }); +// +// @override +// State createState() => _ChatPageState(); +// } +// +// class _ChatPageState extends State { +// late final WebViewController _controller; +// +// @override +// void initState() { +// super.initState(); +// print('param check'); +// print(widget.empName); +// print(widget.empCode); +// print(widget.clientBranchId); +// print(widget.clientId); +// print(widget.employeeId); +// +// if (Platform.isAndroid) { +// WebViewPlatform.instance = AndroidWebViewPlatform(); +// } +// +// _controller = WebViewController() +// ..setJavaScriptMode(JavaScriptMode.unrestricted) +// ..setNavigationDelegate( +// NavigationDelegate(onPageFinished: (url) { +// _controller.runJavaScript( +// "if(typeof botmanChatWidget !== 'undefined') botmanChatWidget.open();"); +// }), +// ); +// +// _loadBotmanHtml(); +// +// // _controller = WebViewController() +// // ..setJavaScriptMode(JavaScriptMode.unrestricted); +// +// // _loadHtmlAndInitBotman(); +// } +// +// +// String generateSessionId([int length = 15]) { +// const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; +// final random = Random.secure(); +// return List.generate(length, (index) => characters[random.nextInt(characters.length)]).join(); +// } +// +// +// // Future _loadHtmlAndInitBotman() async { +// // final htmlString = await rootBundle.loadString('assets/botman_chat.html'); +// // await _controller.loadHtmlString(htmlString); +// // await Future.delayed(const Duration(milliseconds: 500)); // Wait for widget.js to load +// // +// // final sessionId = generateSessionId(); +// // final safeName = widget.empName.replaceAll("'", "\\'"); // Escape single quotes +// // +// // final js = ''' +// // initBotman({ +// // employee_id: '${widget.employeeId}', +// // session_id: '$sessionId', +// // origin: 'mobile', +// // emp_code: '${widget.empCode}', +// // client_id: '${widget.clientId}', +// // client_branch_id: '${widget.clientBranchId}', +// // emp_name: '$safeName' +// // }); +// // '''; +// // +// // print(js); // ✅ Debug output +// // await _controller.runJavaScript(js); +// // } +// +// +// +// Future _loadBotmanHtml() async { +// final htmlContent = await rootBundle.loadString('assets/botman_chat.html'); +// // Inject localStorage values first +// await _controller.runJavaScript(''' +// localStorage.setItem('empPrimaryId', '12563'); +// localStorage.setItem('empCode', 'HERO00571'); +// localStorage.setItem('client_id', '3843'); +// localStorage.setItem('empClientBranchId', '1793'); +// localStorage.setItem('_postToken', 'XYZ123ABC'); +// localStorage.setItem('gpaEmpName', 'Vishal Vinod Menon G'); +// '''); +// _controller.loadHtmlString(htmlContent); +// } +// +// @override +// Widget build(BuildContext context) { +// return Scaffold( +// appBar: AppBar(title: const Text("Ask ILA")), +// body: WebViewWidget(controller: _controller), +// ); +// } +// } +// +// import 'dart:convert'; +// import 'dart:io'; +// import 'dart:math'; +// import 'package:flutter/material.dart'; +// import 'package:flutter/services.dart' show rootBundle; +// import 'package:nhance_app_pwa/customAppBar/customAppBar.dart'; +// import 'package:webview_flutter/webview_flutter.dart'; +// import 'package:webview_flutter_android/webview_flutter_android.dart'; +// +// class ChatPage extends StatefulWidget { +// final String employeeId; +// final String empCode; +// final String clientId; +// final String clientBranchId; +// final String empName; +// +// const ChatPage({ +// super.key, +// required this.employeeId, +// required this.empCode, +// required this.clientId, +// required this.clientBranchId, +// required this.empName, +// }); +// +// @override +// State createState() => _ChatPageState(); +// } +// +// class _ChatPageState extends State { +// late final WebViewController _controller; +// +// @override +// void initState() { +// super.initState(); +// if (Platform.isAndroid) { +// WebViewPlatform.instance = AndroidWebViewPlatform(); +// } +// +// _controller = WebViewController() +// ..setJavaScriptMode(JavaScriptMode.unrestricted); +// +// _loadHtmlWithBase64Injection(); +// } +// +// String generateSessionId([int length = 15]) { +// const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; +// final random = Random.secure(); +// return List.generate(length, (index) => characters[random.nextInt(characters.length)]).join(); +// } +// +// Future _loadHtmlWithBase64Injection() async { +// String html = await rootBundle.loadString('assets/botman_chat.html'); +// +// final sessionId = generateSessionId(); +// final empName = widget.empName.replaceAll("'", "\\'"); +// final injectedJS = ''' +// +// +// +// '''; +// +// html = html.replaceFirst('\n', injectedJS); // inject just before +// +// final uri = Uri.dataFromString(html, mimeType: 'text/html', encoding: Encoding.getByName('utf-8')); +// await _controller.loadRequest(uri); +// } +// +// @override +// Widget build(BuildContext context) { +// return Scaffold( +// backgroundColor: Colors.white, +// appBar: CustomAppBar(), +// body: WebViewWidget(controller: _controller), +// ); +// } +// } -class ChatPage extends StatefulWidget { - const ChatPage({Key? key}) : super(key: key); +import 'dart:math'; +import 'package:flutter/material.dart'; +import 'package:nhance_app_pwa/customAppBar/customAppBar.dart'; +import 'package:webview_flutter/webview_flutter.dart'; + +class BotmanChatScreen extends StatefulWidget { + + + final String empName; + final String employeeId; + final String sessionId; + final String empCode; + final String clientId; + final String clientBranchId; + + const BotmanChatScreen({ + super.key, + required this.empName, + required this.employeeId, + required this.sessionId, + required this.empCode, + required this.clientId, + required this.clientBranchId, + }); @override - State createState() => _ChatPageState(); + State createState() => _BotmanChatScreenState(); } -class _ChatPageState extends State { +class _BotmanChatScreenState extends State { late final WebViewController _controller; + String getInjectedHTML() { + final uid = Random().nextInt(900000) + 100000; + + return ''' + + + + + + + + // + // + + + + + + '''; + } + @override void initState() { super.initState(); - - if (Platform.isAndroid) { - WebViewPlatform.instance = AndroidWebViewPlatform(); - } - _controller = WebViewController() ..setJavaScriptMode(JavaScriptMode.unrestricted) - ..setNavigationDelegate( - NavigationDelegate(onPageFinished: (url) { - _controller.runJavaScript( - "if(typeof botmanChatWidget !== 'undefined') botmanChatWidget.open();"); - }), - ); - - _loadBotmanHtml(); - } - - Future _loadBotmanHtml() async { - final htmlContent = await rootBundle.loadString('assets/botman_chat.html'); - _controller.loadHtmlString(htmlContent); + ..loadHtmlString(getInjectedHTML()); } @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: const Text("Ask ILA")), + backgroundColor: Colors.white, + appBar: CustomAppBar(), body: WebViewWidget(controller: _controller), ); } diff --git a/lib/pages/postEnrollment/claimshistory.dart b/lib/pages/postEnrollment/claimshistory.dart index 0b178b1..46bf013 100644 --- a/lib/pages/postEnrollment/claimshistory.dart +++ b/lib/pages/postEnrollment/claimshistory.dart @@ -246,16 +246,16 @@ class _ClaimHistoryPopupState extends State { children: [ Responsive.isDesktop(context) ? Row( - children: keyValueWidgets - .map((w) => Expanded(child: w)) - .toList(), - ) + children: keyValueWidgets + .map((w) => Expanded(child: w)) + .toList(), + ) : Container( - width: MediaQuery.of(context).size.width, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: keyValueWidgets), - ), + width: MediaQuery.of(context).size.width, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: keyValueWidgets), + ), // Row( // children: [ // Expanded( @@ -271,16 +271,16 @@ class _ClaimHistoryPopupState extends State { SizedBox(height: Responsive.isDesktop(context) ? 16 : 8), Responsive.isDesktop(context) ? Row( - children: keyValueWidgetRow - .map((w) => Expanded(child: w)) - .toList(), - ) + children: keyValueWidgetRow + .map((w) => Expanded(child: w)) + .toList(), + ) : Container( - width: MediaQuery.of(context).size.width, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: keyValueWidgetRow), - ), + width: MediaQuery.of(context).size.width, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: keyValueWidgetRow), + ), ], ), ), @@ -371,60 +371,63 @@ class _ClaimHistoryPopupState extends State { isLoading ? Container( - // color: Color(0x98FFFCE5), // Semi-transparent background - child: Center( - child: // Your GIF loader widget - Image.asset( - height: 60, - width: 60, - 'assets/nhance-loader.gif'), // Adjust path to your GIF loader - ), - ) + // color: Color(0x98FFFCE5), // Semi-transparent background + child: Center( + child: // Your GIF loader widget + Image.asset( + height: 60, + width: 60, + 'assets/nhance-loader.gif'), // Adjust path to your GIF loader + ), + ) : Container( - child: getClaimsHistoryList.isNotEmpty - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: List.generate(stepKeys.length, (index) { - String stepTitleKey = stepKeys[index]; - Map stepData = - stepMap[stepTitleKey]; + child: getClaimsHistoryList.isNotEmpty + ? Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: List.generate(stepKeys.length, (index) { + String stepTitleKey = stepKeys[index]; + Map stepData = + stepMap[stepTitleKey]; - print('stepTitleKey'); - print(stepTitleKey); - print('stepData'); - print(stepData); + print('stepTitleKey'); + print(stepTitleKey); + print('stepData'); + print(stepData); - return _buildStep( - stepNumber: index + 1, - title: _getStepTitleFromApi( - stepTitleKey, stepData), - content: _getStepContentFromApi(stepData), - isLast: index == stepKeys.length - 1, - ); - }), - ) - : Container( - height: MediaQuery.of(context).size.height * 0.4, - // color: Colors.red, - child: Center( - child: Column( - children: [ - Image.asset( - 'assets/searchData.jpg', // Replace 'default_image.png' with your default image asset path - width: 200, - height: 200, - fit: BoxFit.cover, - ), - Text( - 'No Claim History', - style: TextStyle( - fontWeight: FontWeight.w500, - fontSize: 15), - ), - ], - )), - ), - ), + Widget content = _getStepContentFromApi(stepData); + + return _buildStep( + stepNumber: index + 1, + title: _getStepTitleFromApi( + stepTitleKey, stepData), + content: content, + // content: _getStepContentFromApi(stepData), + isLast: index == stepKeys.length - 1, + ); + }), + ) + : Container( + height: MediaQuery.of(context).size.height * 0.4, + // color: Colors.red, + child: Center( + child: Column( + children: [ + Image.asset( + 'assets/searchData.jpg', // Replace 'default_image.png' with your default image asset path + width: 200, + height: 200, + fit: BoxFit.cover, + ), + Text( + 'No Claim History', + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: 15), + ), + ], + )), + ), + ), ], ), ), @@ -439,6 +442,13 @@ class _ClaimHistoryPopupState extends State { bool isLast = false, }) { print(title); + final noContent; + if ((content as Column).children.isEmpty) { + noContent = 0; + } else { + noContent = 1; + } + return Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -470,7 +480,8 @@ class _ClaimHistoryPopupState extends State { // Dotted line below circle (except for last step) if (!isLast) Container( - height: 50, // increase to extend line + height: noContent == 1 ? 50 : 20, + // increase to extend line width: 2, margin: EdgeInsets.only(top: 4, bottom: 4), child: CustomPaint( @@ -488,18 +499,19 @@ class _ClaimHistoryPopupState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ title, - SizedBox(height: 8), - Container( - width: double.infinity, - padding: EdgeInsets.all(12), - decoration: BoxDecoration( - color: Color(0xFFF7F7F7), - borderRadius: BorderRadius.circular(8), - border: Border.all(color: Color(0xFFE0E0E0)), + if (noContent == 1) SizedBox(height: noContent == 0 ? 0 : 8), + if (noContent == 1) + Container( + width: double.infinity, + padding: EdgeInsets.all(12), + decoration: BoxDecoration( + color: Color(0xFFF7F7F7), + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Color(0xFFE0E0E0)), + ), + child: content, ), - child: content, - ), - SizedBox(height: isLast ? 0 : 16), + if (noContent == 1) SizedBox(height: isLast ? 0 : 16), ], ), ), @@ -564,7 +576,7 @@ class _ClaimHistoryPopupState extends State { Widget _buildKeyValue(String title, String value) { final displayValue = - (value == null || value.trim().isEmpty) ? 'N/A' : value; + (value == null || value.trim().isEmpty) ? 'N/A' : value; return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -591,7 +603,7 @@ class _ClaimHistoryPopupState extends State { Widget _buildHistoryListData(String title, String value) { final displayValue = - (value == null || value.trim().isEmpty) ? 'N/A' : value; + (value == null || value.trim().isEmpty) ? 'N/A' : value; final titleText = Text( title, @@ -616,55 +628,55 @@ class _ClaimHistoryPopupState extends State { padding: const EdgeInsets.symmetric(vertical: 1), // optional spacing child: Responsive.isDesktop(context) ? Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded( - child: Align( - alignment: Alignment.centerLeft, child: titleText)), - Expanded( - child: Align( - alignment: Alignment.centerRight, child: valueText)), + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + child: Align( + alignment: Alignment.centerLeft, child: titleText)), + Expanded( + child: Align( + alignment: Alignment.centerRight, child: valueText)), - // Title - Align to center left - // Expanded( - // child: Align( - // alignment: Alignment.centerLeft, - // child: Text( - // title, - // style: GoogleFonts.poppins( - // color: const Color(0xFF747474), - // fontWeight: FontWeight.w400, - // fontSize: 14, - // ), - // ), - // ), - // ), + // Title - Align to center left + // Expanded( + // child: Align( + // alignment: Alignment.centerLeft, + // child: Text( + // title, + // style: GoogleFonts.poppins( + // color: const Color(0xFF747474), + // fontWeight: FontWeight.w400, + // fontSize: 14, + // ), + // ), + // ), + // ), - // Value - Align to center right - // Expanded( - // child: Align( - // alignment: Alignment.centerRight, - // child: Text( - // displayValue, - // style: GoogleFonts.poppins( - // color: const Color(0xFF000000), - // fontWeight: FontWeight.w400, - // fontSize: 14, - // ), - // ), - // ), - // ), - ], - ) + // Value - Align to center right + // Expanded( + // child: Align( + // alignment: Alignment.centerRight, + // child: Text( + // displayValue, + // style: GoogleFonts.poppins( + // color: const Color(0xFF000000), + // fontWeight: FontWeight.w400, + // fontSize: 14, + // ), + // ), + // ), + // ), + ], + ) : Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - titleText, - SizedBox(height: 4), - valueText, - ], - ), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + titleText, + SizedBox(height: 4), + valueText, + ], + ), ); } } @@ -691,4 +703,4 @@ class DottedLinePainter extends CustomPainter { @override bool shouldRepaint(CustomPainter oldDelegate) => false; -} +} \ No newline at end of file diff --git a/lib/pages/postEnrollment/home.dart b/lib/pages/postEnrollment/home.dart index 5e82f85..024938c 100755 --- a/lib/pages/postEnrollment/home.dart +++ b/lib/pages/postEnrollment/home.dart @@ -1,5 +1,6 @@ import 'dart:convert'; import 'dart:io'; +import 'dart:math'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -69,10 +70,10 @@ class _HomeState extends State { _loadToken(); checkEnrollToken(); - if(kIsWeb){ - // openBotmanChat(); - - + // if(kIsWeb){ + // openBotmanChat(); + // + // // // Push a dummy state so back button triggers popstate instead of navigating // html.window.history.pushState(null, 'home', html.window.location.href); // @@ -83,7 +84,7 @@ class _HomeState extends State { // // Re-push to prevent leaving // html.window.history.pushState(null, 'home', html.window.location.href); // }); - } + // } // if (Platform.isAndroid) { // WebViewPlatform.instance = AndroidWebViewPlatform(); // } @@ -105,8 +106,12 @@ class _HomeState extends State { // 'openBotmanChat'); // Correct way to call JS function // } // } - - + // + // void repositionBotman() { + // if (kIsWeb) { + // js.context.callMethod('repositionBotmanWidget'); + // } + // } void _showBackConfirmationDialog() { _dialogShown = true; @@ -143,12 +148,6 @@ class _HomeState extends State { Navigator.pushReplacementNamed(context, 'login'); } - // void repositionBotman() { - // if (kIsWeb) { - // js.context.callMethod('repositionBotmanWidget'); - // } - // } - Future checkEnrollToken() async { SharedPreferences prefs = await SharedPreferences.getInstance(); setState(() { @@ -266,6 +265,12 @@ class _HomeState extends State { } } + String generateSessionId([int length = 15]) { + const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + final random = Random.secure(); + return List.generate(length, (index) => characters[random.nextInt(characters.length)]).join(); + } + @override Widget build(BuildContext context) { if (!Responsive.isDesktop(context)) @@ -724,13 +729,42 @@ class _HomeState extends State { ]), )), // Positioned( - // bottom: 90, - // right: 20, + // bottom: 25, + // right: 15, // child: GestureDetector( - // onTap: () { + // onTap: () async { + // // Navigator.of(context).push( + // // MaterialPageRoute(builder: (context) => const ChatPage()), + // // ); + // final sessionId = generateSessionId(); + // final SharedPreferences prefs = await SharedPreferences.getInstance(); + // final empClientBranchId = prefs.getString('empClientBranchId') ?? ''; + // final empCodeString = prefs.getString('empCode') ?? ''; + // final empPrimaryId = prefs.getString('empPrimaryId') ?? ''; + // final client_id = prefs.getString('client_id') ?? ''; + // final gpaEmpName = prefs.getString('gpaEmpName') ?? ''; + // + // print('param check from home'); + // print(gpaEmpName); + // print(empCodeString); + // print(empClientBranchId); + // print(client_id); + // print(empPrimaryId); + // // Navigator.of(context).push( - // MaterialPageRoute(builder: (context) => const ChatPage()), + // MaterialPageRoute( + // builder: (context) => BotmanChatScreen( + // // builder: (context) => ChatPage( + // sessionId: sessionId, + // employeeId: empPrimaryId, + // empCode: empCodeString, + // clientId: client_id, + // clientBranchId: empClientBranchId, + // empName: gpaEmpName, + // ), + // ), // ); + // // }, // child: Container( // width: 60, @@ -747,10 +781,10 @@ class _HomeState extends State { // ], // ), // alignment: Alignment.center, - // child: const Text( - // "Ask\nILA", - // style: TextStyle(color: Colors.white, fontSize: 12), - // textAlign: TextAlign.center, + // child: const Icon( + // Icons.chat, // you can change this to any icon you like + // color: Colors.white, + // size: 20, // ), // ), // ), diff --git a/lib/pages/postEnrollment/planclaimsform.dart b/lib/pages/postEnrollment/planclaimsform.dart index f1e25fe..18bb40f 100755 --- a/lib/pages/postEnrollment/planclaimsform.dart +++ b/lib/pages/postEnrollment/planclaimsform.dart @@ -89,6 +89,13 @@ class _planclaimsformState extends State { bool isServiceValid = true; bool isPolicyValid = true; bool isMemberValid = true; + bool isSubjectValid = true; + bool isHospitalNameValid = true; + bool isAdmitDischargeValid = true; + bool isClaimAmountValid = true; + bool isAccidentDateValid = true; + bool isIntimationDateValid = true; + @override void initState() { @@ -484,14 +491,26 @@ class _planclaimsformState extends State { isServiceValid = serviceId != null; isPolicyValid = policyNumberId != null; isMemberValid = selectedMemberId != null; + isSubjectValid = subjectController.text.trim().isNotEmpty; + isHospitalNameValid = policyTypeCondition != 1 || hospitalNameController.text.trim().isNotEmpty; + isAdmitDischargeValid = policyTypeCondition != 1 || (admitDate != null && dischargeDate != null); + isClaimAmountValid = serviceId != 1 || claimAmountController.text.trim().isNotEmpty; + isAccidentDateValid = (serviceId == 2 || serviceId == 3 || serviceId == 4) ? accidentDate != null : true; + isIntimationDateValid = (serviceId == 2 || serviceId == 3 || serviceId == 4) ? intimationDate != null : true; }); - if (isServiceValid && isPolicyValid && isMemberValid) { - - print("All fields are valid, submitting..."); + if (isServiceValid && + isPolicyValid && + isMemberValid && + isSubjectValid && + isHospitalNameValid && + isAdmitDischargeValid && + isClaimAmountValid && + isAccidentDateValid && + isIntimationDateValid) { + // Proceed to submit } else { ToastHelper.showErrorToast(context, 'Please Fill Required Fields'); - print("Validation failed."); return; } @@ -1004,8 +1023,13 @@ SizedBox(height: 15), // 'name', // selectedMemberId, // Pass current selectedMemberId as selectedValue // ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ buildTextField('Subject', subjectController), + if (!isSubjectValid) + Text('Please enter the Subject', style: TextStyle(color: Colors.red)), SizedBox(height: 15), buildTextAreaField( 'Message', @@ -1017,20 +1041,20 @@ SizedBox(height: 15), // 'Accident Details', // accidentDetailsController), SizedBox(height: 15), - if (policyTypeCondition == - 1) - buildTextField( - 'Hospital Name', - hospitalNameController), + if (policyTypeCondition == 1) ...[ + buildTextField('Hospital Name', hospitalNameController), + if (!isHospitalNameValid) + Text('Please enter the Hospital Name', style: TextStyle(color: Colors.red)), + ], SizedBox(height: 15), if (serviceId == 2 || serviceId == 3 || serviceId == 4) ...[ buildDatePickerField( label: - 'Date of Birth', + 'Date of Birth', selectedDate: - birthDate, + birthDate, allowFuture: false, onDateSelected: (selectedDate) { @@ -1042,33 +1066,27 @@ SizedBox(height: 15), ), SizedBox(height: 15), buildDatePickerField( - label: - 'Accident Date', - selectedDate: - accidentDate, + label: 'Accident Date', + selectedDate: accidentDate, allowFuture: false, minDate: parsedPolicyStartDate, maxDate: parsedPolicyEndDate, - onDateSelected:(selectedDate) { + onDateSelected: (selectedDate) { setState(() { - if (deathDate != null) { - deathDate = null; - } - - // If intimationDate is before the new accidentDate, reset it - if (intimationDate != null) { - intimationDate = null; - } + if (deathDate != null) deathDate = null; + if (intimationDate != null) intimationDate = null; accidentDate = selectedDate; }); }, ), + if (!isAccidentDateValid) + Text('Please select the Accident Date', style: TextStyle(color: Colors.red)), SizedBox(height: 15), buildDatePickerField( label: - 'Date of Death', + 'Date of Death', selectedDate: - deathDate, + deathDate, allowFuture: false, minDate: accidentDate ?? parsedPolicyStartDate, maxDate: parsedPolicyEndDate, @@ -1082,62 +1100,52 @@ SizedBox(height: 15), ), SizedBox(height: 15), buildDatePickerField( - label: - 'Date of Intimation', - selectedDate: - intimationDate, + label: 'Date of Intimation', + selectedDate: intimationDate, allowFuture: false, - minDate: accidentDate ?? - (deathDate ?? parsedPolicyStartDate), + minDate: accidentDate ?? deathDate ?? parsedPolicyStartDate, maxDate: parsedPolicyEndDate, - onDateSelected: - (selectedDate) { + onDateSelected: (selectedDate) { setState(() { - intimationDate = - selectedDate; + intimationDate = selectedDate; }); }, ), + if (!isIntimationDateValid) + Text('Please select the Intimation Date', style: TextStyle(color: Colors.red)), ], SizedBox(height: 15), // buildTextAreaField( // 'Accident Details', // accidentDetailsController), // SizedBox(height: 15), - if (policyTypeCondition == - 1) + if (policyTypeCondition == 1) ...[ InkWell( - onTap: () => - _pickFromToDate( - context), + onTap: () => _pickFromToDate(context), child: InputDecorator( - decoration: - InputDecoration( - labelText: - 'Admit Date - Discharge Date', - border: - OutlineInputBorder(), + decoration: InputDecoration( + labelText: 'Admit Date - Discharge Date', + border: OutlineInputBorder(), ), child: Text( - admitDate != - null && - dischargeDate != - null + admitDate != null && dischargeDate != null ? '${admitDateController.text} to ${dischargeDateController.text}' : 'Select Admit and Discharge Dates', - style: TextStyle( - color: Colors - .black), + style: TextStyle(color: Colors.black), ), ), ), + if (!isAdmitDischargeValid) + Text('Please select Admit and Discharge Dates', style: TextStyle(color: Colors.red)), + ], + SizedBox(height: 15), - if (serviceId == 1) - buildTextField( - 'Claim Amount', - claimAmountController, - TextInputType.number, - ), + if (serviceId == 1) ...[ + buildTextField('Claim Amount', claimAmountController, TextInputType.number), + if (!isClaimAmountValid) + Text('Please enter the Claim Amount', style: TextStyle(color: Colors.red)), + ], + SizedBox(height: 15), if (serviceId == 2 || serviceId == 3 || @@ -1147,6 +1155,9 @@ SizedBox(height: 15), sumInsuredController, TextInputType.number, ), + ] + ), + ], ), ), diff --git a/lib/pages/verify.dart b/lib/pages/verify.dart index 1e95595..7eb1216 100755 --- a/lib/pages/verify.dart +++ b/lib/pages/verify.dart @@ -452,15 +452,19 @@ class _MyVerifyState extends State { smsCode: otp, ); - // final userCredential = await FirebaseAuth.instance.signInWithCredential(credential); - // await FirebaseAuth.instance.signInWithCredential(credential); + print('credential $credential'); - // if (userCredential.user != null) { + final userCredential = await FirebaseAuth.instance.signInWithCredential(credential); + // await FirebaseAuth.instance.signInWithCredential(credential); + print('otp firebase check'); + + if (userCredential.user != null) { + print('otp firebase check done'); bool otpVerifyStatus = true; generateToken(otpVerifyStatus); - // } else { - // ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again.'); - // } + } else { + ToastHelper.showErrorToast(context, 'Invalid OTP. Please try again.'); + } // await FirebaseAuth.instance.signInWithCredential(credential).then((userCredential) async { // if (userCredential.user != null) { diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 7ba8699..35427fa 100755 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -25,7 +25,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin")) - LocalAuthPlugin.register(with: registry.registrar(forPlugin: "LocalAuthPlugin")) + FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/pubspec.yaml b/pubspec.yaml index a0755ce..c0da322 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,8 +16,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.19+19 -#version: 1.0.5+6 +#version: 1.0.22+22 +version: 1.0.8+9 environment: sdk: '>=3.3.3 <4.0.0' diff --git a/web/index.html b/web/index.html index 1dcd904..f3a93f8 100755 --- a/web/index.html +++ b/web/index.html @@ -161,8 +161,8 @@ body.show-botman #botmanWidgetRoot { console.log("Initializing Botman Chat"); window.botmanWidget = { - chatServer: 'https://venbait.in/nhance/dev/chat', - frameEndpoint: 'https://venbait.in/nhance/dev/widget', + chatServer: 'https://venbait.in/nhance/chatbot/chat', + frameEndpoint: 'https://venbait.in/nhance/chatbot/widget', title: "Ask ILA", introMessage: "", bubbleBackground: "#007bff",