diff --git a/android/build.gradle b/android/build.gradle
index abef75b..2c90dbd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.8.20'
+ ext.kotlin_version = '1.9.10'
repositories {
google()
mavenCentral()
@@ -11,6 +11,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.8'
classpath 'com.huawei.agconnect:agcp:1.8.0.300'
+ classpath "com.android.tools:r8:8.2.33"
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 2260f45..56359bf 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1836M
android.useAndroidX=true
android.enableJetifier=true
+org.gradle.java.home=/Users/user/Library/Java/JavaVirtualMachines/jbr-17.0.12/Contents/Home/
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 2f8758c..1e830b7 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Thu Mar 06 11:40:30 AST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
\ No newline at end of file
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 9625e10..7c56964 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
CFBundleVersion
1.0
MinimumOSVersion
- 11.0
+ 12.0
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 1eb87d0..32f5090 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -160,7 +160,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@@ -232,6 +232,7 @@
files = (
);
inputPaths = (
+ "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index c87d15a..5e31d3d 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
json) {
aLPHANUMERICALLOWEDFLAG = json['ALPHANUMERIC_ALLOWED_FLAG'];
@@ -148,6 +150,7 @@ class GetEITDFFStructureList {
uSEDFLAG = json['USED_FLAG'];
vALIDATIONTYPE = json['VALIDATION_TYPE'];
vALIDATIONTYPEDSP = json['VALIDATION_TYPE_DSP'];
+ vSSRCHFLAG = json['VS_SRCH_FLAG'];
}
Map toJson() {
@@ -203,6 +206,7 @@ class GetEITDFFStructureList {
data['USED_FLAG'] = this.uSEDFLAG;
data['VALIDATION_TYPE'] = this.vALIDATIONTYPE;
data['VALIDATION_TYPE_DSP'] = this.vALIDATIONTYPEDSP;
+ data['VS_SRCH_FLAG'] =this.vSSRCHFLAG;
return data;
}
diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
index 73f05bc..f5cae16 100644
--- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
+++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
@@ -684,42 +684,52 @@ class _DynamicInputScreenState extends State {
).paddingOnly(bottom: 12);
}
} else {
- return PopupMenuButton(
- child: DynamicTextFieldWidget(
- (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""),
- model.eSERVICESDV?.pVALUECOLUMNNAME ?? "",
- isEnable: false,
- isPopup: true,
- isInputTypeNum: true,
- isReadOnly: model.rEADONLY == "Y",
- ).paddingOnly(bottom: 12),
- itemBuilder: (_) => >[
- if (model.rEADONLY != "Y")
- for (int i = 0; i < model.eSERVICESVS!.length; i++)
- PopupMenuItem(
- value: i,
- child: Column(
- children: [
- Text(model.eSERVICESVS![i].vALUECOLUMNNAME!),
- const PopupMenuDivider(),
- ],
- )),
- ],
- onSelected: (int popipIndex) async {
- ESERVICESDV eservicesdv = ESERVICESDV(
- pIDCOLUMNNAME: model.eSERVICESVS![popipIndex].iDCOLUMNNAME,
- pRETURNMSG: "null",
- pRETURNSTATUS: "null", //getEitDffStructureList![popipIndex].dEFAULTVALUE,
- pVALUECOLUMNNAME: model.eSERVICESVS![popipIndex].vALUECOLUMNNAME);
- getEitDffStructureList![index].eSERVICESDV = eservicesdv;
- setState(() {});
- if (model.cHILDSEGMENTSVSSplited?.isNotEmpty ?? false) {
- await calGetValueSetValues(model);
- }
- if (model.cHILDSEGMENTSDVSplited?.isNotEmpty ?? false) {
- await getDefaultValues(model);
- }
- });
+ //condition need to be added here.
+ if(model.vSSRCHFLAG =='Y'){
+
+
+ }else {
+ return PopupMenuButton(
+ child: DynamicTextFieldWidget(
+ (model.sEGMENTPROMPT ?? "") +
+ (model.rEQUIREDFLAG == "Y" ? "*" : ""),
+ model.eSERVICESDV?.pVALUECOLUMNNAME ?? "",
+ isEnable: false,
+ isPopup: true,
+ isInputTypeNum: true,
+ isReadOnly: model.rEADONLY == "Y",
+ ).paddingOnly(bottom: 12),
+ itemBuilder: (_) =>
+ >[
+ if (model.rEADONLY != "Y")
+ for (int i = 0; i < model.eSERVICESVS!.length; i++)
+ PopupMenuItem(
+ value: i,
+ child: Column(
+ children: [
+ Text(model.eSERVICESVS![i].vALUECOLUMNNAME!),
+ const PopupMenuDivider(),
+ ],
+ )),
+ ],
+ onSelected: (int popipIndex) async {
+ ESERVICESDV eservicesdv = ESERVICESDV(
+ pIDCOLUMNNAME: model.eSERVICESVS![popipIndex].iDCOLUMNNAME,
+ pRETURNMSG: "null",
+ pRETURNSTATUS: "null",
+ //getEitDffStructureList![popipIndex].dEFAULTVALUE,
+ pVALUECOLUMNNAME: model.eSERVICESVS![popipIndex]
+ .vALUECOLUMNNAME);
+ getEitDffStructureList![index].eSERVICESDV = eservicesdv;
+ setState(() {});
+ if (model.cHILDSEGMENTSVSSplited?.isNotEmpty ?? false) {
+ await calGetValueSetValues(model);
+ }
+ if (model.cHILDSEGMENTSDVSplited?.isNotEmpty ?? false) {
+ await getDefaultValues(model);
+ }
+ });
+ }
}
} else {
return const SizedBox();
diff --git a/pubspec.yaml b/pubspec.yaml
index 08a6251..13708ea 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -91,7 +91,7 @@ dependencies:
signalr_netcore: ^1.3.3
logging: ^1.0.1
swipe_to: ^1.0.2
- flutter_webrtc: ^0.9.17
+ flutter_webrtc: ^0.12.11
camera: ^0.10.3
flutter_local_notifications: ^18.0.1
#firebase_analytics: any