diff --git a/android/app/build.gradle b/android/app/build.gradle
index 80eb644..9c3e91d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "hmg.cloudSolutions.mohem"
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
diff --git a/assets/images/drawer/help.png b/assets/images/drawer/help.png
new file mode 100644
index 0000000..89e95d1
Binary files /dev/null and b/assets/images/drawer/help.png differ
diff --git a/assets/images/drawer/hierarchy.png b/assets/images/drawer/hierarchy.png
new file mode 100644
index 0000000..5c194f6
Binary files /dev/null and b/assets/images/drawer/hierarchy.png differ
diff --git a/assets/images/drawer/moe_logo.png b/assets/images/drawer/moe_logo.png
new file mode 100644
index 0000000..da66b11
Binary files /dev/null and b/assets/images/drawer/moe_logo.png differ
diff --git a/assets/images/drawer/moe_logo_full.png b/assets/images/drawer/moe_logo_full.png
new file mode 100644
index 0000000..537de9c
Binary files /dev/null and b/assets/images/drawer/moe_logo_full.png differ
diff --git a/assets/images/drawer/my_team_icon.png b/assets/images/drawer/my_team_icon.png
new file mode 100644
index 0000000..980c59c
Binary files /dev/null and b/assets/images/drawer/my_team_icon.png differ
diff --git a/assets/images/drawer/notices.png b/assets/images/drawer/notices.png
new file mode 100644
index 0000000..15927f5
Binary files /dev/null and b/assets/images/drawer/notices.png differ
diff --git a/assets/images/drawer/profile_icon.png b/assets/images/drawer/profile_icon.png
new file mode 100644
index 0000000..596d11a
Binary files /dev/null and b/assets/images/drawer/profile_icon.png differ
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 31aadbe..a750713 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -307,6 +307,7 @@
"actionBy": "الرد بواسطة",
"pending": "معلق",
"pendingTransactions": "المعاملات المعلقه",
+ "notices": "إشعارات",
"selectRequestType": "الرجاء اختيار نوع الطلب",
"dateFrom": "من تاريخ",
"dateTo": "الى تاريخ",
@@ -540,5 +541,6 @@
"view_your_leave_information": "عرض معلومات إجازتك",
"view_details": "عرض التفاصيل",
"create_absence_request": "إنشاء طلب الغياب",
- "business_mission": "طلب مهمة العمل"
+ "business_mission": "طلب مهمة العمل",
+ "hierarchy": "تَسَلسُل"
}
\ No newline at end of file
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index 3196b1e..fcd3f08 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -303,6 +303,7 @@
"topic": "Topic",
"actionBy": "Action By",
"pendingTransactions": "Pending Transactions",
+ "notices": "Notices",
"selectRequestType": "Please select request type",
"dateFrom": "Date From",
"dateTo": "Date To",
@@ -540,6 +541,7 @@
"view_your_leave_information": "View Your Leave Information",
"view_details": "View Details",
"create_absence_request": "Create Absence Request",
- "business_mission": "Business Mission Request"
+ "business_mission": "Business Mission Request",
+ "hierarchy": "Hierarchy"
}
\ No newline at end of file
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 43841a1..8c502cb 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -9,8 +9,8 @@
/* Begin PBXBuildFile section */
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1CCF895CFB3C95DEBB84A05F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F0CC8EAC13AF3E07BEE567 /* Pods_Runner.framework */; };
+ 341195B929E80BC700FBCA57 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
- 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
76AE113C28E078EA00513112 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 76AE113B28E078EA00513112 /* GoogleService-Info.plist */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -144,7 +144,6 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
C4CFBC4C5CAC00182015ACD5 /* [CP] Embed Pods Frameworks */,
- 1C704830960BB41251F31356 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -204,23 +203,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 1C704830960BB41251F31356 /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
- );
- name = "[CP] Copy Pods Resources";
- outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
2D06B7AD3B87C9C9059E4168 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -295,7 +277,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+ 341195B929E80BC700FBCA57 /* AppDelegate.swift in Sources */,
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index 304aa00..00be2e1 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -5,9 +5,7 @@
aps-environment
development
com.apple.developer.icloud-container-identifiers
-
- iCloud.com.cloudsolutions.mohemm
-
+
com.apple.developer.icloud-services
CloudDocuments
@@ -23,8 +21,6 @@
TAG
com.apple.developer.ubiquity-container-identifiers
-
- iCloud.com.cloudsolutions.mohemm
-
+
diff --git a/lib/api/my_requests_api_client.dart b/lib/api/my_requests_api_client.dart
index 96c3b54..67fe056 100644
--- a/lib/api/my_requests_api_client.dart
+++ b/lib/api/my_requests_api_client.dart
@@ -60,7 +60,7 @@ class MyRequestsApiClient {
}, url, postParams);
}
- Future getSubmitNewRequest(List