diff --git a/DQKey.jks b/DQKey.jks
new file mode 100644
index 00000000..7c844584
Binary files /dev/null and b/DQKey.jks differ
diff --git a/Keystore Pass.rtf b/Keystore Pass.rtf
new file mode 100644
index 00000000..cd33f08e
--- /dev/null
+++ b/Keystore Pass.rtf
@@ -0,0 +1,9 @@
+{\rtf1\ansi\ansicpg1252\cocoartf2513
+\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 keyPassword=HmGsa123\
+storePassword=HmGsa123}
\ No newline at end of file
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index d8fd4e88..beeadd9e 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -3,5 +3,6 @@
+
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index d8fd4e88..71c11607 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -4,4 +4,5 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
+
diff --git a/assets/app_icons/config.json b/assets/app_icons/config.json
index 4c7eefa6..0bedcb06 100644
--- a/assets/app_icons/config.json
+++ b/assets/app_icons/config.json
@@ -131,6 +131,132 @@
"search": [
"parking_icon"
]
+ },
+ {
+ "uid": "3a1701f9a414e497ab81ae1bb58d3e7c",
+ "css": "blood_type_icon",
+ "code": 59401,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M567.7 248.5A2004.5 2004.5 0 0 0 452.6 80.5C395.1 5.9 378.7 0 363.3 0S331.4 5.9 273.8 80.5A2004.4 2004.4 0 0 0 158.8 248.6C99.6 344.8 0 523.3 0 636.7A363.3 363.3 0 0 0 726.5 636.7C726.5 523.3 627 344.8 567.7 248.5ZM510.7 696.3H392.6V814.4A29.3 29.3 0 1 1 334 814.4V696.3H215.8A29.3 29.3 0 0 1 215.8 637.7H334V519.5A29.3 29.3 0 1 1 392.6 519.5V637.7H510.7A29.3 29.3 0 0 1 510.7 696.3Z",
+ "width": 727
+ },
+ "search": [
+ "blood_type_icon"
+ ]
+ },
+ {
+ "uid": "2073f5ad66d9ab6e47cc1be6e6e20146",
+ "css": "height_icon",
+ "code": 59402,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M615.2 883H527.3V820.3H566.5A29.3 29.3 0 1 0 566.5 761.7H527.3V703.1H605.6A29.3 29.3 0 0 0 605.6 644.5H527.3V585.9H566.5A29.3 29.3 0 1 0 566.5 527.3H527.3V468.8H605.6A29.3 29.3 0 0 0 605.6 410.2H527.3V351.6H566.5A29.3 29.3 0 1 0 566.5 293H527.3V234.4H605.6A29.3 29.3 0 0 0 605.6 175.7H527.3V117.2H566.5A29.3 29.3 0 1 0 566.5 58.6H527.3V29.3A29.3 29.3 0 1 0 468.7 29.3V883H363L375.5 683.7H152.1L164.6 883H29.3A29.3 29.3 0 0 0 0 912.2V970.8A29.3 29.3 0 0 0 58.6 970.8V941.6H585.9V970.8A29.3 29.3 0 1 0 644.6 970.8V912.1A29.3 29.3 0 0 0 615.2 883ZM146.7 625H381A29.3 29.3 0 0 0 410.2 595.7V400.5A146 146 0 0 0 363.3 293.2 146.1 146.1 0 0 1 164.4 293.2 146 146 0 0 0 117.4 400.6V595.8A29.3 29.3 0 0 0 146.7 625Z",
+ "width": 645
+ },
+ "search": [
+ "height_icon"
+ ]
+ },
+ {
+ "uid": "0f1a73756e84a7173b6426ac45ca4a5a",
+ "css": "online_payment_icon",
+ "code": 59403,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M1214.7 273.8L1213.8 274A29 29 0 0 1 1207.2 274.8C1202 274.8 1195.9 272.2 1195.9 259.6 1195.9 253.1 1197 244.7 1206.7 244.7H1206.7A29.1 29.1 0 0 1 1213.7 246L1214.5 246.2V273.8ZM1216.2 211.5L1214.7 211.8V234.9L1213.2 234.5 1212.8 234.4A32.6 32.6 0 0 0 1204.1 232.8C1184.8 232.8 1180.7 247.5 1180.7 259.8A23.9 23.9 0 0 0 1206.6 286.3 52.5 52.5 0 0 0 1224 283.8 7.6 7.6 0 0 0 1230.5 275.5V209.1C1225.9 209.9 1221.1 210.7 1216.5 211.5M1272.2 274.3L1271.4 274.5 1268.4 275.3A30.7 30.7 0 0 1 1261.3 276.4C1256.8 276.4 1254 274.2 1254 270.3 1254 267.8 1255.2 263.6 1262.6 263.6H1272.2ZM1265.4 232.5A65.2 65.2 0 0 0 1245.7 236L1240.8 237.4 1242.4 248.7 1247.3 247.1A56.9 56.9 0 0 1 1263.4 244.3C1265.5 244.3 1272.1 244.3 1272.1 251.4V254.4H1263C1246.6 254.4 1239 259.7 1239 271 1239 280.6 1246 286.3 1257.8 286.3A60.9 60.9 0 0 0 1270.8 284.6L1271.1 284.6 1271.3 284.6 1272.8 284.8C1277.4 285.7 1282.2 286.5 1286.8 287.4V250.5C1286.8 238.6 1279.6 232.5 1265.5 232.5M1157.5 274.3L1156.7 274.5 1153.8 275.3A30.3 30.3 0 0 1 1146.6 276.4C1142.1 276.4 1139.4 274.2 1139.4 270.3 1139.4 267.8 1140.5 263.6 1147.9 263.6H1157.5L1157.5 274.3ZM1150.8 232.5A65 65 0 0 0 1131.1 236L1126.2 237.4 1127.8 248.7 1132.7 247.1A56.9 56.9 0 0 1 1148.8 244.3C1150.9 244.3 1157.5 244.3 1157.5 251.4V254.4H1148.4C1132 254.4 1124.3 259.7 1124.3 271 1124.3 280.6 1131.3 286.3 1143.2 286.3A60.9 60.9 0 0 0 1156.2 284.6L1156.5 284.6 1156.7 284.6 1158.1 284.8C1162.8 285.7 1167.5 286.5 1172.2 287.4V250.6C1172.2 238.5 1165 232.5 1150.9 232.5M1095.4 232.6A39.8 39.8 0 0 0 1079.4 236.2L1078.8 236.5 1078.3 236A24.2 24.2 0 0 0 1063.9 232.6 58.7 58.7 0 0 0 1047 235.1C1042 236.7 1040 239.1 1040 243.6V285.7H1055.7V246.8L1056.5 246.5A20 20 0 0 1 1063.4 245.3 6.2 6.2 0 0 1 1070.3 252.4V285.7H1085.7V251.8A11.4 11.4 0 0 0 1085.2 248.4L1084.7 247.4 1085.8 246.9A18.6 18.6 0 0 1 1093.5 245.3 6.3 6.3 0 0 1 1100.3 252.4V285.7H1115.7V250.9C1115.7 238.6 1109.2 232.7 1095.4 232.7M1260.6 174A53.6 53.6 0 0 1 1251.5 173.1L1250.6 173V150.3A11 11 0 0 0 1250.2 147.1L1249.7 146 1250.7 145.6C1251 145.5 1251.2 145.4 1251.5 145.3L1251.7 145.2 1252.7 144.8A1.5 1.5 0 0 1 1253.1 144.7 36.7 36.7 0 0 1 1261.2 143.8H1261.2C1270.8 143.8 1272 152.4 1272 158.8 1272 171.3 1265.7 174 1260.6 174M1260.6 130.8H1260.2A27.8 27.8 0 0 0 1238.5 138.1 14.7 14.7 0 0 0 1235.7 146.8H1235.7V170.3A6.9 6.9 0 0 1 1235.2 173.3L1234.7 174.2H1206.2V158H1206.2A24.3 24.3 0 0 0 1181 131.3H1166.6C1166 135.5 1165.5 138.5 1165 142.7H1179.2C1186.7 142.7 1190.7 149 1190.7 158.8V175.3L1189.7 174.7A10.9 10.9 0 0 0 1186.3 174.2H1161.7C1161.2 177.4 1160.6 181.4 1159.9 185.5H1235.8C1238.3 185 1241.4 184.5 1244 184.1A42.7 42.7 0 0 0 1259.8 187 25.9 25.9 0 0 0 1287 159 26.1 26.1 0 0 0 1260.6 130.8M1127.6 192.4H1128.3C1144.8 192.4 1152.5 187 1152.5 173.6A17.2 17.2 0 0 0 1133.7 156.2H1118.4A6.5 6.5 0 0 1 1111.2 149.3C1111.2 146.3 1112.3 142.7 1119.7 142.7H1152.9C1153.6 138.4 1154 135.7 1154.6 131.4H1120.2C1104.1 131.4 1096 138.1 1096 149.3S1103.1 166.2 1114.9 166.2H1130.1A7.2 7.2 0 0 1 1137.3 173.6 7.4 7.4 0 0 1 1128.8 181.2H1126.3L1077.7 181.1H1068.9C1061.4 181.1 1056.2 176.7 1056.2 167V160.2C1056.2 150 1060.2 143.6 1068.9 143.6H1083.3C1083.9 139.2 1084.3 136.5 1084.9 132.3H1065.4A24.6 24.6 0 0 0 1040.1 159.3H1040.1V167A23.3 23.3 0 0 0 1065.3 192.3H1079.6L1105.9 192.3H1127.7ZM1266.9 488.1A134.9 134.9 0 1 1 997.1 488.1H997.1A134.9 134.9 0 1 1 1266.9 488.1ZM1132 353.2A135.3 135.3 0 0 1 1266.9 488.1H1266.9A134.9 134.9 0 1 1 997 488.1M1132 353.2A135.3 135.3 0 0 1 1266.9 488.1H1266.9A134.8 134.8 0 0 1 1132 623M950.7 353.2A134.9 134.9 0 0 0 952.1 623 136.5 136.5 0 0 0 1042.8 588H1042.8A128.3 128.3 0 0 0 1056.3 573.8H1028.5A164.7 164.7 0 0 1 1018.5 560.2H1066.3A91.4 91.4 0 0 0 1074.2 545.9H1010.7A85.1 85.1 0 0 1 1004.9 531.6H1079.2A141.7 141.7 0 0 0 1086.3 488.8 184.3 184.3 0 0 0 1083.5 460.2H1000.6A104.3 104.3 0 0 1 1004.2 446H1078.4A85.1 85.1 0 0 0 1072.7 431.7H1009.9A141.6 141.6 0 0 1 1017.8 417.4H1065.6A67.9 67.9 0 0 0 1054.9 403.1H1028.5A121.7 121.7 0 0 1 1042 389.5 131.7 131.7 0 0 0 951.4 354.6C951.4 353.2 951.4 353.2 950.7 353.2ZM817.2 488.1A134.8 134.8 0 0 0 952.1 623 136.5 136.5 0 0 0 1042.7 588H1042.7A128.3 128.3 0 0 0 1056.3 573.8H1028.5A164.7 164.7 0 0 1 1018.5 560.2H1066.3A91.5 91.5 0 0 0 1074.2 545.9H1010.7A85.1 85.1 0 0 1 1004.9 531.6H1079.2A141.8 141.8 0 0 0 1086.3 488.8 184.3 184.3 0 0 0 1083.5 460.2H1000.6A104.3 104.3 0 0 1 1004.1 445.9H1078.4A85.1 85.1 0 0 0 1072.7 431.6H1009.9A141.6 141.6 0 0 1 1017.8 417.3H1065.6A67.9 67.9 0 0 0 1054.9 403.1H1028.5A121.7 121.7 0 0 1 1042 389.5 131.7 131.7 0 0 0 951.4 354.5H950.7M952.1 623A136.5 136.5 0 0 0 1042.8 588H1042.8A128.3 128.3 0 0 0 1056.3 573.8H1028.5A164.7 164.7 0 0 1 1018.5 560.2H1066.3A91.4 91.4 0 0 0 1074.2 545.9H1010.6A85.1 85.1 0 0 1 1004.9 531.6H1079.1A141.7 141.7 0 0 0 1086.3 488.8 184.3 184.3 0 0 0 1083.4 460.2H1000.7A104.3 104.3 0 0 1 1004.2 446H1078.5A85.1 85.1 0 0 0 1072.8 431.7H1009.9A141.6 141.6 0 0 1 1017.8 417.4H1065.6A67.9 67.9 0 0 0 1054.9 403.1H1028.5A121.7 121.7 0 0 1 1042 389.5 131.7 131.7 0 0 0 951.4 354.6H950.7M999.9 522.4L1002.1 510.2A30.9 30.9 0 0 1 998.5 511C993.5 511 992.8 508.1 993.5 506.6L997.9 481.6H1005.7L1007.9 468.1H1000.8L1002.2 459.5H987.9S979.3 506.6 979.3 512.3A10.7 10.7 0 0 0 990.8 524.5 21.9 21.9 0 0 0 999.9 522.4ZM1004.9 499.5A22.7 22.7 0 0 0 1029.9 524.5 37 37 0 0 0 1044.9 522.3L1047.7 508.8A42.8 42.8 0 0 1 1032.7 512.3C1017 512.3 1019.9 500.9 1019.9 500.9H1049.2A92.5 92.5 0 0 0 1051.3 488.1 19.3 19.3 0 0 0 1030.6 467.4C1015.6 466 1004.9 481.7 1004.9 499.5ZM1029.9 478.8C1037.7 478.8 1036.4 488.1 1036.4 488.8H1020.7C1020.6 488.1 1022 478.8 1029.9 478.8ZM1120.6 522.3L1123.4 506.7A35.1 35.1 0 0 1 1111.3 510.2C1101.3 510.2 1097 502.4 1097 493.8 1097 476.7 1105.6 467.4 1115.6 467.4A23.9 23.9 0 0 1 1128.4 471.7L1130.6 456.7A50.2 50.2 0 0 0 1114.2 453.2C1097.8 453.2 1081.3 467.5 1081.3 494.5 1081.3 512.3 1089.9 524.5 1107 524.5A64.1 64.1 0 0 0 1120.6 522.3ZM921.4 466A50.6 50.6 0 0 0 904.3 468.8L902.1 480.9A42.2 42.2 0 0 1 917.8 478.1C922.8 478.1 927.1 478.8 927.1 483.1 927.1 485.9 926.3 486.7 926.3 486.7H919.8C907.7 486.7 894.1 491.7 894.1 508.1 894.1 520.9 902.7 523.8 907.7 523.8A21.5 21.5 0 0 0 922.7 517.2L922 523H934.8L940.5 483.7A16.9 16.9 0 0 0 921.4 466ZM924.2 498.1C924.2 500.3 922.8 511.7 914.2 511.7A5.6 5.6 0 0 1 908.5 505.9C908.5 502.4 910.7 497.4 921.4 497.4A11.3 11.3 0 0 0 924.2 498.1ZM954.2 523.8A18.3 18.3 0 0 0 975.6 505.2C975.6 487.4 958.5 490.9 958.5 483.8 958.5 480.2 961.3 478.8 966.3 478.8 968.5 478.8 976.3 479.5 976.3 479.5L978.5 466.7A54.2 54.2 0 0 0 965 465.2C954.2 465.2 943.5 469.6 943.5 483.8 943.5 500.2 961.4 498.8 961.4 505.2 961.4 509.6 956.4 510.2 952.8 510.2A46.7 46.7 0 0 1 940 508L937.8 520.9C938.5 522.3 942.2 523.8 954.2 523.8ZM1239.1 454.5L1236.2 473.8A19.8 19.8 0 0 0 1222.7 466.7C1209.8 466.7 1198.4 482.4 1198.4 501 1198.4 512.4 1204.1 524.5 1216.2 524.5A19.1 19.1 0 0 0 1229.8 518.8L1229.1 523.8H1243.4L1254.1 455.3ZM1232.5 492.4C1232.5 500.2 1229 510.2 1221.1 510.2 1216.1 510.2 1213.3 505.9 1213.3 498.8 1213.3 487.4 1218.3 480.2 1224.7 480.2 1229.8 480.2 1232.6 483.8 1232.6 492.4ZM843.6 523.1L852.2 471.7 853.6 523.1H863.6L882.2 471.7 874.3 523.1H889.3L900.7 454.5H877.1L862.8 496.7 862.1 454.5H841.4L830 523.1ZM1064.9 523.1C1069.2 499.5 1069.9 480.2 1079.9 483.8A56.1 56.1 0 0 1 1084.9 467.4H1082C1075.5 467.4 1070.6 476 1070.6 476L1072 468.1H1058.5L1049.2 523.8H1064.9ZM1153.4 466A50.6 50.6 0 0 0 1136.3 468.8L1134.1 480.9A42.2 42.2 0 0 1 1149.8 478.1C1154.8 478.1 1159.1 478.8 1159.1 483.1 1159.1 485.9 1158.4 486.7 1158.4 486.7H1151.8C1139.7 486.7 1126.2 491.7 1126.2 508.1 1126.2 520.9 1134.7 523.8 1139.7 523.8A21.5 21.5 0 0 0 1154.7 517.2L1154 523H1166.8L1172.6 483.7A16.7 16.7 0 0 0 1153.4 466ZM1157 498.1C1157 500.3 1155.5 511.7 1147 511.7A5.6 5.6 0 0 1 1141.3 505.9C1141.3 502.4 1143.4 497.4 1154.1 497.4 1156.3 498.1 1156.3 498.1 1157 498.1ZM1184.8 523.1C1189.2 499.5 1189.8 480.2 1199.8 483.8A56 56 0 0 1 1204.8 467.4H1202C1195.4 467.4 1190.5 476 1190.5 476L1192 468.1H1178.4L1169.1 523.8H1184.8ZM977.8 512.4A10.7 10.7 0 0 0 989.2 524.5 27.2 27.2 0 0 0 999.9 522.3L1002.1 510.2A30.9 30.9 0 0 1 998.5 510.9C993.5 510.9 992.8 508.1 993.5 506.6L997.9 481.6H1005.7L1007.9 468H1000.8L1002.2 459.5M1012.1 499.5C1012.1 519.5 1018.6 524.5 1029.9 524.5A37 37 0 0 0 1044.9 522.3L1047.8 508.8A42.8 42.8 0 0 1 1032.8 512.3C1017.1 512.3 1019.9 500.9 1019.9 500.9H1049.2A92.5 92.5 0 0 0 1051.3 488.1 19.3 19.3 0 0 0 1030.7 467.4C1015.6 466 1012.1 481.7 1012.1 499.5ZM1029.9 478.8C1037.8 478.8 1039.2 488.1 1039.2 488.8H1020.6C1020.6 488.1 1022.1 478.8 1029.9 478.8ZM1120.6 522.3L1123.4 506.7A35.1 35.1 0 0 1 1111.3 510.2C1101.3 510.2 1097 502.4 1097 493.8 1097 476.7 1105.6 467.4 1115.6 467.4A23.9 23.9 0 0 1 1128.4 471.7L1130.6 456.7A50.2 50.2 0 0 0 1114.2 453.2C1097.8 453.2 1088.5 467.5 1088.5 494.5 1088.5 512.3 1089.9 524.5 1107 524.5A64.1 64.1 0 0 0 1120.6 522.3ZM902.1 481.7A42.2 42.2 0 0 1 917.8 478.8C922.8 478.8 927.1 479.5 927.1 483.8 927.1 486.7 926.4 487.4 926.4 487.4H919.8C907.7 487.4 894.2 492.4 894.2 508.8 894.2 521.7 902.7 524.5 907.7 524.5A21.5 21.5 0 0 0 922.7 518L922 523.7H934.8L940.6 484.4C940.6 468 926.3 467.3 920.6 467.3M931.3 498A23.4 23.4 0 0 1 914.2 511.6 5.6 5.6 0 0 1 908.5 505.8C908.5 502.3 910.6 497.3 921.3 497.3A58.3 58.3 0 0 0 931.4 498.1ZM938.5 522.3A60.4 60.4 0 0 0 954.9 523.8 18.3 18.3 0 0 0 976.3 505.2C976.3 487.4 959.2 490.9 959.2 483.8 959.2 480.2 962.1 478.8 967.1 478.8 969.2 478.8 977.1 479.5 977.1 479.5L979.2 466.7A54.2 54.2 0 0 0 965.7 465.2C955 465.2 951.4 469.6 951.4 483.8 951.4 500.2 962.1 498.8 962.1 505.2 962.1 509.6 957.1 510.2 953.5 510.2M1236.2 473.8A19.8 19.8 0 0 0 1222.7 466.7C1209.8 466.7 1205.5 482.4 1205.5 501 1205.5 512.4 1204.1 524.5 1216.2 524.5A19.1 19.1 0 0 0 1229.8 518.8L1229.1 523.8H1243.4L1254.1 455.3M1235.5 492.4C1235.5 500.3 1229 510.3 1221.2 510.3 1216.2 510.3 1213.4 505.9 1213.4 498.8 1213.4 487.4 1218.4 480.3 1224.8 480.3A10.9 10.9 0 0 1 1235.5 492.4ZM843.6 523.1L852.2 471.7 853.6 523.1H863.6L882.2 471.7 874.3 523.1H889.3L900.7 454.5H882.8L862.9 496.7 862.2 454.5H854.3L830 523.1ZM1049.9 523.1H1064.9C1069.2 499.5 1069.9 480.2 1079.9 483.8A56 56 0 0 1 1084.9 467.4H1082C1075.5 467.4 1070.6 476 1070.6 476L1072.1 468.1M1134.1 481.7A42.2 42.2 0 0 1 1149.8 478.8C1154.8 478.8 1159.1 479.5 1159.1 483.8 1159.1 486.7 1158.4 487.4 1158.4 487.4H1151.9C1139.7 487.4 1126.2 492.4 1126.2 508.8 1126.2 521.7 1134.7 524.5 1139.7 524.5A21.5 21.5 0 0 0 1154.7 518L1154 523.7H1166.9L1172.6 484.4C1172.6 468 1158.3 467.3 1152.6 467.3M1163.3 498A23.4 23.4 0 0 1 1146.2 511.6 5.6 5.6 0 0 1 1140.5 505.8C1140.5 502.3 1142.7 497.3 1153.3 497.3A62.8 62.8 0 0 0 1163.4 498.1ZM1169.8 523.1H1184.8C1189.2 499.5 1189.8 480.2 1199.8 483.8A56.1 56.1 0 0 1 1204.8 467.4H1202C1195.5 467.4 1190.6 476 1190.6 476L1192 468.1M440.6 102.4C438.6 108.2 405 200.6 393.7 231.3H393.7A0.6 0.6 0 0 1 393.7 231.5 15.2 15.2 0 0 1 380.5 241H362.5C373.4 211.2 398.5 142.3 413 102.4ZM734.2 171.7L722.6 203.4A15.5 15.5 0 0 1 709.2 213.3H690A51.2 51.2 0 0 0 694.9 203.4L706.5 171.7H678.7L667.2 203.4A15.6 15.6 0 0 1 653.8 213.3H634.6A50 50 0 0 0 639.5 203.4L651 171.7H623.3L611.7 203.4A15.5 15.5 0 0 1 598.3 213.3H509.7A48.6 48.6 0 0 0 514.7 203.6L517.6 195.5A25.5 25.5 0 0 0 493.7 157.8H462.2L452.1 185.6H483.7A6.7 6.7 0 0 1 490 195.5L486.9 203.6A15.2 15.2 0 0 1 473.5 213.3H427.9L417.8 241H699.4A59 59 0 0 0 750.3 203.6L762 171.7ZM297.1 241H223.8L233.9 213.3H307.2A15.7 15.7 0 0 0 320.7 203.4L323.5 195.5A6.7 6.7 0 0 0 317.2 185.6H271.7L281.8 157.8H327.3A25.5 25.5 0 0 1 351.2 195.5L348.3 203.4A59.6 59.6 0 0 1 297 241M396 561.7L421.6 417.2H461.8L436.9 561.7ZM396 561.7L428.9 417.2H461.8L436.9 561.7ZM582.2 418.9A101.8 101.8 0 0 0 545.2 412.4C505.1 412.4 476.2 432.4 476.2 461.3 476.2 483.1 496.3 494.2 512.3 501.5S533.2 513.5 533.2 519.9C533.2 529.5 520.3 534.4 509.1 534.4A87.2 87.2 0 0 1 470.6 526.3L465 523.9 459.4 556.8A130.1 130.1 0 0 0 505 564.9C547.6 564.9 575.7 544.8 575.7 514.3 575.7 497.5 565.2 484.6 541.1 474.2 526.7 467 517.8 462.9 517.8 455.7 517.8 449.2 525.1 442.9 541.1 442.9A73.6 73.6 0 0 1 571.6 448.5L575.6 450.1 582.1 418.8ZM582.2 418.9A101.8 101.8 0 0 0 545.2 412.4C505.1 412.4 483.4 432.4 483.4 461.3A42 42 0 0 0 512.3 501.5C528.3 508.7 533.2 513.5 533.2 519.9 533.2 529.5 520.3 534.4 509.1 534.4A87.2 87.2 0 0 1 470.6 526.3L465 523.9 459.4 556.8A130.1 130.1 0 0 0 505 564.9C547.6 564.9 575.7 544.8 575.7 514.3 575.7 497.5 565.2 484.6 541.1 474.2 526.7 467 517.8 462.9 517.8 455.7 517.8 449.2 525.1 442.9 541.1 442.9A73.6 73.6 0 0 1 571.6 448.5L575.6 450.1 582.1 418.8ZM651.2 417.2C641.6 417.2 634.3 418 630.3 427.6L570.1 561.7H613.5L621.5 537.6H672.9L677.7 561.7H716.2L682.5 417.2ZM632.7 513.5C635.2 506.3 648.8 471 648.8 471S652 462.1 654.4 456.5L656.8 470.2S664.8 506.3 666.4 514.3H632.7ZM660.8 417.2C651.2 417.2 644 418 640 427.6L570.1 561.7H613.5L621.5 537.6H672.9L677.7 561.7H716.2L682.5 417.2ZM632.7 513.5C636 505.5 648.8 471 648.8 471S652 462.1 654.4 456.5L656.8 470.2S664.8 506.3 666.4 514.3H632.7ZM322.1 518.3L318.1 497.4A116.3 116.3 0 0 0 261.9 434L298 562.4H341.4L406.4 418H363.1ZM322.1 518.3L318.1 497.4A116.3 116.3 0 0 0 261.9 434L298 562.4H341.4L406.4 418H371.1ZM210.6 417.2L217.8 418.8A135.3 135.3 0 0 1 318.1 497.5L303.7 429.2C301.2 419.6 294 417.2 285.2 417.2ZM210.6 417.2H210.6C261.9 429.2 304.5 460.5 318.1 496.7L304.5 439.7A19.6 19.6 0 0 0 285.2 424.5ZM210.6 417.2H210.6C261.9 429.2 304.5 460.5 318.1 496.7L308.5 465.3A28.3 28.3 0 0 0 291.6 442.1ZM362.3 513.5L335 486.2 322.1 516.7 318.9 496.6A116.3 116.3 0 0 0 262.7 433.2L298.8 561.7H342.2ZM436.9 561.7L402.5 526.3 396 561.7ZM529.2 511.9H529.2C532.4 515.1 534 517.5 533.2 520.7 533.2 530.3 520.4 535.2 509.1 535.2A87.2 87.2 0 0 1 470.6 527.2L465 524.7 459.4 557.5A130.1 130.1 0 0 0 505 565.6 79.5 79.5 0 0 0 563.7 545.5ZM575.8 561.7H613.5L621.5 537.6H672.9L677.7 561.7H716.2L702.5 503 654.4 456.4 656.8 469.3S664.8 505.4 666.4 513.4H632.7C635.9 505.4 648.8 470.9 648.8 470.9S652 462 654.4 456.4M745.6 844.7A15.6 15.6 0 0 1 730 829.2V747.1A15.6 15.6 0 0 1 761.2 747.1V829.2A15.6 15.6 0 0 1 745.6 844.7ZM803.2 844.7A15.6 15.6 0 0 1 787.7 829.2V747.1A15.6 15.6 0 1 1 818.8 747.1V829.2A15.6 15.6 0 0 1 803.2 844.7ZM860.9 844.7A15.6 15.6 0 0 1 845.3 829.2V747.1A15.6 15.6 0 1 1 876.4 747.1V829.2A15.6 15.6 0 0 1 860.9 844.7ZM210.1 698.8A18 18 0 0 1 228.3 680.6 18.2 18.2 0 0 1 246.8 698.8 18.4 18.4 0 0 1 228.3 717.3 18.2 18.2 0 0 1 210.1 698.8ZM214.2 740.7A5.1 5.1 0 0 1 219.3 735.6H238A5.1 5.1 0 0 1 243.1 740.7V837.2A5.3 5.3 0 0 1 238 842.3H219.3A5.3 5.3 0 0 1 214.2 837.2ZM260 740.6A5.1 5.1 0 0 1 265.1 735.5H273.8A4.1 4.1 0 0 1 278.1 738.8L282.1 748.7A43.1 43.1 0 0 1 316.5 733.2C350.5 733.2 359.3 756.1 359.3 782V837.2A5.3 5.3 0 0 1 354.2 842.3H335.5A5.1 5.1 0 0 1 330.4 837.2V782C330.4 768.1 324.9 759.6 311.9 759.6A23.5 23.5 0 0 0 288.8 776.2V837.2C288.8 841.2 287.2 842.3 282.1 842.3H265A5.3 5.3 0 0 1 259.9 837.2ZM371.8 835.2A4.7 4.7 0 0 1 370.5 829.4L377.4 815.5A4 4 0 0 1 383.6 813.7 43.2 43.2 0 0 0 407.2 820.6C415.3 820.6 419 817.6 419 813S413 803.7 398.9 798.2C378.3 790.3 369.1 780.6 369.1 764.4S381.3 733.2 407.4 733.2A58.1 58.1 0 0 1 439.1 741.1 6 6 0 0 1 441.4 748.5L435.4 760.7A5.3 5.3 0 0 1 428.7 762.9 51.1 51.1 0 0 0 407.4 757.6C400.3 757.6 397.3 761 397.3 764.5 397.3 769.4 402.6 771.9 412.5 776.1 433 784.4 447.8 791.8 447.8 813 447.8 829.9 433.5 844.9 406.7 844.9A59.7 59.7 0 0 1 371.8 835.2ZM465 761.4H454.6A5.1 5.1 0 0 1 449.7 756.3V740.6A4.8 4.8 0 0 1 454.6 735.5H465V706A5.3 5.3 0 0 1 470.1 700.9H489A4.9 4.9 0 0 1 493.9 706V735.5H518.8A5 5 0 0 1 523.9 740.6V756.3A5.3 5.3 0 0 1 518.8 761.4H493.8V809.6C493.8 816.8 497.3 818.3 502.5 818.3A70.6 70.6 0 0 0 518.7 814.8 4.1 4.1 0 0 1 524.7 817.6L527.7 831.7A5.2 5.2 0 0 1 524.7 837.9 84.4 84.4 0 0 1 494.7 844.9C470.8 844.9 464.8 828.9 464.8 810.4ZM570.3 774.8A78.3 78.3 0 0 1 590.9 777.8C591.3 764.2 587.4 757.7 576.1 757.7A133.7 133.7 0 0 0 546.1 761.7C542.6 762.8 540.5 760.3 540.1 757L537.8 745A4.9 4.9 0 0 1 541.2 738.5 134.9 134.9 0 0 1 577.7 733.2C611 733.2 618 750.6 618 779.6V837.2A5.1 5.1 0 0 1 612.9 842.2H605C603.2 842.2 601.8 841.5 600.4 838.5L597.4 831.4A46.8 46.8 0 0 1 563.9 844.8 34 34 0 0 1 527.8 808.3C527.8 789.4 543.3 774.8 570.3 774.8ZM571 823.3A22.9 22.9 0 0 0 590.2 812V796.3A42.5 42.5 0 0 0 574.5 793.1C562.2 793.1 555.5 798.8 555.5 808.3A14.1 14.1 0 0 0 571 823.4ZM634.1 685.7A5.5 5.5 0 0 1 639.2 680.6H657.9A5.5 5.5 0 0 1 663 685.7V837.2A5.3 5.3 0 0 1 657.9 842.3H639.2A5.3 5.3 0 0 1 634.1 837.2ZM680.3 685.7A5.5 5.5 0 0 1 685.4 680.6H704.1A5.5 5.5 0 0 1 709.2 685.7V837.2A5.3 5.3 0 0 1 704.1 842.3H685.4A5.3 5.3 0 0 1 680.3 837.2ZM944.7 733.2A47.8 47.8 0 0 1 993.7 782.7C993.7 784.3 993.4 788 993.2 789.6A5.4 5.4 0 0 1 988.1 794.5H919.7A25.7 25.7 0 0 0 946.3 819.2 35.4 35.4 0 0 0 969.2 811.4C971.7 809.2 974.5 809.1 976.1 811.4L985.1 823.4A4.5 4.5 0 0 1 984.7 830.3 60.3 60.3 0 0 1 944.9 844.9 55.8 55.8 0 0 1 944.7 733.3ZM964.5 775.5A19.6 19.6 0 0 0 944 757 21.2 21.2 0 0 0 921.3 775.5ZM1002.7 740.6A5.1 5.1 0 0 1 1007.8 735.5H1016.5A4.1 4.1 0 0 1 1020.8 738.8L1024.7 748.7A43.1 43.1 0 0 1 1059.2 733.2C1093.2 733.2 1101.9 756.1 1101.9 782V837.2A5.3 5.3 0 0 1 1096.8 842.3H1078.1A5.1 5.1 0 0 1 1073 837.2V782C1073 768.1 1067.5 759.6 1054.6 759.6A23.5 23.5 0 0 0 1031.5 776.2V837.2C1031.5 841.2 1029.8 842.3 1024.8 842.3H1007.7A5.3 5.3 0 0 1 1002.6 837.2ZM1124 761.4H1113.6A5.1 5.1 0 0 1 1108.7 756.3V740.6A4.8 4.8 0 0 1 1113.6 735.5H1124V706A5.3 5.3 0 0 1 1129.1 700.9H1148A4.9 4.9 0 0 1 1152.9 706V735.5H1177.8A5 5 0 0 1 1182.9 740.6V756.3A5.3 5.3 0 0 1 1177.8 761.4H1152.9V809.6C1152.9 816.8 1156.3 818.3 1161.6 818.3A70.6 70.6 0 0 0 1177.7 814.8 4.1 4.1 0 0 1 1183.7 817.6L1186.7 831.7A5.2 5.2 0 0 1 1183.7 837.9 84.3 84.3 0 0 1 1153.7 844.9C1129.9 844.9 1123.9 828.9 1123.9 810.4ZM1191 835.2A4.7 4.7 0 0 1 1189.6 829.4L1196.5 815.5A4 4 0 0 1 1202.8 813.7 43.2 43.2 0 0 0 1226.3 820.6C1234.4 820.6 1238.1 817.6 1238.1 813S1232.1 803.7 1218 798.2C1197.5 790.3 1188.2 780.6 1188.2 764.4S1200.5 733.2 1226.6 733.2A58.1 58.1 0 0 1 1258.2 741.1 6 6 0 0 1 1260.5 748.5L1254.5 760.7A5.3 5.3 0 0 1 1247.8 762.9 51.1 51.1 0 0 0 1226.6 757.6C1219.4 757.6 1216.4 761 1216.4 764.5 1216.4 769.4 1221.7 771.9 1231.6 776.1 1252.2 784.4 1267 791.8 1267 813 1267 829.9 1252.7 844.9 1225.8 844.9A59.7 59.7 0 0 1 1191 835.2ZM892.2 863A0.8 0.8 0 0 1 893 862.2H901.7A8.9 8.9 0 1 1 901.7 879.9H895.2V889.3A0.8 0.8 0 0 1 894.4 890H892.9A0.8 0.8 0 0 1 892.2 889.3ZM901.6 877A5.9 5.9 0 0 0 907.6 870.9 5.7 5.7 0 0 0 901.6 865.2H895.3V877ZM922.3 871.3A9.6 9.6 0 1 1 913.1 880.8 9.5 9.5 0 0 1 922.3 871.3ZM922.3 887.8A7 7 0 1 0 916 880.8 6.5 6.5 0 0 0 922.3 887.8ZM947.1 876.2L941.7 890A0.7 0.7 0 0 1 940.9 890.5H940.7A0.8 0.8 0 0 1 939.9 890L934.8 872.6C934.6 872 934.8 871.5 935.5 871.5H936.8A0.8 0.8 0 0 1 937.7 872.1L941 884.5H941L946.2 871.5A0.8 0.8 0 0 1 947 871.1H947.2A0.8 0.8 0 0 1 948 871.5L953.1 884.5H953.1L956.5 872A0.7 0.7 0 0 1 957.3 871.5H958.8C959.5 871.5 959.7 871.9 959.5 872.5L954.5 889.9A0.8 0.8 0 0 1 953.7 890.4H953.5A0.9 0.9 0 0 1 952.7 889.9L947.1 876.2ZM971.7 871.3A8.1 8.1 0 0 1 980 879.6 10.1 10.1 0 0 1 980 880.7 0.8 0.8 0 0 1 979.2 881.5H965.8A6.5 6.5 0 0 0 971.8 887.8 8.5 8.5 0 0 0 976.8 886.3C977.5 885.8 977.7 885.7 978.2 886.4L978.7 887C979.1 887.6 979.2 887.8 978.5 888.3A11.3 11.3 0 0 1 971.8 890.5 9.6 9.6 0 0 1 971.8 871.3ZM977.1 879.2A5.4 5.4 0 0 0 971.7 873.9 6 6 0 0 0 965.8 879.2ZM984.7 872.5A0.9 0.9 0 0 1 985.6 871.7H986.2A0.8 0.8 0 0 1 987 872.3L987.3 873.6A7.3 7.3 0 0 1 993 871.3C994.4 871.3 996.6 871.5 996.2 872.7L995.7 874.2A0.7 0.7 0 0 1 994.6 874.6 4.6 4.6 0 0 0 992.6 874.1 5.8 5.8 0 0 0 987.7 876.4V889.2A0.9 0.9 0 0 1 986.8 890H985.6A0.9 0.9 0 0 1 984.7 889.2ZM1007.3 871.3A8.1 8.1 0 0 1 1015.6 879.6 9.8 9.8 0 0 1 1015.6 880.7 0.8 0.8 0 0 1 1014.8 881.5H1001.4A6.5 6.5 0 0 0 1007.4 887.8 8.5 8.5 0 0 0 1012.4 886.3C1013 885.8 1013.3 885.7 1013.8 886.4L1014.3 887C1014.6 887.6 1014.8 887.8 1014.1 888.3A11.3 11.3 0 0 1 1007.4 890.5 9.6 9.6 0 0 1 1007.4 871.3ZM1012.7 879.2A5.4 5.4 0 0 0 1007.3 873.9 6 6 0 0 0 1001.4 879.2ZM1028 871.3A11.3 11.3 0 0 1 1033.1 872.4V863.1A0.9 0.9 0 0 1 1033.9 862.2H1035A1 1 0 0 1 1036 863.1V889.2A0.9 0.9 0 0 1 1035 890H1034.3C1033.9 890 1033.7 889.7 1033.5 889.3L1033.3 888.1A8.8 8.8 0 0 1 1027.5 890.5 9 9 0 0 1 1019.3 880.8 8.7 8.7 0 0 1 1028 871.3ZM1027.9 887.8A6.8 6.8 0 0 0 1033.1 884.8V875A12.1 12.1 0 0 0 1028.4 873.9 6.3 6.3 0 0 0 1022.2 880.8 6.4 6.4 0 0 0 1027.9 887.8ZM1051.7 863.1A0.9 0.9 0 0 1 1052.6 862.2H1053.8A0.9 0.9 0 0 1 1054.6 863.1V872.4A11.1 11.1 0 0 1 1059.7 871.3 8.7 8.7 0 0 1 1068.4 880.8 9 9 0 0 1 1060.2 890.5 8 8 0 0 1 1054.4 888.1L1054.2 889.3A0.8 0.8 0 0 1 1053.3 890H1052.6A0.9 0.9 0 0 1 1051.8 889.2ZM1059.8 887.8A6.3 6.3 0 0 0 1065.4 880.8 6.3 6.3 0 0 0 1059.3 873.9 10.9 10.9 0 0 0 1054.6 875.1V884.8A6.8 6.8 0 0 0 1059.7 887.8ZM1071.1 872.7C1070.8 872.1 1071.1 871.7 1071.8 871.7H1073.5A0.8 0.8 0 0 1 1074.3 872.2L1079.5 886.8H1079.5L1085.7 872.2A0.8 0.8 0 0 1 1086.5 871.7H1088C1088.7 871.7 1089 872.1 1088.7 872.7L1077.2 898.9A1 1 0 0 1 1076.4 899.5H1075C1074.3 899.5 1073.9 899 1074.2 898.4L1077.8 890ZM1102.1 863A0.8 0.8 0 0 1 1102.8 862.2H1111.5A8.9 8.9 0 1 1 1111.5 879.9H1105V889.3A0.8 0.8 0 0 1 1104.3 890H1102.8A0.8 0.8 0 0 1 1102 889.3ZM1111.4 877A5.9 5.9 0 0 0 1117.5 870.9 5.7 5.7 0 0 0 1111.4 865.2H1105.1V877ZM1120.4 889L1132.5 862.2A0.7 0.7 0 0 1 1133.2 861.8H1133.6A0.7 0.7 0 0 1 1134.2 862.2L1146.2 889A0.7 0.7 0 0 1 1145.6 890H1144A0.7 0.7 0 0 1 1143.3 889.6L1140.4 883H1126.3L1123.4 889.6A0.7 0.7 0 0 1 1122.7 890H1121.1A0.7 0.7 0 0 1 1120.4 889ZM1139.3 880.6C1137.3 876.2 1135.4 871.9 1133.5 867.5H1133.2L1127.3 880.6ZM1154.2 876.7L1144.6 863.4A0.7 0.7 0 0 1 1145.2 862.3H1147.1A0.8 0.8 0 0 1 1147.7 862.6L1155.8 873.7 1163.8 862.6A0.8 0.8 0 0 1 1164.4 862.3H1166.3A0.7 0.7 0 0 1 1166.9 863.4L1157.2 876.7V889.3A0.8 0.8 0 0 1 1156.5 890.1H1154.9A0.8 0.8 0 0 1 1154.2 889.3ZM1171 863A0.8 0.8 0 0 1 1171.7 862.2H1187.4A0.8 0.8 0 0 1 1188.1 863V864.1A0.8 0.8 0 0 1 1187.4 864.9H1174V875.7H1185.4A0.8 0.8 0 0 1 1186.2 876.5V877.7A0.8 0.8 0 0 1 1185.4 878.4H1174V889.3A0.8 0.8 0 0 1 1173.3 890H1171.7A0.8 0.8 0 0 1 1171 889.3ZM1205.5 861.8A14.3 14.3 0 1 1 1191.2 876.2 14.3 14.3 0 0 1 1205.5 861.8ZM1205.5 887.6A11.5 11.5 0 1 0 1194 876.2 11.5 11.5 0 0 0 1205.5 887.6ZM1225.6 863A0.8 0.8 0 0 1 1226.4 862.2H1236.7A8.5 8.5 0 0 1 1245.3 870.7 8.9 8.9 0 0 1 1239.5 878.8L1244.9 888.8A0.8 0.8 0 0 1 1244.2 890H1242.3A0.8 0.8 0 0 1 1241.4 889.4L1236.3 879.1H1228.7V889.3A0.8 0.8 0 0 1 1227.9 890H1226.4A0.8 0.8 0 0 1 1225.6 889.3ZM1236.5 876.5A5.7 5.7 0 1 0 1236.5 865.1H1228.8V876.5ZM1256.1 864.9H1249.2A0.8 0.8 0 0 1 1248.4 864.1V863A0.8 0.8 0 0 1 1249.2 862.2H1266A0.8 0.8 0 0 1 1266.8 863V864.1A0.8 0.8 0 0 1 1266 864.9H1259.1V889.3A0.8 0.8 0 0 1 1258.3 890H1256.8A0.8 0.8 0 0 1 1256.1 889.3Z",
+ "width": 1478
+ },
+ "search": [
+ "online_payment_icon"
+ ]
+ },
+ {
+ "uid": "3238628d101e2f79eeaaf407332b3052",
+ "css": "vital_sign_icon",
+ "code": 59405,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M1145 758.4A14.1 14.1 0 0 0 1130.9 772.5 51.9 51.9 0 0 1 1079 824.3H275.7A51.9 51.9 0 0 1 223.9 772.4V232.3A51.9 51.9 0 0 1 275.7 180.5H725.2A14.1 14.1 0 0 0 725.2 152.2H275.7A80.2 80.2 0 0 0 195.7 232.3V772.4A80.2 80.2 0 0 0 275.7 852.5H1079A80.2 80.2 0 0 0 1159.1 772.4 14.1 14.1 0 0 0 1145 758.4ZM1079 152.2H792.5A14.1 14.1 0 0 0 792.5 180.4H1079A51.9 51.9 0 0 1 1130.8 232.3V704.7A14.1 14.1 0 0 0 1159.1 704.7V232.3A80.2 80.2 0 0 0 1079 152.2ZM907.5 585V300.1A36.8 36.8 0 0 0 870.8 263.3H477A14.1 14.1 0 1 0 477 291.6H870.7A8.5 8.5 0 0 1 879.2 300.1V421.1H821.6L799.2 398.7A19.8 19.8 0 0 0 771.2 398.7L712 458 689.3 435.3A19.8 19.8 0 0 0 661.3 435.3L622.9 473.6 521.1 371.8A19.8 19.8 0 0 0 493.1 371.8L443.8 421.1H352.5V300.1A8.5 8.5 0 0 1 361 291.6H406.6A14.1 14.1 0 1 0 406.6 263.3H361A36.8 36.8 0 0 0 324.2 300.1V585A36.8 36.8 0 0 0 361 621.8H870.7A36.8 36.8 0 0 0 907.5 585ZM352.6 585V449.3H447.3A19.6 19.6 0 0 0 461.3 443.5L507.1 397.8 608.9 499.6A19.8 19.8 0 0 0 636.9 499.6L675.2 461.2 697.9 484A19.8 19.8 0 0 0 725.9 484L785.2 424.7 804 443.6A19.6 19.6 0 0 0 818 449.4H879.2V585.1A8.5 8.5 0 0 1 870.7 593.5H361.1A8.5 8.5 0 0 1 352.6 585.1ZM637.6 716.5A57.6 57.6 0 1 0 695.2 658.9 57.7 57.7 0 0 0 637.6 716.5ZM724.5 716.5A29.3 29.3 0 1 1 695.2 687.2 29.4 29.4 0 0 1 724.5 716.5ZM431.7 696.3A57.6 57.6 0 1 0 431.7 736.6 57.6 57.6 0 1 0 431.7 696.3ZM377.8 745.8A29.3 29.3 0 1 1 407.1 716.5 29.4 29.4 0 0 1 377.8 745.8ZM515 716.5A29.3 29.3 0 1 1 485.7 687.2 29.4 29.4 0 0 1 515 716.5Z",
+ "width": 1348
+ },
+ "search": [
+ "vital_sign_icon"
+ ]
+ },
+ {
+ "uid": "e714a92298dafff5fead849df18d449b",
+ "css": "weight_icon",
+ "code": 59406,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M491.7 0A263 263 0 0 1 716.9 127Q794.5 140.1 882.6 162A131.3 131.3 0 0 1 982.2 303.3L922.3 881.9A132 132 0 0 1 791.4 1000.1H191.9A131.6 131.6 0 0 1 61 881.9L1.1 303.2A118.4 118.4 0 0 1 100.7 162Q184.1 141.4 266.3 127A263 263 0 0 1 491.7 0ZM240.1 185.1Q151.9 203.4 113.1 212.9A79.2 79.2 0 0 0 53.5 297.7L113.4 876.5A79.8 79.8 0 0 0 191.9 947.3H791.7A80.5 80.5 0 0 0 870.2 876.5L929.9 297.7A78.8 78.8 0 0 0 870.1 212.9Q817.9 200.2 743.1 185.2A253.9 253.9 0 0 1 754.8 263.2 263.1 263.1 0 0 1 228.5 263.2 252.6 252.6 0 0 1 240.1 185.1ZM491.7 52.5A210.5 210.5 0 1 0 702.2 263.1 211.1 211.1 0 0 0 491.7 52.5ZM491.7 105.1A27 27 0 0 1 518 131.3V262.9A26.3 26.3 0 0 1 491.7 289.2 25.9 25.9 0 0 1 465.4 262.9V131.6A26.3 26.3 0 0 1 491.7 105.1Z",
+ "width": 983
+ },
+ "search": [
+ "weight_icon"
+ ]
+ },
+ {
+ "uid": "48c8955311a2a09660e070396941b78b",
+ "css": "search_medicine_icon",
+ "code": 59404,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M442.2 620.3A223.9 223.9 0 1 0 369.1 547.3L195.7 720.8 268.7 793.8ZM559.5 240.6A189.3 189.3 0 1 1 370.2 429.9 189.5 189.5 0 0 1 559.5 240.6ZM389.7 575.4A226.8 226.8 0 0 0 414 599.7L377.3 636.5 353 612.1ZM328.7 636.5L353 660.8 268.7 745.1 244.3 720.8ZM328.7 636.5M571.7 515.1L644.7 442.1A68.8 68.8 0 1 0 547.4 344.7L474.3 417.7A68.8 68.8 0 1 0 571.7 515.1ZM571.7 369.1A34.4 34.4 0 0 1 620.4 417.7L596 442.1 547.4 393.4ZM498.7 442.1L523 417.7 571.7 466.4 547.4 490.8A34.4 34.4 0 0 1 498.7 442.1ZM498.7 442.1",
+ "width": 1000
+ },
+ "search": [
+ "search_medicine_icon"
+ ]
+ },
+ {
+ "uid": "2cfd058dc6a521015f26957251d5f9dd",
+ "css": "my_medical_file",
+ "code": 59407,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M730.5 105.5H609.8A88.9 88.9 0 0 0 531.4 58.6H469.3A78.1 78.1 0 0 0 318.2 58.6H256.1A88.9 88.9 0 0 0 177.7 105.5H58.6A58.8 58.8 0 0 0 0 164.1V941.6A58.8 58.8 0 0 0 58.6 1000.1H730.6A58.8 58.8 0 0 0 789.1 941.6V164.1A58.8 58.8 0 0 0 730.5 105.5ZM206.1 147.4A49.8 49.8 0 0 1 256 97.6H335A19.6 19.6 0 0 0 354.6 78.1 39.1 39.1 0 1 1 432.7 78.1 19.6 19.6 0 0 0 452.2 97.6H531.3A50 50 0 0 1 578.2 130.6C578.2 130.8 578.4 131 578.4 131.4A49.6 49.6 0 0 1 581.3 147.7V178.3A21 21 0 0 1 560.2 199.4H227.3A21 21 0 0 1 206.3 178.3ZM656.1 238.3V869.7H133.4V238.3ZM750 941.6A19.6 19.6 0 0 1 730.5 961.1H58.4A19.6 19.6 0 0 1 38.9 941.6V164.1A19.6 19.6 0 0 1 58.4 144.5H167V178.1A58.6 58.6 0 0 0 171 199.2H113.7A19.6 19.6 0 0 0 94.2 218.7V889.1A19.6 19.6 0 0 0 113.7 908.6H675.7A19.6 19.6 0 0 0 695.2 889.1V218.7A19.6 19.6 0 0 0 675.7 199.4H616.4A58.6 58.6 0 0 0 620.3 178.3V144.7H730.5A19.6 19.6 0 0 1 750 164.2ZM407.3 111.1A19.3 19.3 0 0 0 393.4 105.5 20.5 20.5 0 0 0 379.5 111.1 19.3 19.3 0 0 0 373.9 125 20.5 20.5 0 0 0 379.5 138.9 19.3 19.3 0 0 0 393.4 144.5 20.5 20.5 0 0 0 407.3 138.9 19.8 19.8 0 0 0 407.3 111.1ZM500 753.9H209.6A19.5 19.5 0 1 0 209.6 793H500A19.5 19.5 0 1 0 500 753.9ZM593 759.6A19.3 19.3 0 0 0 579.1 753.9 20.2 20.2 0 0 0 565.2 759.6 19.3 19.3 0 0 0 559.6 773.4 20.2 20.2 0 0 0 565.2 787.3 19.3 19.3 0 0 0 579.1 793 20.2 20.2 0 0 0 593 787.3 19.8 19.8 0 0 0 593 759.6ZM579.5 675.8H209.6A19.5 19.5 0 0 0 209.6 714.8H579.5A19.5 19.5 0 0 0 579.5 675.8ZM511.9 616.4H275.6A40.3 40.3 0 0 1 235.4 576.2V339.8A40.3 40.3 0 0 1 275.6 299.6H511.9A40.3 40.3 0 0 1 552.2 339.8V576.2A40.6 40.6 0 0 1 511.9 616.4ZM300.6 564.7L359.7 564.9C367.1 564.9 372.6 557.2 373 546.4V497.1C373 486.2 377.9 478.3 385.1 477.7L403.2 477.5C410.4 477.9 415.5 486.1 415.5 496.9V546.5C415.9 557.2 420.9 564.5 427.9 564.5L507.6 564.6 507.7 503.5C507.7 492.8 502.6 484.7 495.4 484.3L463.5 484.2C456.1 484.2 450.8 476.5 450.6 465.8L450.4 449.1C450.8 438.5 456.3 430.7 463.5 430.7H495.7C502.6 430.3 507.8 421.9 507.8 411.1V335.3A32.2 32.2 0 0 1 483.3 350.6H429.1C421.7 350.6 416.2 358.6 415.8 369.1V418.2C415.4 428.9 410 436.6 402.9 436.6L386.6 436.4C379.2 436.4 373.9 428.8 373.4 418.3V368.9C373 358.2 367.7 350.8 360.4 350.8H281.8V411.7C281.8 422.8 286.9 430.7 294.2 431.1L326.4 430.9C333.4 431.3 338.9 439.8 338.9 450.4V464.5C338.9 475.3 333.7 483.4 326.6 483.8H294.4C287 484.4 282.1 492.3 282.1 503.2L281.7 564.6Z",
+ "width": 789
+ },
+ "search": [
+ "my_medical_file"
+ ]
+ },
+ {
+ "uid": "40c03b22028e1b34f230c522b40ca125",
+ "css": "family",
+ "code": 59408,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M1255.3 571.5A27.7 27.7 0 0 0 1211.5 605.3 207.6 207.6 0 0 1 1255 733.1 27.7 27.7 0 1 0 1310.4 733.1 262.5 262.5 0 0 0 1255.3 571.5ZM1162.3 385.9A210.9 210.9 0 1 0 926.7 385.9 364.6 364.6 0 0 0 813.6 448.4 155.5 155.5 0 0 0 597.6 448.4 364.8 364.8 0 0 0 484.5 385.9 210.9 210.9 0 1 0 248.9 385.9 367.5 367.5 0 0 0 0 732.4C0 732.6 0 732.8 0 733.1 0 775.5 24.1 838.2 139.1 895.7A1060.2 1060.2 0 0 0 464.8 984.6 1904.1 1904.1 0 0 0 946.5 984.6 1059.9 1059.9 0 0 0 1272.3 895.7C1387.3 838.3 1411.4 775.6 1411.4 733.1A367.5 367.5 0 0 0 1162.3 385.9ZM889 211A155.5 155.5 0 1 1 1044.5 366.5 155.5 155.5 0 0 1 889.1 210.9ZM623 503.3A100.5 100.5 0 0 1 788.2 503.3H788.2A100.5 100.5 0 1 1 623 503.3ZM211.1 210.9A155.5 155.5 0 1 1 366.6 366.4 155.5 155.5 0 0 1 211.1 210.9ZM440.8 925.4A960.1 960.1 0 0 1 163.9 846.2C94.1 811.3 55.5 771.3 55.5 733.4 55.5 733.4 55.5 733.4 55.5 733.1A311.3 311.3 0 0 1 565.3 493.2 155.8 155.8 0 0 0 606.4 680.5 265.2 265.2 0 0 0 440.8 925.4ZM915.2 932.8A1857 1857 0 0 1 496.1 932.8V926A209.5 209.5 0 0 1 915.2 926ZM1247.4 846.2A959.9 959.9 0 0 1 970.5 925.4 265.3 265.3 0 0 0 805.1 680.3 155.7 155.7 0 0 0 846.2 493 311.3 311.3 0 0 1 1356 732.9C1356 771.1 1317.4 811.2 1247.4 846.2ZM1172.6 506.5A27.7 27.7 0 0 0 1172.6 561.8 27.7 27.7 0 0 0 1172.6 506.5Z",
+ "width": 1411
+ },
+ "search": [
+ "family"
+ ]
+ },
+ {
+ "uid": "28e30de5c20857758e187ef8e56eddc1",
+ "css": "calendar-(2)",
+ "code": 59409,
+ "src": "custom_icons",
+ "selected": true,
+ "svg": {
+ "path": "M544.9 710.9A78.2 78.2 0 0 0 623 789H714.9A78.2 78.2 0 0 0 793 710.9V619.1A78.2 78.2 0 0 0 714.8 541H623A78.2 78.2 0 0 0 544.9 619.1ZM623 619.1H714.9V710.9H623ZM961 687.5A39 39 0 0 0 1000 648.5V234.4A156.4 156.4 0 0 0 843.8 78.1H793V39A39 39 0 0 0 714.8 39V78.1H537.1V39A39 39 0 1 0 459 39V78.1H283.2V39A39 39 0 1 0 205 39V78.1H156.3A156.4 156.4 0 0 0 0 234.4V843.8A156.4 156.4 0 0 0 156.3 1000H843.8A156.4 156.4 0 0 0 1000 843.8 39 39 0 0 0 921.9 843.8 78.2 78.2 0 0 1 843.7 921.9H156.3A78.2 78.2 0 0 1 78.1 843.8V234.4A78.2 78.2 0 0 1 156.3 156.3H205.1V195.5A39 39 0 0 0 283.2 195.5V156.3H459.1V195.5A39 39 0 0 0 537.2 195.5V156.3H715V195.5A39 39 0 0 0 793.1 195.5V156.3H843.9A78.2 78.2 0 0 1 922 234.4V648.5A39 39 0 0 0 961 687.5Z",
+ "width": 1000
+ },
+ "search": [
+ "calendar-(2)"
+ ]
}
]
-}
+}
\ No newline at end of file
diff --git a/assets/app_icons/fonts/DQIcons.ttf b/assets/app_icons/fonts/DQIcons.ttf
index 8365db47..3cff7aa3 100644
Binary files a/assets/app_icons/fonts/DQIcons.ttf and b/assets/app_icons/fonts/DQIcons.ttf differ
diff --git a/assets/images/DQ/DQ_logo.png b/assets/images/DQ/DQ_logo.png
new file mode 100644
index 00000000..993a1bd3
Binary files /dev/null and b/assets/images/DQ/DQ_logo.png differ
diff --git a/assets/images/DQ/dq_logo_icon.png b/assets/images/DQ/dq_logo_icon.png
new file mode 100644
index 00000000..71626bd8
Binary files /dev/null and b/assets/images/DQ/dq_logo_icon.png differ
diff --git a/assets/images/Weather_ico.png b/assets/images/Weather_ico.png
new file mode 100644
index 00000000..2e00ae8c
Binary files /dev/null and b/assets/images/Weather_ico.png differ
diff --git a/assets/images/Weather_img.png b/assets/images/Weather_img.png
new file mode 100644
index 00000000..57901477
Binary files /dev/null and b/assets/images/Weather_img.png differ
diff --git a/assets/images/ask_doctor.png b/assets/images/ask_doctor.png
new file mode 100644
index 00000000..f74ac6a8
Binary files /dev/null and b/assets/images/ask_doctor.png differ
diff --git a/assets/images/ask_doctor_bg.png b/assets/images/ask_doctor_bg.png
new file mode 100644
index 00000000..16e8e9d7
Binary files /dev/null and b/assets/images/ask_doctor_bg.png differ
diff --git a/assets/images/blood-drop.png b/assets/images/blood-drop.png
new file mode 100644
index 00000000..a981e3d3
Binary files /dev/null and b/assets/images/blood-drop.png differ
diff --git a/assets/images/contact_us_bg.png b/assets/images/contact_us_bg.png
index 1a7cc71e..40564039 100644
Binary files a/assets/images/contact_us_bg.png and b/assets/images/contact_us_bg.png differ
diff --git a/assets/images/dq_home_page_bg_image.png b/assets/images/dq_home_page_bg_image.png
new file mode 100644
index 00000000..f70df2ae
Binary files /dev/null and b/assets/images/dq_home_page_bg_image.png differ
diff --git a/assets/images/height_icon.png b/assets/images/height_icon.png
index a837fb3d..cca88ac0 100644
Binary files a/assets/images/height_icon.png and b/assets/images/height_icon.png differ
diff --git a/assets/images/new-design/height_icon.png b/assets/images/new-design/height_icon.png
index a3a8575f..cca88ac0 100644
Binary files a/assets/images/new-design/height_icon.png and b/assets/images/new-design/height_icon.png differ
diff --git a/assets/images/new-design/vidamobile.png b/assets/images/new-design/vidamobile.png
new file mode 100644
index 00000000..f096e8a7
Binary files /dev/null and b/assets/images/new-design/vidamobile.png differ
diff --git a/assets/images/notf.png b/assets/images/notf.png
new file mode 100644
index 00000000..39eb3fb3
Binary files /dev/null and b/assets/images/notf.png differ
diff --git a/assets/images/online_payment_icon.png b/assets/images/online_payment_icon.png
new file mode 100644
index 00000000..a6e0150a
Binary files /dev/null and b/assets/images/online_payment_icon.png differ
diff --git a/assets/images/online_payments_bg.png b/assets/images/online_payments_bg.png
new file mode 100644
index 00000000..72f8e331
Binary files /dev/null and b/assets/images/online_payments_bg.png differ
diff --git a/assets/images/pharmacy_module/bg_1.png b/assets/images/pharmacy_module/bg_1.png
new file mode 100644
index 00000000..9505e556
Binary files /dev/null and b/assets/images/pharmacy_module/bg_1.png differ
diff --git a/assets/images/pharmacy_module/bg_2.png b/assets/images/pharmacy_module/bg_2.png
new file mode 100644
index 00000000..96cfd3bc
Binary files /dev/null and b/assets/images/pharmacy_module/bg_2.png differ
diff --git a/assets/images/pharmacy_module/bg_3.png b/assets/images/pharmacy_module/bg_3.png
new file mode 100644
index 00000000..127c2669
Binary files /dev/null and b/assets/images/pharmacy_module/bg_3.png differ
diff --git a/assets/images/pharmacy_module/bg_4.png b/assets/images/pharmacy_module/bg_4.png
new file mode 100644
index 00000000..423ab421
Binary files /dev/null and b/assets/images/pharmacy_module/bg_4.png differ
diff --git a/assets/images/pharmacy_module/medication_icon.png b/assets/images/pharmacy_module/medication_icon.png
new file mode 100644
index 00000000..95851e4e
Binary files /dev/null and b/assets/images/pharmacy_module/medication_icon.png differ
diff --git a/assets/images/pharmacy_module/offer_icon.png b/assets/images/pharmacy_module/offer_icon.png
new file mode 100644
index 00000000..64db2b76
Binary files /dev/null and b/assets/images/pharmacy_module/offer_icon.png differ
diff --git a/assets/images/pharmacy_module/pharmacy_logo_green.png b/assets/images/pharmacy_module/pharmacy_logo_green.png
new file mode 100644
index 00000000..13c076b0
Binary files /dev/null and b/assets/images/pharmacy_module/pharmacy_logo_green.png differ
diff --git a/assets/images/pharmacy_module/prescription_icon.png b/assets/images/pharmacy_module/prescription_icon.png
new file mode 100644
index 00000000..740004c7
Binary files /dev/null and b/assets/images/pharmacy_module/prescription_icon.png differ
diff --git a/assets/images/pharmacy_module/search_scan_icon.png b/assets/images/pharmacy_module/search_scan_icon.png
new file mode 100644
index 00000000..d168b0e6
Binary files /dev/null and b/assets/images/pharmacy_module/search_scan_icon.png differ
diff --git a/assets/images/progress-loading.gif b/assets/images/progress-loading.gif
new file mode 100644
index 00000000..0d7769b7
Binary files /dev/null and b/assets/images/progress-loading.gif differ
diff --git a/assets/images/rectangle.png b/assets/images/rectangle.png
new file mode 100644
index 00000000..e4bdb0b6
Binary files /dev/null and b/assets/images/rectangle.png differ
diff --git a/assets/images/search_medicine_icon.png b/assets/images/search_medicine_icon.png
new file mode 100644
index 00000000..349620a5
Binary files /dev/null and b/assets/images/search_medicine_icon.png differ
diff --git a/assets/images/test-weight.png b/assets/images/test-weight.png
new file mode 100644
index 00000000..934b2467
Binary files /dev/null and b/assets/images/test-weight.png differ
diff --git a/assets/images/vital_sign_icon.png b/assets/images/vital_sign_icon.png
new file mode 100644
index 00000000..fbd0908b
Binary files /dev/null and b/assets/images/vital_sign_icon.png differ
diff --git a/ios/.gitignore b/ios/.gitignore
index ce2e85b9..e67828a4 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -32,3 +32,4 @@ Runner/GeneratedPluginRegistrant.*
!default.perspectivev3
/Runner.xcworkspace/contents.xcworkspacedata
/Runner.xcodeproj/project.pbxproj
+/Flutter/.last_build_id
diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id
new file mode 100644
index 00000000..44c4b26c
--- /dev/null
+++ b/ios/Flutter/.last_build_id
@@ -0,0 +1 @@
+da98d9f0c1f407e541c636e84847ac81
\ No newline at end of file
diff --git a/key.properties b/key.properties
new file mode 100644
index 00000000..01c8cbe8
--- /dev/null
+++ b/key.properties
@@ -0,0 +1,4 @@
+storePassword=HmGsa123
+keyPassword=HmGsa123
+keyAlias=DQKey
+storeFile=DQKey.jks
\ No newline at end of file
diff --git a/lib/config/config.dart b/lib/config/config.dart
index c034d2fc..39f90022 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -6,8 +6,9 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
const MAX_SMALL_SCREEN = 660;
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+ const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
const GET_PROJECT = 'Services/Lists.svc/REST/GetProject';
///Doctor
@@ -32,7 +33,7 @@ const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
const GET_Patient_LAB_SPECIAL_RESULT =
'Services/Patients.svc/REST/GetPatientLabSpecialResults';
const GET_Patient_LAB_RESULT =
- '/Services/Patients.svc/REST/GetPatientLabResults';
+ 'Services/Patients.svc/REST/GetPatientLabResults';
///
const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
@@ -57,11 +58,16 @@ const GET_NEAREST_HOSPITAL =
'Services/Patients.svc/REST/Patient_GetProjectAvgERWaitingTime';
///Er Nearest
-const GET_AMBULANCE_REQUEST = 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
-const GET_PATIENT_ALL_PRES_ORDERS= 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID= 'Services/Patients.svc/REST/PatientER_RRT_GetPickUpRequestByPresOrderID';
-const UPDATE_PRESS_ORDER = 'Services/Patients.svc/REST/PatientER_UpdatePresOrder';
-const INSERT_ER_INERT_PRES_ORDER = 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
+const GET_AMBULANCE_REQUEST =
+ 'Services/Patients.svc/REST/PatientER_RRT_GetAllTransportationMethod';
+const GET_PATIENT_ALL_PRES_ORDERS =
+ 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const GET_PICK_UP_REQUEST_BY_PRES_ORDER_ID =
+ 'Services/Patients.svc/REST/PatientER_RRT_GetPickUpRequestByPresOrderID';
+const UPDATE_PRESS_ORDER =
+ 'Services/Patients.svc/REST/PatientER_UpdatePresOrder';
+const INSERT_ER_INERT_PRES_ORDER =
+ 'Services/Patients.svc/REST/PatientER_InsertPresOrder';
///FindUs
const GET_FINDUS_REQUEST = 'Services/Lists.svc/REST/Get_HMG_Locations';
@@ -119,6 +125,10 @@ const GET_QR_PARKING = 'Services/SWP.svc/REST/GetQRParkingByID';
//URL to get clinic list
const GET_CLINICS_LIST_URL = "Services/lists.svc/REST/GetClinicCentralized";
+//URL to get active appointment list
+const GET_ACTIVE_APPOINTMENTS_LIST_URL =
+ "Services/Doctors.svc/Rest/Dr_GetAppointmentActiveNumber";
+
//URL to get projects list
const GET_PROJECTS_LIST = 'Services/Lists.svc/REST/GetProject';
@@ -141,7 +151,8 @@ const GET_PATIENT_SHARE =
"Services/Doctors.svc/REST/GetCheckinScreenAppointmentDetailsByAppointmentNO";
//URL to get patient appointment history
-const GET_PATIENT_APPOINTMENT_HISTORY = "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
+const GET_PATIENT_APPOINTMENT_HISTORY =
+ "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
//URL to get patient appointment curfew history
const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY =
@@ -172,6 +183,9 @@ const CHECK_PAYMENT_STATUS =
//URL create advance payment
const CREATE_ADVANCE_PAYMENT = "Services/Doctors.svc/REST/CreateAdvancePayment";
+const HIS_CREATE_ADVANCE_PAYMENT =
+ "Services/Patients.svc/REST/HIS_CreateAdvancePayment";
+
const ADD_ADVANCE_NUMBER_REQUEST =
'Services/PayFort_Serv.svc/REST/AddAdvancedNumberRequest';
@@ -232,6 +246,7 @@ const SESSION_ID = 'TMRhVmkGhOsvamErw';
const IS_DENTAL_ALLOWED_BACKEND = false;
const PATIENT_TYPE = 1;
const PATIENT_TYPE_ID = 1;
+var DEVICE_TOKEN = "";
var DeviceTypeID = Platform.isIOS ? 1 : 2;
const LANGUAGE_ID = 2;
const GET_PHARMCY_ITEMS = "Services/Lists.svc/REST/GetPharmcyItems_Region";
@@ -240,6 +255,10 @@ const GET_PAtIENTS_INSURANCE =
"Services/Patients.svc/REST/Get_PatientInsuranceDetails";
const GET_PAtIENTS_INSURANCE_UPDATED =
"Services/Patients.svc/REST/PatientER_GetPatientInsuranceCardUpdateHistory";
+
+const INSURANCE_DETAILS =
+ "Services/Patients.svc/REST/Get_InsuranceCheckList";
+
const GET_VACCINES = "Services/Patients.svc/REST/GetDoneVaccinesByPatientID";
const GET_VACCINES_EMAIL = "Services/Notifications.svc/REST/SendVaccinesEmail";
const GET_PAtIENTS_INSURANCE_APPROVALS =
@@ -264,13 +283,14 @@ const SEND_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT =
const CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT =
'Services/Authentication.svc/REST/CheckActivationCodeForAdvancePayment';
+const GET_COVID_DRIVETHRU_PROJECT_LIST =
+ 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter';
-const GET_COVID_DRIVETHRU_PROJECT_LIST = 'Services/Doctors.svc/REST/COVID19_ProjectDriveThroughTestingCenter';
-
-const GET_COVID_DRIVETHRU_PAYMENT_INFO = 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation';
-
-const GET_COVID_DRIVETHRU_FREE_SLOTS = 'Services/Doctors.svc/REST/COVID19_GetFreeSlots';
+const GET_COVID_DRIVETHRU_PAYMENT_INFO =
+ 'Services/Doctors.svc/REST/COVID19_GetPatientPaymentInormation';
+const GET_COVID_DRIVETHRU_FREE_SLOTS =
+ 'Services/Doctors.svc/REST/COVID19_GetFreeSlots';
///Smartwatch Integration Services
const GET_PATIENT_LAST_RECORD =
@@ -328,14 +348,29 @@ const GET_ALL_CITIES = 'services/Lists.svc/rest/GetAllCities';
const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral";
const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
+// pharmacy
+const GET_PHARMACY_BANNER = "epharmacy/api/promotionbanners";
+const GET_PHARMACY_TOP_MANUFACTURER = "epharmacy/api/topmanufacturer";
+const GET_PHARMACY_BEST_SELLER_PRODUCT = "epharmacy/api/bestsellerproducts";
+const GET_PHARMACY_PRODUCTs_BY_IDS = "epharmacy/api/productsbyids/";
+const GET_CUSTOMERS_ADDRESSES = "epharmacy/api/Customers/";
// Home Health Care
-const HHC_GET_ALL_SERVICES = "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
-const HHC_GET_ALL_CMC_SERVICES = "Services/Patients.svc/REST/PatientER_CMC_GetAllServices";
-const PATIENT_ER_UPDATE_PRES_ORDER ="Services/Patients.svc/REST/PatientER_UpdatePresOrder";
-const GET_ORDER_DETAIL_BY_ID ="Services/Patients.svc/REST/PatientER_HHC_GetTransactionsForOrder";
-const GET_CMC_ORDER_DETAIL_BY_ID ="Services/Patients.svc/REST/PatientER_CMC_GetTransactionsForOrder";
-const GET_CHECK_UP_ITEMS ="Services/Patients.svc/REST/GetCheckUpItems";
+const HHC_GET_ALL_SERVICES =
+ "Services/Patients.svc/REST/PatientER_HHC_GetAllServices";
+const HHC_GET_ALL_CMC_SERVICES =
+ "Services/Patients.svc/REST/PatientER_CMC_GetAllServices";
+const PATIENT_ER_UPDATE_PRES_ORDER =
+ "Services/Patients.svc/REST/PatientER_UpdatePresOrder";
+const GET_ORDER_DETAIL_BY_ID =
+ "Services/Patients.svc/REST/PatientER_HHC_GetTransactionsForOrder";
+const GET_CMC_ORDER_DETAIL_BY_ID =
+ "Services/Patients.svc/REST/PatientER_CMC_GetTransactionsForOrder";
+const GET_CHECK_UP_ITEMS = "Services/Patients.svc/REST/GetCheckUpItems";
+const PUSH_NOTIFICATION_GET_ALL_NOTIFICATIONS =
+ 'Services/MobileNotifications.svc/REST/PushNotification_GetAllNotifications';
+const PUSH_NOTIFICATION_SET_MESSAGES_FROM_POOL_AS_READ =
+ 'Services/MobileNotifications.svc/REST/PushNotification_SetMessagesFromPoolAsRead';
const GET_PATIENT_ALL_PRES_ORD= 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index c92ad50e..77bbed01 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1,4 +1,4 @@
-const Map> localizedValues = {
+const Map localizedValues = {
'dashboardScreenToolbarTitle': {'ar': 'الرئيسة', 'en': 'Home'},
'settings': {'en': 'Settings', 'ar': 'الاعدادات'},
'language': {'en': 'App Language', 'ar': 'لغة التطبيق'},
@@ -109,15 +109,19 @@ const Map> localizedValues = {
'set-reminder': {'en': 'Set Reminder', 'ar': 'تعيين تذكير'},
'login': {'en': 'Login', 'ar': 'تسجيل الدخول'},
- 'loginregister': {'en': 'Login / Register', 'ar': 'دخولتسجيل'},
- 'welcome': {'en': 'Welcome', 'ar': 'أهلا بك'},
- 'welcome_text': {
- 'en': 'Dr. Sulaiman Al Habib Mobile Application ',
- 'ar': 'الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك'
+ 'loginregister': {'en': 'Login / Register', 'ar': 'تسجيل الدخول'},
+ 'poweredBy': {'en': 'Powered By', 'ar': 'مشغل بواسطة'},
+ "welcome": {
+ "en": "Welcome",
+ "ar": "مرحبا"
+ },
+ "welcome_text": {
+ "en": "Dr. Sulaiman Al Habib Mobile Application",
+ "ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك"
},
'welcome_text2': {
'en': 'Have you visited AlHabib Medical Group before? ',
- 'ar': 'الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك'
+ 'ar': 'هل قمت بزيارة مجموعة الحبيب الطبية من قبل؟'
},
'yes': {'en': 'Yes', 'ar': 'نعم'},
'no': {'en': 'No', 'ar': 'لا'},
@@ -126,12 +130,23 @@ const Map> localizedValues = {
"ar": "اختر من الخيارات أدناه لتسجيل الدخول إلى ملفك الطبي."
},
"registernow": {"en": "Register Now", "ar": "تسجيل الان"},
- "nationalID": {"en": "National ID", "ar": "رقم الهوية"},
+ "nationalID": { "en": "Enter the Identification Number",
+ "ar": "أدخل رقم الهوية الوطنية او الاقامة"},
+ "national-id": {
+ "en": "National ID",
+ "ar": "رقم الهوية"
+ },
"fileNo": {"en": "File Number", "ar": "رقم الملف"},
+ "fileno": {"en": "File No", "ar": "رقم الملف"},
"forgotFileNo": {"en": "Forgot file Number?", "ar": "نسيت رقم الملف الطبي؟"},
+ "forgotFileNoTitle": {
+ "en": "Forgot medical file Number",
+ "ar": "نسيت رقم الملف"
+ },
+
"enter-national-id": {
- "en": "Please enter mobile number and national ID / Iqama",
- "ar": "الرجاء إدخال رقم الجوال والهوية الوطنية / الاقامة"
+ "en": "Please enter mobile number and identification number",
+ "ar": "الرجاء إدخال رقم الجوال ورقم الهوية"
},
"profile-info": {
"en": "Please enter profile information",
@@ -283,6 +298,7 @@ const Map> localizedValues = {
"enter-email": {"en": "Enter Email", "ar": "ادخل البريد الالكتروني"},
"family": {"en": "My Family", "ar": "عائلتي"},
"family-title": {"en": "My Family Files", "ar": "ملفات العائلة"},
+ "myFamily": {"en": "My Family", "ar": "ملفات العائلة"},
"add-new-member": {"en": "Add Family Member", "ar": "إضافة عضو جديد"},
"sent-requests": {"en": "Sent Requests", "ar": "الطلبات المرسلة"},
"recieved-requests": {"en": "Recieved Requests", "ar": "الطلبات المستلمة"},
@@ -337,18 +353,18 @@ const Map> localizedValues = {
"MyMedicalFile": {"en": "My Medical File", 'ar': 'ملف الطبي الالكتروني'},
"myMedicalFileSubTitle": {
"en": "All your medical records",
- 'ar': 'جميع سجلاتك البية'
+ 'ar': 'جميع سجلاتك الطبية'
},
"viewMore": {"en": "View More", 'ar': 'عرض المزيد'},
"homeHealthCareService": {
"en": "Home Health Care Service",
'ar': 'الرعاية الصحية المنزلية'
},
- "OnlinePharmacy": {"en": "Online Pharmacy", 'ar': 'صيدلايات الحبيب'},
+ "OnlinePharmacy": {"en": "Online Pharmacy", 'ar': 'صيدليات الحبيب'},
"EmergencyService": {"en": "Emergency Service", 'ar': 'الفحص الطبي الشامل'},
"OnlinePaymentService": {
"en": "Online Payment Service",
- 'ar': 'خدمة الدفع عبر الإلكتدوني'
+ 'ar': 'خدمة الدفع الإلكتدوني'
},
"OffersAndPackages": {
"en": "Online transfer request",
@@ -409,7 +425,7 @@ const Map> localizedValues = {
"locationa": {"en": "location:", "ar": "الموقع"},
"ambulancerequest": {"en": "Ambulance :", "ar": "طلب نقل "},
"requestA": {"en": "Request:", "ar": "اسعاف"},
- "MyAppointments": {"en": "My Appointments", "ar": "مواعيدي"},
+ "MyAppointments": {"en": "Appointments", "ar": "مواعيدي"},
"NoBookedAppointments": {
"en": "No Booked Appointments",
"ar": "لا توجد مواعيد محجوزة"
@@ -658,7 +674,44 @@ const Map> localizedValues = {
"ar": "الفحص ليس تشخيص."
},
"remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"},
+ "loginToUseService": {
+ "en": "You need to login to use this service",
+ "ar": "هذة الخدمة تتطلب تسجيل الدخول"
+ },
+ // pharmacy module
+ "medicationRefill": {
+ "en": "MEDICATION REFILL",
+ "ar": "إعادة تعبئة الدواء"
+ },
+ "offersAndPromotions": {
+ "en": "OFFERS & SPECIAL PROMOTIONS",
+ "ar": "العروض والترقيات الخاصة"
+ },
+ "myPrescriptions": {
+ "en": "MY PRESCRIPTIONS",
+ "ar": "وصفاتي"
+ },
+ "searchAndScanMedication": {
+ "en": "SEARCH & SCAN FOR MEDICATION",
+ "ar": "البحث والمسح للأدوية"
+ },
+ "shopByBrands": {
+ "en": "Shop By Brands",
+ "ar": "تسوق حسب الماركات"
+ },
+ "recentlyViewed": {
+ "en": "Recently Viewed",
+ "ar": "شوهدت مؤخرا"
+ },
+ "bestSellers": {
+ "en": "Best Sellers",
+ "ar": "أفضل البائعين"
+ },
+ "deleteAllItems": {
+ "en": "Delete All Items",
+ "ar": "حذف كافة العناصر"
+ },
"select-gender": {"en": "Select Gender", "ar": "اختر الجنس"},
"i-am-a": {"en": "I am a ...", "ar": "أنا ..."},
"select-age": {"en": "Select Your Age", "ar": "حدد العمر"},
@@ -671,4 +724,412 @@ const Map> localizedValues = {
"en": "This service provides a set of home health care services, continuous and comprehensive follow-up in their places of residence for those who cannot access health facilities, such as (laboratory analyzes - radiology - vaccinations - physical therapy), etc.",
"ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
},
+ "email": {"en": "Email", "ar": "البريد الالكتروني"},
+ "Book": {"en": "Book", "ar": "احجز"},
+ "AppointmentLabel": {"en": "Appointment", "ar": "موعد"},
+ "BloodType": {"en": "Blood Type", "ar": "فصيلة الدم"},
+ "marital-status": {"en": "Marital status", "ar": "الحالة الإجتماعية"},
+ "general": {"en": "General", "ar": "عام"},
+ "profile": {"en": "Profile", "ar": "ملفي"},
+ "notifications": {"en": "Notifications", "ar": "إشعارات"},
+ "notificationDetails": {"en": "Notification Details", "ar": "تفاصيل الاشعار"},
+ "notificationDetailsa": {
+ "en": "Notification Details",
+ "ar": "تفاصيل الاشعار"
+ },
+
+ "info-my-doctor-points": {
+ "en": [
+ "View the doctor's profile and qualifications.",
+ "View the doctor's schedule.",
+ "View details of your appointments with the selected doctor.",
+ "Book appointment with the doctor. ",
+ ],
+ "ar": [
+ "الاطلاع على معلومات الطبيب ومؤهلاته.",
+ "الاطلاع على جدول الطبيب.",
+ "الاطلاع على تفاصيل المواعيد التي تمت مع الطبيب.",
+ "حجز موعد مع الطبيب."
+ ]
+ },
+ "info-my-doctor": {
+ "en":
+ "This service allows you to see all the doctors you have visited in Al Habib Medical Group, and through this service:",
+ "ar":
+ "خدمة اطبائي: هذه الخدمة تمكنك من الاطلاع على جميع الاطباء الذين قمت بزيارتهم في مجموعة الحبيب الطبية, كما تستطيع من خلال هذه الخدمة:"
+ },
+ "info-prescriptions": {
+ "en":
+ "This service allows you to view all the medical prescriptions issued by Al Habib Medical Group, and through this service, you can:",
+ "ar":
+ "خدمة الوصفات الطبية: هذه الخدمة تمكنك من الاطلاع على جميع الوصفات الطبية التي تم اصدارها في مجموعة الحبيب الطبية، كما تستطيع من خلال هذه الخدمة:"
+ },
+ "info-my-prescription-points": {
+ "en": [
+ "View the duration days.",
+ "View the frequency timing.",
+ "View the doctor's remarks.",
+ "Add a reminder to remind you when to take medicine doses.",
+ "Search in AlHabib Pharmacies about the branches where medicines are available, pharmacies locations and contact numbers.",
+ "Ordering and delivery medications online.",
+ "View the prices of the drug. ",
+ ],
+ "ar": [
+ "الاطلاع على طريقة تناول العلاج.",
+ "الاطلاع على مدة تناول العلاج.",
+ "الاطلاع على ملاحظات الطبيب.",
+ "اضافة منبه للتذكير بموعد تناول جرعات الادوية.",
+ "البحث في صيدليات الحبيب عن الفروع التي يتوفر فيها العلاج وكذلك مواقع الصيدليات وارقام الاتصال. ",
+ "امكانية شراء وتوصيل العلاج عن طريق الانترنت.",
+ "الاطلاع على اسعار الادوية المصروفة."
+ ]
+ },
+
+ "info-insurance-cards": {
+ "en":
+ "This service allows you to view all the insurance cards that recorded during your visits to Al Habib Medical Group in addition to:",
+ "ar":
+ "خدمة بطاقات التامين: هذه الخدمة تمكنك من الاطلاع على جميع بطاقات التامين والتي تم تسجيلها اثناء زياراتك لمجموعة الحبيب الطبية بالاضافة الى:"
+ },
+
+ "info-insurance-cards-points": {
+ "en": [
+ "Name of the insurance company.",
+ "Insurance category.",
+ "Insurance policy number.",
+ "The expiry date of insurance.",
+ "The status of the insurance card (active or inactive).",
+ "Details of the coverage, e.x the room category covered as well some cases covered by the insurance.",
+ ],
+ "ar": [
+ "اسم شركة التامين.",
+ "فئة التامين.",
+ "رقم بوليصة التامين.",
+ "تاريخ انتهاء التامين.",
+ "حالة بطاقة التامين (فعالة او غير فعالة).",
+ "تفاصيل التامين، مثلاً: مستوى الغرفة التي يغطيها التامين وكذلك الحالات التي يغطيها التامين.",
+ ]
+ },
+
+ "info-allergies": {
+ "en":
+ "This service allows you to view all types of allergies recorded during your visits to Al Habib Medical Group.",
+ "ar":
+ "خدمة الحساسية: هذه الخدمة تمكنك من الاطلاع على جميع انواع الحساسية التي تم تسجيلها خلال زياراتك في مجموعة الحبيب الطبية."
+ },
+
+ "sick-leaves": {"en": "Sick Leaves", "ar": "الاجازات المرضية"},
+
+ "info-sick-leaves": {
+ "en":
+ "This service allows you to view all sick leaves that were taken in Al Habib Medical Group in addition to:",
+ "ar":
+ "الاجازات المرضية: هذه الخدمة تمكنك من الاطلاع على جميع الاجازات المرضية والتي تم اصدارها في مجموعة الحبيب الطبية بالاضافة الى:"
+ },
+ "info-sick-leave-points": {
+ "en": [
+ "Doctor Name",
+ "Sick leave date ",
+ "Sick leave days",
+ "Branch that patient take the vaccination form.",
+ "Sending a report of vaccinations to the email. ",
+ ],
+ "ar": [
+ "اسم الطبيب",
+ "تاريخ الاجازة.",
+ "عدد ايام الاجازة.",
+ "الفرع الذي تم اصدار الاجازة منه.",
+ "ارسال نسخة مختومة من الاجازة الى البريد الالكتروني."
+ ]
+ },
+
+ "info-approvals": {
+ "en":
+ "This service allows you to view all approvals requests that have been sent to the insurance companies in addition to:",
+ "ar":
+ "خدمة الموافقات: هذه الخدمة تمكنك من الاطلاع على جميع طلبات الموافقات والتي تم ارسالها الى شركات التامين بالاضافة الى:"
+ },
+
+ "info-approval-points": {
+ "en": [
+ "View the total unused approvals.",
+ "Track the approvals status.",
+ ],
+ "ar": [
+ "الاطلاع على اجمالي الموافقات الغير مستخدمة.",
+ "تتبع حالة الموافقة.",
+ ]
+ },
+
+ "month-report": {"en": "Monthly Reports", "ar": "تقاريري الشهرية"},
+ "info-month-report": {
+ "en":
+ "Upon activation of this service, the system will send a monthly report automatically to the registered email which lists the vital signs and the results for the last visits made in AlHabib Medical Group.",
+ "ar":
+ "خدمة التقارير الشهرية: عند تفعيل هذه الخدمة سيقوم النظام بارسال تقرير شهري بشكل آلي على الايميل المسجل والذي يسرد المؤشرات الحيوية ونتائج التحاليل لآخر زيارات تمت بمجموعة الحبيب الطبية."
+ },
+ "language-setting": {
+ "en": "SMS and Confirmation Calls Language",
+ "ar": "لغة الرسائل القصيرة و الاتصال الآلي"
+ },
+ "alert": {"en": "Alerts", "ar": "التنبيهات"},
+ "email-alert": {
+ "en": "Alert By Email",
+ "ar": "استلام التنبيهات بالبريد الالكتروني"
+ },
+ "sms-alert": {
+ "en": "Alert By SMS",
+ "ar": "استلام التنبيهات بالرسائل القصيرة"
+ },
+ "contact-info": {"en": "Contact Information", "ar": "معلومات التواصل"},
+ "emrg-name": {
+ "en": "Emergency Contact Name",
+ "ar": "اسم للتواصل في حالة الطوارئ"
+ },
+ "emrg-no": {
+ "en": "Emergency Contact Number",
+ "ar": "رقم للتواصل في حالة الطوارئ"
+ },
+ "modes": {"en": "Modes", "ar": "الاوضاع"},
+ "vibration": {"en": "Vibration Touch Feedback", "ar": "الاهتزاز عند اللمس"},
+ "blind-modes": {
+ "en": "Modes for Partially Blind",
+ "ar": "تأثيرات لدعم ضعاف البصر"
+ },
+ "invert-theme": {"en": "Invert", "ar": "ألوان سلبية"},
+ "off-theme": {"en": "Off", "ar": "إيقاف"},
+ "dim-theme": {"en": "Dim", "ar": "ضوء خافت"},
+ "bw-theme": {"en": "Black and White", "ar": "أبيض و أسود"},
+ "permissions": {"en": "Permission", "ar": "الصلاحيات"},
+ "camera-permission": {"en": "Camera", "ar": "الكاميرا"},
+ "location-permission": {"en": "Location", "ar": "تحديد المواقع"},
+
+ "accessibility": {"en": "Accessibility Mode", "ar": "وضع امكانية الوصول"},
+ "orderStatus": {"en": "Order Status", "ar": "حالة الطلب"},
+ "CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"},
+ "FindUs": {"en": "Find Us", "ar": "اين تجدنا"},
+ "Feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
+ "LiveChat": {"en": "Live Chat", "ar": "محادثة مباشرة"},
+ "Service": {"en": "Service", "ar": "خدمة"},
+ "HMGServiceLabel": {"en": "HMG Service", 'ar': 'خدمات الحبيب'},
+ "HealthWeatherIndicators": {"en": "Health Weather Indicators", 'ar': ' مؤشرات الطقس الصحية '},
+ "HealthTipsBasedOnCurrentWeather": {"en": "Health Tips Based On Current Weather", 'ar': ' نصائح صحية على أساس الطقس الحالي '},
+ "MoreDetails": {"en": "More details", "ar": " المزيد من التفاصيل "},
+ "SendCopy": {"en": "Send Copy", "ar": "ارسال نسخة"},
+ "ResendOrder": {"en": "Resend order & deliver", "ar": "إعادة طلب و توصيل"},
+ "Ports": {"en": "Ports", "ar": "المنافذ"},
+ "Way": {"en": "Way", "ar": "الطزيقة"},
+ "Average": {"en": "Average", "ar": "المعدل"},
+ "DailyDoses": {"en": "Daily Doses", "ar": "جرعات يومية"},
+ "Period": {"en": "Period", "ar": "الفترة"},
+ "cm": {
+ "en": "CM",
+ "ar": "سم"
+ },
+ "kg": {
+ "en": "kg",
+ "ar": "كجم"
+ },
+ "mass": {
+ "en": "Mass",
+ "ar": "كتلة"
+ },
+ "temp-c": {
+ "en": "°C",
+ "ar": "°س"
+ },
+ "bpm": {
+ "en": "bpm",
+ "ar": "نبضة"
+ },
+ "respiration-signs": {
+ "en": "Respiration",
+ "ar": "تنفس"
+ },
+ "sys-dias": {
+ "en": "SBP/DBP",
+ "ar": "إنقباض/إنبساط"
+ },
+ "body": {
+ "en": "Body \n Mass",
+ "ar": "كتلة\nالجسم"
+ },
+ "feedback": {
+ "en": "Feedback",
+ "ar": "رأيك يهمنا"
+ },
+ "send": {
+ "en": "Send",
+ "ar": "أرسل"
+ },
+ "status": {
+ "en": "Status",
+ "ar": "الحالة"
+ },
+ "like-to-hear": {
+ "en": "We would love to hear the feedback, concerns on healthcare services and eServices experience. Please use the below form",
+ "ar": "يسعدنا سماع ملاحظاتك حول خدمات الرعاية الصحية والخدمات الإلكترونية. يرجى تعبئة الحقول المطلوبة"
+ },
+ "subject": {
+ "en": "Subject",
+ "ar": "الموضوع"
+ },
+ "message": {
+ "en": "Message",
+ "ar": "رسالة"
+ },
+ "empty-subject": {
+ "en": "Please enter the subject",
+ "ar": "يرجى ادخال الموضوع"
+ },
+ "empty-message": {
+ "en": "Please enter message",
+ "ar": "يرجى ادخال الموضوع"
+ },
+ "select-attachment": {
+ "en": "Select Attachment",
+ "ar": "إختر المرفق"
+ },
+ "complain-appo": {
+ "en": "Complaint for appointment",
+ "ar": "شكوى على موعد"
+ },
+ "complain-without-appo": {
+ "en": "Complaint without appointment",
+ "ar": "شكوى بدون موعد"
+ },
+ "question": {
+ "en": "Question",
+ "ar": "سؤال"
+ },
+ "message-type": {
+ "en": "Message Type",
+ "ar": "نوع الرسالة"
+ },
+ "compliment": {
+ "en": "compliment",
+ "ar": "ثناء"
+ },
+ "suggestion": {
+ "en": "Suggestion",
+ "ar": "إقتراح"
+ },
+ "your-feedback": {
+ "en": "Your feedback was sent",
+ "ar": "إقتراح"
+ },
+ "select-part": {
+ "en": "Please select the part that complain about",
+ "ar": "يرجى تحديد الجزء الذي تشكو منه"
+ },
+ "number": {
+ "en": "Number",
+ "ar": "الرقم"
+ },
+ "not-classified": {
+ "en": "Not classified",
+ "ar": "غير محدد"
+ },
+ "selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"},
+ "reviews": {"en": "Reviews", "ar": "تقييمات"},
+ "searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"},
+ "YouCanFind": {"en": "YouCanFind", "ar": "باستطاعتك العثور على "},
+ "ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "},
+ "InvoiceNo": {"en": " Invoice No", "ar": "رقم الفاتورة"},
+ "SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"},
+ "GeneralResult": {"en": "General Result", "ar": "نتيجة عامة"},
+ "show-more-btn": {
+ "en": "Flow Chart",
+ "ar": "النتائج التراكمية"
+ },
+
+ "value": {
+ "en": "Value",
+ "ar": "القيمة"
+ },
+ "range": {
+ "en": "Range",
+ "ar": "المدى"
+ },
+ "out-patient": {
+ "en": "Out Patient",
+ "ar": "عيادات خارجية"
+ },
+ "in-patient": {
+ "en": "In Patient",
+ "ar": "تنويم"
+ },
+ "report": {
+ "en": "Radiology Report",
+ "ar": "تقرير الاشعة"
+ },
+ "open-rad": {
+ "en": "Open Image",
+ "ar": "فتح صور الاشعة"
+ },
+ "send-copy": {
+ "en": "Email the Report",
+ "ar": "أرسل التقرير"
+ },
+
+ "vaccination": {
+ "en": "Vaccination",
+ "ar": "جدول التطعيمات"
+ },
+ "welcomeBack": {
+ "en": "Welcome back",
+ "ar": "مرحبا مرة أخرى"
+ },
+ "instructions": {
+ "en": "Please ensure that the email address is up-to-date and process to view the schedule",
+ "ar": "يرجى التأكد من صحة عنوان البريد الالكتروني و المتابعة لعرض الجدول "
+ },
+ "update-email": {
+ "en": "Update Email",
+ "ar": "تحديث البريد الالكتروني"
+ },
+
+ "updated-email": {
+ "en": "Updated email successfully",
+ "ar": "تم تحديث البريد الالكتروني"
+ },
+
+ "view-list-children": {
+ "en": "View List of Children",
+ "ar": "عرض قائمة الأطفال"
+ },
+
+ "add-child": {
+ "en": "Add New Child",
+ "ar": "اضافة طفل"
+ },
+ "child-name": {
+ "en": "Child Name",
+ "ar": "اسم الطفل"
+ },
+ "childDob": {
+ "en": "Birth Date",
+ "ar": "تاريخ الولادة"
+ },
+ "delete": {
+ "en": "Delete",
+ "ar": "حذف"
+ },
+ "deleted-child": {
+ "en": "The request was successful. The children have removed from the vaccination schedule subscription service.",
+ "ar": "تم حذف الطفل بنجاح"
+ },
+ "visit": {
+ "en": "Visit",
+ "ar": "زيارة"
+ },
+ "description-vaccination": {
+ "en": "Description",
+ "ar": "وصف"
+ },
+ "due-date": {
+ "en": "Due date",
+ "ar": "تاريخ الاستحقاق"
+ },
+
};
diff --git a/lib/config/shared_pref_kay.dart b/lib/config/shared_pref_kay.dart
index 7422052d..b79edb08 100644
--- a/lib/config/shared_pref_kay.dart
+++ b/lib/config/shared_pref_kay.dart
@@ -16,3 +16,7 @@ const USER_LONG = 'user-long';
const IS_GO_TO_PARKING = 'IS_GO_TO_PARKING';
const IS_SEARCH_APPO = 'is-search-appo';
const IS_LIVECARE_APPOINTMENT = 'is_livecare_appointment';
+const IS_VIBRATION = 'is_vibration';
+const THEME_VALUE = 'is_vibration';
+const MAIN_USER = 'main-user';
+const PHARMACY_LAST_VISITED_PRODUCTS = 'last-visited';
diff --git a/lib/core/model/insurance/insurance_card.dart b/lib/core/model/insurance/insurance_card.dart
index 998df241..ebab8d71 100644
--- a/lib/core/model/insurance/insurance_card.dart
+++ b/lib/core/model/insurance/insurance_card.dart
@@ -16,7 +16,9 @@ class InsuranceCardModel {
int patientType;
String groupName;
String companyName;
+ int companyID;
String subCategoryDesc;
+ int subCategoryID;
String patientCardID;
String insurancePolicyNumber;
bool isActive;
@@ -25,6 +27,7 @@ class InsuranceCardModel {
InsuranceCardModel({
this.insurancePolicyNumber,
this.subCategoryDesc,
+ this.subCategoryID,
this.versionID,
this.channel,
this.languageID,
@@ -40,6 +43,7 @@ class InsuranceCardModel {
this.patientType,
this.groupName,
this.companyName,
+ this.companyID,
this.patientCardID,
this.isActive,
this.cardValidTo
@@ -50,6 +54,7 @@ class InsuranceCardModel {
insurancePolicyNumber = json['InsurancePolicyNo'];
patientCardID = json['PatientCardID'];
companyName = json['CompanyName'];
+ companyID = json['CompanyID'];
groupName = json['GroupName'];
versionID = json['VersionID'];
channel = json['Channel'];
@@ -65,6 +70,7 @@ class InsuranceCardModel {
patientTypeID = json['PatientTypeID'];
patientType = json['PatientType'];
subCategoryDesc = json['SubCategoryDesc'];
+ subCategoryID = json["SubCategoryID"];
cardValidTo = json['CardValidTo'];
}
diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart
index 23b3363d..c9acd809 100644
--- a/lib/core/model/labs/lab_result.dart
+++ b/lib/core/model/labs/lab_result.dart
@@ -86,3 +86,14 @@ class LabResult {
return data;
}
}
+
+
+class LabResultList {
+ String filterName = "";
+ List patientLabResultList = List();
+
+ LabResultList(
+ {this.filterName, LabResult lab}) {
+ patientLabResultList.add(lab);
+ }
+}
diff --git a/lib/core/model/my_balance/AdvanceModel.dart b/lib/core/model/my_balance/AdvanceModel.dart
index b95e08a2..d2792990 100644
--- a/lib/core/model/my_balance/AdvanceModel.dart
+++ b/lib/core/model/my_balance/AdvanceModel.dart
@@ -8,6 +8,9 @@ class AdvanceModel {
String email;
String note;
String depositorName;
+ String mobileNumber;
+ String patientName;
+ int projectID;
CitiesModel citiessModel;
AdvanceModel(
@@ -17,5 +20,8 @@ class AdvanceModel {
this.hospitalsModel,
this.fileNumber,
this.depositorName,
+ this.mobileNumber,
+ this.patientName,
+ this.projectID,
this.citiessModel});
}
diff --git a/lib/core/model/notifications/get_notifications_request_model.dart b/lib/core/model/notifications/get_notifications_request_model.dart
new file mode 100644
index 00000000..9659754a
--- /dev/null
+++ b/lib/core/model/notifications/get_notifications_request_model.dart
@@ -0,0 +1,22 @@
+class GetNotificationsRequestModel {
+ int notificationStatusID;
+ int pagingSize;
+ int currentPage;
+
+ GetNotificationsRequestModel(
+ {this.notificationStatusID, this.pagingSize, this.currentPage});
+
+ GetNotificationsRequestModel.fromJson(Map json) {
+ notificationStatusID = json['NotificationStatusID'];
+ pagingSize = json['pagingSize'];
+ currentPage = json['currentPage'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['NotificationStatusID'] = this.notificationStatusID;
+ data['pagingSize'] = this.pagingSize;
+ data['currentPage'] = this.currentPage;
+ return data;
+ }
+}
diff --git a/lib/core/model/notifications/get_notifications_response_model.dart b/lib/core/model/notifications/get_notifications_response_model.dart
new file mode 100644
index 00000000..1f3bbc28
--- /dev/null
+++ b/lib/core/model/notifications/get_notifications_response_model.dart
@@ -0,0 +1,96 @@
+class GetNotificationsResponseModel {
+ int id;
+ int recordId;
+ int patientID;
+ bool projectOutSA;
+ String deviceType;
+ String deviceToken;
+ String message;
+ String messageType;
+ String messageTypeData;
+ dynamic videoURL;
+ bool isQueue;
+ String isQueueOn;
+ String createdOn;
+ String createdBy;
+ String notificationType;
+ bool isSent;
+ String isSentOn;
+ bool isRead;
+ String isReadOn;
+ int channelID;
+ int projectID;
+
+ GetNotificationsResponseModel(
+ {this.id,
+ this.recordId,
+ this.patientID,
+ this.projectOutSA,
+ this.deviceType,
+ this.deviceToken,
+ this.message,
+ this.messageType,
+ this.messageTypeData,
+ this.videoURL,
+ this.isQueue,
+ this.isQueueOn,
+ this.createdOn,
+ this.createdBy,
+ this.notificationType,
+ this.isSent,
+ this.isSentOn,
+ this.isRead,
+ this.isReadOn,
+ this.channelID,
+ this.projectID});
+
+ GetNotificationsResponseModel.fromJson(Map json) {
+ id = json['Id'];
+ recordId = json['RecordId'];
+ patientID = json['PatientID'];
+ projectOutSA = json['ProjectOutSA'];
+ deviceType = json['DeviceType'];
+ deviceToken = json['DeviceToken'];
+ message = json['Message'];
+ messageType = json['MessageType'];
+ messageTypeData = json['MessageTypeData'];
+ videoURL = json['VideoURL'];
+ isQueue = json['IsQueue'];
+ isQueueOn = json['IsQueueOn'];
+ createdOn = json['CreatedOn'];
+ createdBy = json['CreatedBy'];
+ notificationType = json['NotificationType'];
+ isSent = json['IsSent'];
+ isSentOn = json['IsSentOn'];
+ isRead = json['IsRead'];
+ isReadOn = json['IsReadOn'];
+ channelID = json['ChannelID'];
+ projectID = json['ProjectID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['Id'] = this.id;
+ data['RecordId'] = this.recordId;
+ data['PatientID'] = this.patientID;
+ data['ProjectOutSA'] = this.projectOutSA;
+ data['DeviceType'] = this.deviceType;
+ data['DeviceToken'] = this.deviceToken;
+ data['Message'] = this.message;
+ data['MessageType'] = this.messageType;
+ data['MessageTypeData'] = this.messageTypeData;
+ data['VideoURL'] = this.videoURL;
+ data['IsQueue'] = this.isQueue;
+ data['IsQueueOn'] = this.isQueueOn;
+ data['CreatedOn'] = this.createdOn;
+ data['CreatedBy'] = this.createdBy;
+ data['NotificationType'] = this.notificationType;
+ data['IsSent'] = this.isSent;
+ data['IsSentOn'] = this.isSentOn;
+ data['IsRead'] = this.isRead;
+ data['IsReadOn'] = this.isReadOn;
+ data['ChannelID'] = this.channelID;
+ data['ProjectID'] = this.projectID;
+ return data;
+ }
+}
diff --git a/lib/core/model/notifications/mark_message_as_read_request_model.dart b/lib/core/model/notifications/mark_message_as_read_request_model.dart
new file mode 100644
index 00000000..99dab006
--- /dev/null
+++ b/lib/core/model/notifications/mark_message_as_read_request_model.dart
@@ -0,0 +1,15 @@
+class MarkMessageAsReadRequestModel {
+ int notificationPoolID;
+
+ MarkMessageAsReadRequestModel({this.notificationPoolID});
+
+ MarkMessageAsReadRequestModel.fromJson(Map json) {
+ notificationPoolID = json['NotificationPoolID'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['NotificationPoolID'] = this.notificationPoolID;
+ return data;
+ }
+}
diff --git a/lib/core/model/pharmacies/Addresses.dart b/lib/core/model/pharmacies/Addresses.dart
new file mode 100644
index 00000000..74d5a591
--- /dev/null
+++ b/lib/core/model/pharmacies/Addresses.dart
@@ -0,0 +1,85 @@
+class Addresses {
+ String id;
+ String firstName;
+ String lastName;
+ String email;
+ String company;
+ int countryId;
+ String country;
+ String stateProvinceId;
+ String city;
+ String address1;
+ String address2;
+ String zipPostalCode;
+ String phoneNumber;
+ String faxNumber;
+ String customerAttributes;
+ String createdOnUtc;
+ String province;
+ String latLong;
+
+ Addresses(
+ {this.id,
+ this.firstName,
+ this.lastName,
+ this.email,
+ this.company,
+ this.countryId,
+ this.country,
+ this.stateProvinceId,
+ this.city,
+ this.address1,
+ this.address2,
+ this.zipPostalCode,
+ this.phoneNumber,
+ this.faxNumber,
+ this.customerAttributes,
+ this.createdOnUtc,
+ this.province,
+ this.latLong});
+
+ Addresses.fromJson(Map json) {
+ id = json['id'];
+ firstName = json['first_name'];
+ lastName = json['last_name'];
+ email = json['email'];
+ company = json['company'];
+ countryId = json['country_id'];
+ country = json['country'];
+ stateProvinceId = json['state_province_id'];
+ city = json['city'];
+ address1 = json['address1'];
+ address2 = json['address2'];
+ zipPostalCode = json['zip_postal_code'];
+ phoneNumber = json['phone_number'];
+ faxNumber = json['fax_number'];
+ customerAttributes = json['customer_attributes'];
+ createdOnUtc = json['created_on_utc'];
+ province = json['province'];
+ latLong = json['lat_long'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['id'] = this.id;
+ data['first_name'] = this.firstName;
+ data['last_name'] = this.lastName;
+ data['email'] = this.email;
+ data['company'] = this.company;
+ data['country_id'] = this.countryId;
+ data['country'] = this.country;
+ data['state_province_id'] = this.stateProvinceId;
+ data['city'] = this.city;
+ data['address1'] = this.address1;
+ data['address2'] = this.address2;
+ data['zip_postal_code'] = this.zipPostalCode;
+ data['phone_number'] = this.phoneNumber;
+ data['fax_number'] = this.faxNumber;
+ data['customer_attributes'] = this.customerAttributes;
+ data['created_on_utc'] = this.createdOnUtc;
+ data['province'] = this.province;
+ data['lat_long'] = this.latLong;
+ return data;
+ }
+
+}
diff --git a/lib/core/model/pharmacies/Customer.dart b/lib/core/model/pharmacies/Customer.dart
new file mode 100644
index 00000000..a5311489
--- /dev/null
+++ b/lib/core/model/pharmacies/Customer.dart
@@ -0,0 +1,128 @@
+class Customer {
+ String fileNumber;
+ String iqamaNumber;
+ int isOutSa;
+ int patientType;
+ String gender;
+ String birthDate;
+ String phone;
+ String countryCode;
+ String yahalaAccountno;
+ String billingAddress;
+ String shippingAddress;
+ String id;
+ String username;
+ String email;
+ String firstName;
+ String lastName;
+ String languageId;
+ String adminComment;
+ String isTaxExempt;
+ String hasShoppingCartItems;
+ String active;
+ String deleted;
+ String isSystemAccount;
+ String systemName;
+ String lastIpAddress;
+ String createdOnUtc;
+ String lastLoginDateUtc;
+ String lastActivityDateUtc;
+ String registeredInStoreId;
+
+ Customer(
+ {this.fileNumber,
+ this.iqamaNumber,
+ this.isOutSa,
+ this.patientType,
+ this.gender,
+ this.birthDate,
+ this.phone,
+ this.countryCode,
+ this.yahalaAccountno,
+ this.billingAddress,
+ this.shippingAddress,
+ this.id,
+ this.username,
+ this.email,
+ this.firstName,
+ this.lastName,
+ this.languageId,
+ this.adminComment,
+ this.isTaxExempt,
+ this.hasShoppingCartItems,
+ this.active,
+ this.deleted,
+ this.isSystemAccount,
+ this.systemName,
+ this.lastIpAddress,
+ this.createdOnUtc,
+ this.lastLoginDateUtc,
+ this.lastActivityDateUtc,
+ this.registeredInStoreId});
+
+ Customer.fromJson(Map json) {
+ fileNumber = json['file_number'];
+ iqamaNumber = json['iqama_number'];
+ isOutSa = json['is_out_sa'];
+ patientType = json['patient_type'];
+ gender = json['gender'];
+ birthDate = json['birth_date'];
+ phone = json['phone'];
+ countryCode = json['country_code'];
+ yahalaAccountno = json['yahala_accountno'];
+ billingAddress = json['billing_address'];
+ shippingAddress = json['shipping_address'];
+ id = json['id'];
+ username = json['username'];
+ email = json['email'];
+ firstName = json['first_name'];
+ lastName = json['last_name'];
+ languageId = json['language_id'];
+ adminComment = json['admin_comment'];
+ isTaxExempt = json['is_tax_exempt'];
+ hasShoppingCartItems = json['has_shopping_cart_items'];
+ active = json['active'];
+ deleted = json['deleted'];
+ isSystemAccount = json['is_system_account'];
+ systemName = json['system_name'];
+ lastIpAddress = json['last_ip_address'];
+ createdOnUtc = json['created_on_utc'];
+ lastLoginDateUtc = json['last_login_date_utc'];
+ lastActivityDateUtc = json['last_activity_date_utc'];
+ registeredInStoreId = json['registered_in_store_id'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['file_number'] = this.fileNumber;
+ data['iqama_number'] = this.iqamaNumber;
+ data['is_out_sa'] = this.isOutSa;
+ data['patient_type'] = this.patientType;
+ data['gender'] = this.gender;
+ data['birth_date'] = this.birthDate;
+ data['phone'] = this.phone;
+ data['country_code'] = this.countryCode;
+ data['yahala_accountno'] = this.yahalaAccountno;
+ data['billing_address'] = this.billingAddress;
+ data['shipping_address'] = this.shippingAddress;
+ data['id'] = this.id;
+ data['username'] = this.username;
+ data['email'] = this.email;
+ data['first_name'] = this.firstName;
+ data['last_name'] = this.lastName;
+ data['language_id'] = this.languageId;
+ data['admin_comment'] = this.adminComment;
+ data['is_tax_exempt'] = this.isTaxExempt;
+ data['has_shopping_cart_items'] = this.hasShoppingCartItems;
+ data['active'] = this.active;
+ data['deleted'] = this.deleted;
+ data['is_system_account'] = this.isSystemAccount;
+ data['system_name'] = this.systemName;
+ data['last_ip_address'] = this.lastIpAddress;
+ data['created_on_utc'] = this.createdOnUtc;
+ data['last_login_date_utc'] = this.lastLoginDateUtc;
+ data['last_activity_date_utc'] = this.lastActivityDateUtc;
+ data['registered_in_store_id'] = this.registeredInStoreId;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/pharmacies/Manufacturer.dart b/lib/core/model/pharmacies/Manufacturer.dart
new file mode 100644
index 00000000..3b16337b
--- /dev/null
+++ b/lib/core/model/pharmacies/Manufacturer.dart
@@ -0,0 +1,98 @@
+import 'PharmacyImageObject.dart';
+
+class Manufacturer {
+ String id;
+ String name;
+ String namen;
+ // List localizedNames;
+ String description;
+ int manufacturerTemplateId;
+ String metaKeywords;
+ String metaDescription;
+ String metaTitle;
+ int pageSize;
+ String pageSizeOptions;
+ String priceRanges;
+ bool published;
+ bool deleted;
+ int displayOrder;
+ String createdOnUtc;
+ String updatedOnUtc;
+ PharmacyImageObject image;
+
+ Manufacturer(
+ {this.id,
+ this.name,
+ this.namen,
+ // this.localizedNames,
+ this.description,
+ this.manufacturerTemplateId,
+ this.metaKeywords,
+ this.metaDescription,
+ this.metaTitle,
+ this.pageSize,
+ this.pageSizeOptions,
+ this.priceRanges,
+ this.published,
+ this.deleted,
+ this.displayOrder,
+ this.createdOnUtc,
+ this.updatedOnUtc,
+ this.image});
+
+ Manufacturer.fromJson(Map json) {
+ id = json['id'];
+ name = json['name'];
+ namen = json['namen'];
+ // if (json['localized_names'] != null) {
+ // localizedNames = new List();
+ // json['localized_names'].forEach((v) {
+ // localizedNames.add(new LocalizedNames.fromJson(v));
+ // });
+ // }
+ description = json['description'];
+ manufacturerTemplateId = json['manufacturer_template_id'];
+ metaKeywords = json['meta_keywords'];
+ metaDescription = json['meta_description'];
+ metaTitle = json['meta_title'];
+ pageSize = json['page_size'];
+ pageSizeOptions = json['page_size_options'];
+ priceRanges = json['price_ranges'];
+ published = json['published'];
+ deleted = json['deleted'];
+ displayOrder = json['display_order'];
+ createdOnUtc = json['created_on_utc'];
+ updatedOnUtc = json['updated_on_utc'];
+ image = json['image'] != null
+ ? new PharmacyImageObject.fromJson(json['image'])
+ : null;
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['id'] = this.id;
+ data['name'] = this.name;
+ data['namen'] = this.namen;
+ // if (this.localizedNames != null) {
+ // data['localized_names'] =
+ // this.localizedNames.map((v) => v.toJson()).toList();
+ // }
+ data['description'] = this.description;
+ data['manufacturer_template_id'] = this.manufacturerTemplateId;
+ data['meta_keywords'] = this.metaKeywords;
+ data['meta_description'] = this.metaDescription;
+ data['meta_title'] = this.metaTitle;
+ data['page_size'] = this.pageSize;
+ data['page_size_options'] = this.pageSizeOptions;
+ data['price_ranges'] = this.priceRanges;
+ data['published'] = this.published;
+ data['deleted'] = this.deleted;
+ data['display_order'] = this.displayOrder;
+ data['created_on_utc'] = this.createdOnUtc;
+ data['updated_on_utc'] = this.updatedOnUtc;
+ if (this.image != null) {
+ data['image'] = this.image.toJson();
+ }
+ return data;
+ }
+}
diff --git a/lib/core/model/pharmacies/PharmacyImageObject.dart b/lib/core/model/pharmacies/PharmacyImageObject.dart
new file mode 100644
index 00000000..d3db634b
--- /dev/null
+++ b/lib/core/model/pharmacies/PharmacyImageObject.dart
@@ -0,0 +1,27 @@
+class PharmacyImageObject {
+ int id;
+ int position;
+ String src;
+ String thumb;
+ String attachment;
+
+ PharmacyImageObject({this.id, this.position, this.src, this.thumb, this.attachment});
+
+ PharmacyImageObject.fromJson(Map json) {
+ id = json['id'];
+ position = json['position'];
+ src = json['src'];
+ thumb = json['thumb'];
+ attachment = json['attachment'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['id'] = this.id;
+ data['position'] = this.position;
+ data['src'] = this.src;
+ data['thumb'] = this.thumb;
+ data['attachment'] = this.attachment;
+ return data;
+ }
+}
diff --git a/lib/core/model/pharmacies/PharmacyProduct.dart b/lib/core/model/pharmacies/PharmacyProduct.dart
new file mode 100644
index 00000000..cd461ae5
--- /dev/null
+++ b/lib/core/model/pharmacies/PharmacyProduct.dart
@@ -0,0 +1,149 @@
+import 'PharmacyImageObject.dart';
+import 'Reviews.dart';
+
+class PharmacyProduct {
+ String id;
+ String name;
+ String namen;
+ String shortDescription;
+ String fullDescription;
+ String fullDescriptionn;
+ int approvedRatingSum;
+ int approvedTotalReviews;
+ String sku;
+ bool isRx;
+ String rxMessage;
+ String rxMessagen;
+ int stockQuantity;
+ String stockAvailability;
+ String stockAvailabilityn;
+ bool allowBackInStockSubscriptions;
+ int orderMinimumQuantity;
+ int orderMaximumQuantity;
+ double price;
+ double oldPrice;
+ String discountName;
+ String discountNamen;
+ String discountPercentage;
+ int displayOrder;
+ List discountIds;
+ List reviews;
+ List images;
+
+ PharmacyProduct(
+ {this.id,
+ this.name,
+ this.namen,
+ this.shortDescription,
+ this.fullDescription,
+ this.fullDescriptionn,
+ this.approvedRatingSum,
+ this.approvedTotalReviews,
+ this.sku,
+ this.isRx,
+ this.rxMessage,
+ this.rxMessagen,
+ this.stockQuantity,
+ this.stockAvailability,
+ this.stockAvailabilityn,
+ this.allowBackInStockSubscriptions,
+ this.orderMinimumQuantity,
+ this.orderMaximumQuantity,
+ this.price,
+ this.oldPrice,
+ this.discountName,
+ this.discountNamen,
+ this.discountPercentage,
+ this.displayOrder,
+ this.discountIds,
+ this.reviews,
+ this.images});
+
+ PharmacyProduct.fromJson(Map json) {
+ try {
+ id = json['id'];
+ name = json['name'];
+ namen = json['namen'];
+ shortDescription = json['short_description'];
+ fullDescription = json['full_description'];
+ fullDescriptionn = json['full_descriptionn'];
+ approvedRatingSum = json['approved_rating_sum'];
+ approvedTotalReviews = json['approved_total_reviews'];
+ sku = json['sku'];
+ isRx = json['is_rx'];
+ rxMessage = json['rx_message'];
+ rxMessagen = json['rx_messagen'];
+ stockQuantity = json['stock_quantity'];
+ stockAvailability = json['stock_availability'];
+ stockAvailabilityn = json['stock_availabilityn'];
+ allowBackInStockSubscriptions = json['allow_back_in_stock_subscriptions'];
+ orderMinimumQuantity = json['order_minimum_quantity'];
+ orderMaximumQuantity = json['order_maximum_quantity'];
+ price = json['price'];
+ oldPrice = json['old_price'];
+ discountName = json['discount_name'];
+ discountNamen = json['discount_namen'];
+ discountPercentage = json['discount_percentage'];
+ displayOrder = json['display_order'];
+ if (json['discount_ids'] != null) {
+ discountIds = new List();
+ json['discount_ids'].forEach((v) {
+ discountIds.add(v);
+ });
+ }
+ if (json['reviews'] != null) {
+ reviews = new List();
+ json['reviews'].forEach((v) {
+ reviews.add(new Reviews.fromJson(v));
+ });
+ }
+ if (json['images'] != null) {
+ images = new List();
+ json['images'].forEach((v) {
+ images.add(new PharmacyImageObject.fromJson(v));
+ });
+ }
+ } catch (e) {
+ print(e);
+ }
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['id'] = this.id;
+ data['name'] = this.name;
+ data['namen'] = this.namen;
+ data['short_description'] = this.shortDescription;
+ data['full_description'] = this.fullDescription;
+ data['full_descriptionn'] = this.fullDescriptionn;
+ data['approved_rating_sum'] = this.approvedRatingSum;
+ data['approved_total_reviews'] = this.approvedTotalReviews;
+ data['sku'] = this.sku;
+ data['is_rx'] = this.isRx;
+ data['rx_message'] = this.rxMessage;
+ data['rx_messagen'] = this.rxMessagen;
+ data['stock_quantity'] = this.stockQuantity;
+ data['stock_availability'] = this.stockAvailability;
+ data['stock_availabilityn'] = this.stockAvailabilityn;
+ data['allow_back_in_stock_subscriptions'] =
+ this.allowBackInStockSubscriptions;
+ data['order_minimum_quantity'] = this.orderMinimumQuantity;
+ data['order_maximum_quantity'] = this.orderMaximumQuantity;
+ data['price'] = this.price;
+ data['old_price'] = this.oldPrice;
+ data['discount_name'] = this.discountName;
+ data['discount_namen'] = this.discountNamen;
+ data['discount_percentage'] = this.discountPercentage;
+ data['display_order'] = this.displayOrder;
+ if (this.discountIds != String) {
+ data['discount_ids'] = this.discountIds.map((v) => v).toList();
+ }
+ if (this.reviews != String) {
+ data['reviews'] = this.reviews.map((v) => v.toJson()).toList();
+ }
+ if (this.images != String) {
+ data['images'] = this.images.map((v) => v.toJson()).toList();
+ }
+ return data;
+ }
+}
diff --git a/lib/core/model/pharmacies/Reviews.dart b/lib/core/model/pharmacies/Reviews.dart
new file mode 100644
index 00000000..f924dce3
--- /dev/null
+++ b/lib/core/model/pharmacies/Reviews.dart
@@ -0,0 +1,82 @@
+import '../pharmacies/Customer.dart';
+
+class Reviews {
+ int id;
+ int position;
+ int reviewId;
+ int customerId;
+ int productId;
+ int storeId;
+ bool isApproved;
+ String title;
+ String reviewText;
+ Null replyText;
+ int rating;
+ int helpfulYesTotal;
+ int helpfulNoTotal;
+ String createdOnUtc;
+ Customer customer;
+ Null product;
+
+ Reviews(
+ {this.id,
+ this.position,
+ this.reviewId,
+ this.customerId,
+ this.productId,
+ this.storeId,
+ this.isApproved,
+ this.title,
+ this.reviewText,
+ this.replyText,
+ this.rating,
+ this.helpfulYesTotal,
+ this.helpfulNoTotal,
+ this.createdOnUtc,
+ this.customer,
+ this.product});
+
+ Reviews.fromJson(Map json) {
+ id = json['id'];
+ position = json['position'];
+ reviewId = json['review_id'];
+ customerId = json['customer_id'];
+ productId = json['product_id'];
+ storeId = json['store_id'];
+ isApproved = json['is_approved'];
+ title = json['title'];
+ reviewText = json['review_text'];
+ replyText = json['reply_text'];
+ rating = json['rating'];
+ helpfulYesTotal = json['helpful_yes_total'];
+ helpfulNoTotal = json['helpful_no_total'];
+ createdOnUtc = json['created_on_utc'];
+ customer = json['customer'] != null
+ ? new Customer.fromJson(json['customer'])
+ : null;
+ product = json['product'];
+ }
+
+ Map toJson() {
+ final Map data = new Map();
+ data['id'] = this.id;
+ data['position'] = this.position;
+ data['review_id'] = this.reviewId;
+ data['customer_id'] = this.customerId;
+ data['product_id'] = this.productId;
+ data['store_id'] = this.storeId;
+ data['is_approved'] = this.isApproved;
+ data['title'] = this.title;
+ data['review_text'] = this.reviewText;
+ data['reply_text'] = this.replyText;
+ data['rating'] = this.rating;
+ data['helpful_yes_total'] = this.helpfulYesTotal;
+ data['helpful_no_total'] = this.helpfulNoTotal;
+ data['created_on_utc'] = this.createdOnUtc;
+ if (this.customer != null) {
+ data['customer'] = this.customer.toJson();
+ }
+ data['product'] = this.product;
+ return data;
+ }
+}
\ No newline at end of file
diff --git a/lib/core/model/prescriptions/perscription_pharmacy.dart b/lib/core/model/prescriptions/perscription_pharmacy.dart
index 5180689f..3adaef7e 100644
--- a/lib/core/model/prescriptions/perscription_pharmacy.dart
+++ b/lib/core/model/prescriptions/perscription_pharmacy.dart
@@ -1,6 +1,6 @@
class PharmacyPrescriptions {
String expiryDate;
- double sellingPrice;
+ dynamic sellingPrice;
int quantity;
int itemID;
int locationID;
diff --git a/lib/core/model/prescriptions/request_prescription_report.dart b/lib/core/model/prescriptions/request_prescription_report.dart
index c8323740..df901a99 100644
--- a/lib/core/model/prescriptions/request_prescription_report.dart
+++ b/lib/core/model/prescriptions/request_prescription_report.dart
@@ -82,7 +82,7 @@ class RequestPrescriptionReport {
data['EpisodeID'] = this.episodeID;
data['ClinicID'] = this.clinicID;
data['ProjectID'] = this.projectID;
- data['DischargeNo'] = this.dischargeNo;
+ // data['DischargeNo'] = this.dischargeNo;
return data;
}
}
diff --git a/lib/core/model/prescriptions/request_prescription_report_enh.dart b/lib/core/model/prescriptions/request_prescription_report_enh.dart
index 42b89c15..4905fc2a 100644
--- a/lib/core/model/prescriptions/request_prescription_report_enh.dart
+++ b/lib/core/model/prescriptions/request_prescription_report_enh.dart
@@ -14,6 +14,7 @@ class RequestPrescriptionReportEnh {
int patientType;
int appointmentNo;
String setupID;
+ int dischargeNo;
int episodeID;
int clinicID;
int projectID;
@@ -36,7 +37,7 @@ class RequestPrescriptionReportEnh {
this.setupID,
this.episodeID,
this.clinicID,
- this.projectID});
+ this.projectID,this.dischargeNo});
RequestPrescriptionReportEnh.fromJson(Map json) {
versionID = json['VersionID'];
@@ -79,6 +80,7 @@ class RequestPrescriptionReportEnh {
data['EpisodeID'] = this.episodeID;
data['ClinicID'] = this.clinicID;
data['ProjectID'] = this.projectID;
+ data['DischargeNo'] = this.dischargeNo;
return data;
}
}
diff --git a/lib/core/model/rate/appointment_details.dart b/lib/core/model/rate/appointment_details.dart
index 30280b4a..77d759db 100644
--- a/lib/core/model/rate/appointment_details.dart
+++ b/lib/core/model/rate/appointment_details.dart
@@ -5,13 +5,13 @@ class AppointmentDetails {
int appointmentNo;
int clinicID;
int doctorID;
- String startTime;
- String endTime;
- String appointmentDate;
- String clinicName;
- String doctorImageURL;
- String doctorName;
- String projectName;
+ dynamic startTime;
+ dynamic endTime;
+ dynamic appointmentDate;
+ dynamic clinicName;
+ dynamic doctorImageURL;
+ dynamic doctorName;
+ dynamic projectName;
AppointmentDetails(
{this.setupID,
diff --git a/lib/core/service/AuthenticatedUserObject.dart b/lib/core/service/AuthenticatedUserObject.dart
index 600e17e1..f48b1179 100644
--- a/lib/core/service/AuthenticatedUserObject.dart
+++ b/lib/core/service/AuthenticatedUserObject.dart
@@ -17,8 +17,8 @@ class AuthenticatedUserObject {
if (userData != null) user = AuthenticatedUser.fromJson(userData);
}
- var isLogin = await sharedPref.getString(LOGIN_TOKEN_ID);
- this.isLogin = isLogin != null;
+ // var isLogin = await sharedPref.getString(LOGIN_TOKEN_ID);
+ this.isLogin = user != null;
}
logout() async {
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index d2bfa4fa..af8058b9 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -2,12 +2,17 @@ import 'dart:convert';
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http;
+import 'package:provider/provider.dart';
+import '../../../locator.dart';
import '../../../routes.dart';
+import '../AuthenticatedUserObject.dart';
AppSharedPreferences sharedPref = new AppSharedPreferences();
@@ -16,6 +21,10 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
/// onSuccess: (dynamic response, int statusCode) {},
/// onFailure: (String error, int statusCode) {},
/// body: Map();
+///
+AuthenticatedUserObject authenticatedUserObject =
+ locator();
+VitalSignService _vitalSignService = locator();
class BaseAppClient {
post(String endPoint,
@@ -28,7 +37,7 @@ class BaseAppClient {
//Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN);
var languageID =
- await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'en');
+ await sharedPref.getString(APP_LANGUAGE);
var user = await sharedPref.getObject(USER_PROFILE);
if (body.containsKey('SetupID')) {
body['SetupID'] = body.containsKey('SetupID')
@@ -39,7 +48,16 @@ class BaseAppClient {
}
body['VersionID'] = VERSION_ID;
body['Channel'] = CHANNEL;
- body['LanguageID'] = languageID == 'ar' ? 1 : 2;
+ body['LanguageID'] = body.containsKey('LanguageID')
+ ? body['LanguageID'] != null
+ ? body['LanguageID']
+ : languageID == 'ar'
+ ? 1
+ : 2
+ : languageID == 'ar'
+ ? 1
+ : 2;
+
body['IPAdress'] = IP_ADDRESS;
body['generalid'] = GENERAL_ID;
body['PatientOutSA'] = body.containsKey('PatientOutSA')
@@ -63,21 +81,24 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null
? body['PatientType']
- : PATIENT_TYPE
+ : user['PatientType'] != null
+ ? user['PatientType']
+ : PATIENT_TYPE
: PATIENT_TYPE;
body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null
? body['PatientTypeID']
- : PATIENT_TYPE_ID
+ :user['PatientType'] != null
+ ? user['PatientType']
+ : PATIENT_TYPE_ID
: PATIENT_TYPE_ID;
-
if (user != null) {
body['TokenID'] = token;
body['PatientID'] =
body['PatientID'] != null ? body['PatientID'] : user['PatientID'];
body['PatientOutSA'] = user['OutSA'];
- body['SessionID'] = SESSION_ID;//getSessionId(token);
+ body['SessionID'] = SESSION_ID; //getSessionId(token);
}
}
@@ -114,11 +135,14 @@ class BaseAppClient {
onFailure(
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
- logout();
}
} else if (parsed['MessageStatus'] == 1 ||
parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode);
+ } else if (!parsed['IsAuthenticated']) {
+ await logout();
+
+ //helpers.showErrorToast('Your session expired Please login agian');
} else {
if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode);
@@ -139,9 +163,44 @@ class BaseAppClient {
}
}
+ get(String endPoint,
+ {Function(dynamic response, int statusCode) onSuccess,
+ Function(String error, int statusCode) onFailure,
+ Map queryParams}) async {
+ String url = BASE_URL + endPoint;
+ if (queryParams != null) {
+ String queryString = Uri(queryParameters: queryParams).query;
+ url += '?' + queryString;
+ }
+
+ print("URL : $url");
+
+ if (await Utils.checkConnection()) {
+ final response = await http.get(url.trim(), headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json'
+ },);
+ final int statusCode = response.statusCode;
+ print("statusCode :$statusCode");
+
+ if (statusCode < 200 || statusCode >= 400 || json == null) {
+ onFailure('Error While Fetching data', statusCode);
+ } else {
+ var parsed = json.decode(response.body.toString());
+ onSuccess(parsed, statusCode);
+ }
+ } else {
+ onFailure('Please Check The Internet Connection', -1);
+ }
+ }
+
logout() async {
await sharedPref.remove(LOGIN_TOKEN_ID);
- Navigator.of(AppGlobal.context).pushReplacementNamed(LOGIN_TYPE);
+ await authenticatedUserObject.getUser();
+ Provider.of(AppGlobal.context, listen: false).isLogin = false;
+ _vitalSignService.weightKg ="";
+ _vitalSignService.heightCm="";
+ Navigator.of(AppGlobal.context).pushReplacementNamed(HOME);
}
String getSessionId(String id) {
diff --git a/lib/core/service/feedback/feedback_service.dart b/lib/core/service/feedback/feedback_service.dart
index 74107585..9df5b0a6 100644
--- a/lib/core/service/feedback/feedback_service.dart
+++ b/lib/core/service/feedback/feedback_service.dart
@@ -1,5 +1,4 @@
import 'dart:io';
-
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/feedback/COC_items.dart';
@@ -45,8 +44,7 @@ class FeedbackService extends BaseService {
if (appointHistory != null) {
body['AppoinmentNo'] = appointHistory.appointmentNo;
- body['AppointmentDate'] =
- DateUtil.convertDateToString(appointHistory.appointmentDate);
+ body['AppointmentDate'] = DateUtil.convertDateToString(appointHistory.appointmentDate);
body['ClinicID'] = appointHistory.clinicID;
body['ClinicName'] = appointHistory.clinicName;
body['DoctorID'] = appointHistory.doctorID;
diff --git a/lib/core/service/insurance_service.dart b/lib/core/service/insurance_service.dart
index 7fee6615..790003e9 100644
--- a/lib/core/service/insurance_service.dart
+++ b/lib/core/service/insurance_service.dart
@@ -31,48 +31,9 @@ class InsuranceCardService extends BaseService {
_cardUpdated.clear();
}
- InsuranceCardModel _insuranceCardModel = InsuranceCardModel(
- channel: 3,
- deviceTypeID: 2,
- generalid: "Cs2020@2016\$2958",
- iPAdress: "10.20.10.20",
- isDentalAllowedBackend: false,
- languageID: 1,
- patientID: 1231755,
- patientOutSA: 0,
- patientType: 1,
- patientTypeID: 1,
- sessionID: "uoKFXSLUwEaHYPwKZNA",
- tokenID: "@dm!n",
- versionID: 5.5,
- );
-
- InsuranceUpdateModel _insuranceUpdateModel = InsuranceUpdateModel(
- channel: 3,
- deviceTypeID: 2,
- generalid: "Cs2020@2016\$2958",
- iPAdress: "10.20.10.20",
- isDentalAllowedBackend: false,
- patientID: 1231755,
- patientType: 1,
- versionID: 5.5,
- languageID: 2,
- patientOutSA: 0,
- sessionID: "ENRSJBKXnzCuuVQ",
- );
InsuranceApprovalModel _insuranceApprovalModel = InsuranceApprovalModel(
- versionID: 5.5,
- channel: 3,
- languageID: LANGUAGE_ID,
- iPAdress: "10.20.10.20",
- generalid: "Cs2020@2016\$2958",
- patientOutSA: 0,
- sessionID: "DypNmtMkivzURHjeYg",
isDentalAllowedBackend: false,
- deviceTypeID: 2,
- patientID: 1231755,
- tokenID: "@dm!n",
patientTypeID: 1,
patientType: 1,
eXuldAPPNO: 0,
@@ -89,21 +50,22 @@ class InsuranceCardService extends BaseService {
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
- }, body: _insuranceCardModel.toJson());
+ }, body: Map());
}
Future getInsuranceUpdate() async {
hasError = false;
- // _cardList.clear();
+ _cardList.clear();
await baseAppClient.post(GET_PAtIENTS_INSURANCE_UPDATED,
onSuccess: (dynamic response, int statusCode) {
+ _cardUpdated.clear();
response['List_PatientInsuranceCardHistory'].forEach((item) {
_cardUpdated.add(InsuranceUpdateModel.fromJson(item));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
- }, body: _insuranceUpdateModel.toJson());
+ }, body: Map());
}
Future getInsuranceApproval({int appointmentNo}) async {
@@ -163,4 +125,15 @@ class InsuranceCardService extends BaseService {
throw error;
}
}
+ Future getInsuranceDetails(data) async{
+ dynamic localRes;
+ await baseAppClient.post(INSURANCE_DETAILS,
+ onSuccess: (dynamic response, int statusCode) {
+ localRes = response['List_InsuranceCheckList'];
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body:{'CompanyID': data.companyID,'SubCategoryID':data.subCategoryID },);
+ return Future.value(localRes);
+ }
}
diff --git a/lib/core/service/medical/BloodPressureService.dart b/lib/core/service/medical/BloodPressureService.dart
index 048c98e9..f2681191 100644
--- a/lib/core/service/medical/BloodPressureService.dart
+++ b/lib/core/service/medical/BloodPressureService.dart
@@ -3,10 +3,6 @@ import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/BloodPr
import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/MonthBloodPressureResultAverage.dart';
import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/WeekBloodPressureResultAverage.dart';
import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/YearBloodPressureResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/MonthDiabtectResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/WeekDiabtectResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/YearDiabtecResultAverage.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
class BloodPressureService extends BaseService {
diff --git a/lib/core/service/medical/WeightPressureService.dart b/lib/core/service/medical/WeightPressureService.dart
index 006de821..27048dc8 100644
--- a/lib/core/service/medical/WeightPressureService.dart
+++ b/lib/core/service/medical/WeightPressureService.dart
@@ -1,12 +1,4 @@
import 'package:diplomaticquarterapp/config/config.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/BloodPressureResult.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/MonthBloodPressureResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/WeekBloodPressureResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_pressur/YearBloodPressureResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/DiabtecPatientResult.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/MonthDiabtectResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/WeekDiabtectResultAverage.dart';
-import 'package:diplomaticquarterapp/core/model/my_trakers/blood_sugar/YearDiabtecResultAverage.dart';
import 'package:diplomaticquarterapp/core/model/my_trakers/weight/MonthWeightMeasurementResultAverage.dart';
import 'package:diplomaticquarterapp/core/model/my_trakers/weight/WeekWeightMeasurementResultAverage.dart';
import 'package:diplomaticquarterapp/core/model/my_trakers/weight/WeightMeasurementResult.dart';
diff --git a/lib/core/service/medical/labs_service.dart b/lib/core/service/medical/labs_service.dart
index c1ad65f3..b9b9a16c 100644
--- a/lib/core/service/medical/labs_service.dart
+++ b/lib/core/service/medical/labs_service.dart
@@ -9,10 +9,12 @@ import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
class LabsService extends BaseService {
- RequestPatientLabOrders _requestPatientLabOrders = RequestPatientLabOrders();
List patientLabOrdersList = List();
Future getPatientLabOrdersList() async {
+ hasError = false;
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_Patient_LAB_ORDERS,
onSuccess: (dynamic response, int statusCode) {
patientLabOrdersList.clear();
@@ -22,7 +24,7 @@ class LabsService extends BaseService {
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
- }, body: _requestPatientLabOrders.toJson());
+ }, body: body);
}
RequestPatientLabSpecialResult _requestPatientLabSpecialResult =
@@ -39,7 +41,7 @@ class LabsService extends BaseService {
hasError = false;
_requestPatientLabSpecialResult.projectID = projectID;
_requestPatientLabSpecialResult.clinicID = clinicID;
- _requestPatientLabSpecialResult.invoiceNo = invoiceNo; //'1800296522';//;
+ _requestPatientLabSpecialResult.invoiceNo = invoiceNo;
_requestPatientLabSpecialResult.orderNo = orderNo;
await baseAppClient.post(GET_Patient_LAB_SPECIAL_RESULT,
@@ -59,10 +61,10 @@ class LabsService extends BaseService {
Map body = Map();
body['InvoiceNo'] = patientLabOrder.invoiceNo;
body['OrderNo'] = patientLabOrder.orderNo;
- body['Procedure'] = "U/A";
+ body['isDentalAllowedBackend'] = false;
+ body['SetupID'] = patientLabOrder.setupID;
body['ProjectID'] = patientLabOrder.projectID;
body['ClinicID'] = patientLabOrder.clinicID;
- //TODO Check the res
await baseAppClient.post(GET_Patient_LAB_RESULT,
onSuccess: (dynamic response, int statusCode) {
patientLabSpecialResult.clear();
diff --git a/lib/core/service/medical/my_balance_service.dart b/lib/core/service/medical/my_balance_service.dart
index 27d5d602..e3be9bcf 100644
--- a/lib/core/service/medical/my_balance_service.dart
+++ b/lib/core/service/medical/my_balance_service.dart
@@ -1,11 +1,12 @@
-import 'dart:convert';
-
import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_advance_balance_amount.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info_and_mobile_number.dart';
+import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
+import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordsByStatusReq.dart';
import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
@@ -21,6 +22,9 @@ class MyBalanceService extends BaseService {
String logInTokenID;
String verificationCode;
+ AuthenticatedUserObject authenticatedUserObject =
+ locator();
+
getPatientAdvanceBalanceAmount() async {
hasError = false;
super.error = "";
@@ -56,13 +60,14 @@ class MyBalanceService extends BaseService {
}, body: body);
}
- getPatientInfoByPatientIDAndMobileNumber() async {
+ getPatientInfoByPatientIDAndMobileNumber(AdvanceModel advanceModel) async {
hasError = false;
super.error = "";
Map body = Map();
body['isDentalAllowedBackend'] = false;
- body['MobileNo'] = user.mobileNumber;
- body['ProjectID'] = user.projectID;
+ body['MobileNo'] = advanceModel.mobileNumber;
+ body['ProjectID'] = advanceModel.hospitalsModel.iD;
+ body['PatientID'] = advanceModel.fileNumber;
await baseAppClient.post(GET_PATIENT_INFO_BY_ID_AND_MOBILE_NUMBER,
onSuccess: (response, statusCode) async {
@@ -76,7 +81,7 @@ class MyBalanceService extends BaseService {
}, body: body);
}
- sendActivationCodeForAdvancePayment({int patientID,int projectID}) async {
+ sendActivationCodeForAdvancePayment({int patientID, int projectID}) async {
hasError = false;
super.error = "";
Map body = Map();
@@ -106,9 +111,8 @@ class MyBalanceService extends BaseService {
body['LogInTokenID'] = logInTokenID;
await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_ADVANCE_PAYMENT,
- onSuccess: (response, statusCode) async {
-
- }, onFailure: (String error, int statusCode) {
+ onSuccess: (response, statusCode) async {},
+ onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
super.error = error;
@@ -143,7 +147,7 @@ class MyBalanceService extends BaseService {
await sharedPref.getObject(FAMILY_FILE));
return getAllSharedRecordsByStatusResponse;
} else {
- return getSharedRecordByStatus();
+ return await getSharedRecordByStatus();
}
}
}
diff --git a/lib/core/service/medical/my_doctor_service.dart b/lib/core/service/medical/my_doctor_service.dart
index f2ba067a..3d9e14b7 100644
--- a/lib/core/service/medical/my_doctor_service.dart
+++ b/lib/core/service/medical/my_doctor_service.dart
@@ -22,12 +22,6 @@ class MyDoctorService extends BaseService {
channel: 3,
deviceTypeID: 2,
doctorID: 2477,
- iPAdress: '10.20.10.20',
- languageID: 2,
- patientOutSA: 0,
- sessionID: 'CvsUFeJkyLDnFQqw',
- versionID: 5.5,
- generalid: 'Cs2020@2016\$2958',
isDentalAllowedBackend: false);
Future getPatientDoctorAppointmentList({int top = 0, int beforeDays = 0,int exludType=4}) async {
@@ -52,18 +46,6 @@ class MyDoctorService extends BaseService {
RequestDoctorProfile _requestDoctorProfile = RequestDoctorProfile(
license: true,
isRegistered: true,
- projectID: 12,
- clinicID: 501,
- patientID: 1231755,
- versionID: 5.5,
- channel: 3,
- languageID: 2,
- iPAdress: '10.20.10.20',
- generalid: 'Cs2020@2016\$2958',
- patientOutSA: 0,
- sessionID: 'nstatCtNEmuwxeuVAOUmw',
- isDentalAllowedBackend: false,
- deviceTypeID: 2,
);
Future getDoctorProfileAndRating(
@@ -87,7 +69,7 @@ class MyDoctorService extends BaseService {
}, body: _requestDoctorProfile.toJson());
///GET DOCTOR RATING
- //_requestDoctorRating.doctorID = doctorId;
+ _requestDoctorRating.doctorID = doctorId;
await baseAppClient.post(GET_DOCTOR_RATING,
onSuccess: (dynamic response, int statusCode) {
doctorRating = DoctorRating.fromJson(response['AvgDoctorRatingList'][0]);
diff --git a/lib/core/service/medical/prescriptions_service.dart b/lib/core/service/medical/prescriptions_service.dart
index 294ef897..d6ad3732 100644
--- a/lib/core/service/medical/prescriptions_service.dart
+++ b/lib/core/service/medical/prescriptions_service.dart
@@ -11,40 +11,17 @@ import 'package:diplomaticquarterapp/core/model/prescriptions/request_prescripti
import 'package:diplomaticquarterapp/core/model/prescriptions/request_prescriptions_orders.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/request_send_prescription_email.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart';
+import 'package:flutter/cupertino.dart';
class PrescriptionsService extends BaseService {
List prescriptionsList = List();
- RequestPrescriptions _requestPrescriptions = RequestPrescriptions(
- versionID: 5.5,
- channel: 3,
- languageID: 2,
- iPAdress: '10.20.10.20',
- generalid: 'Cs2020@2016\$2958',
- patientOutSA: 0,
- sessionID: 'KIbLoqkytuKJEWECHQ',
- isDentalAllowedBackend: false,
- deviceTypeID: 2,
- patientID: 1231755,
- tokenID: '@dm!n',
- patientTypeID: 1,
- patientType: 1);
List prescriptionsOrderList = List();
- RequestPrescriptionsOrders _requestPrescriptionsOrders =
- RequestPrescriptionsOrders(
- patientID: 1231755,
- patientOutSA: 0,
- versionID: 5.5,
- channel: 3,
- languageID: 1,
- iPAdress: '10.20.10.20',
- generalid: 'Cs2020@2016\$2958',
- sessionID: 'KIbLoqkytuKJEWECHQ',
- isDentalAllowedBackend: false,
- deviceTypeID: 2);
Future getPrescriptions() async {
hasError = false;
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
await baseAppClient.post(PRESCRIPTIONS,
onSuccess: (dynamic response, int statusCode) {
prescriptionsList.clear();
@@ -54,10 +31,12 @@ class PrescriptionsService extends BaseService {
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
- }, body: _requestPrescriptions.toJson());
+ }, body: body);
}
Future getPrescriptionsOrders() async {
+ Map body = Map();
+ body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_PRESCRIPTIONS_ALL_ORDERS,
onSuccess: (dynamic response, int statusCode) {
prescriptionsOrderList.clear();
@@ -69,41 +48,39 @@ class PrescriptionsService extends BaseService {
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
- }, body: _requestPrescriptionsOrders.toJson());
+ }, body: body);
}
RequestPrescriptionReport _requestPrescriptionReport =
RequestPrescriptionReport(
- appointmentNo: 0,
- channel: 3,
- clinicID: 4,
- deviceTypeID: 2,
- dischargeNo: 2018003246,
- episodeID: 0,
- iPAdress: '10.20.10.20',
- languageID: 1,
- patientID: 1231755,
- patientOutSA: 0,
- patientType: 1,
- patientTypeID: 1,
- projectID: 12,
- sessionID: 'wgKuHpsPsEuLnlJhAYCQ',
- tokenID: '@dm!n',
- setupID: "91877",
- versionID: 5.5,
- generalid: 'Cs2020@2016\$2958',
- isDentalAllowedBackend: false);
+ appointmentNo: 0, isDentalAllowedBackend: false);
List prescriptionReportList = List();
- Future getPrescriptionReport({int dischargeNo}) async {
+ Future getPrescriptionReport(
+ {Prescriptions prescriptions}) async {
hasError = false;
- _requestPrescriptionReport.dischargeNo = dischargeNo;
- await baseAppClient.post(GET_PRESCRIPTION_REPORT,
+ _requestPrescriptionReport.dischargeNo = prescriptions.dischargeNo;
+ _requestPrescriptionReport.projectID = prescriptions.projectID;
+ _requestPrescriptionReport.clinicID = prescriptions.clinicID;
+ _requestPrescriptionReport.setupID = prescriptions.setupID;
+ _requestPrescriptionReport.episodeID = prescriptions.episodeID;
+ _requestPrescriptionReport.appointmentNo = prescriptions.appointmentNo;
+
+ await baseAppClient.post(prescriptions.isInOutPatient? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT,
onSuccess: (dynamic response, int statusCode) {
prescriptionReportList.clear();
- response['INP_GetPrescriptionReport_List'].forEach((prescriptions) {
- prescriptionReportList.add(PrescriptionReport.fromJson(prescriptions));
- });
+ prescriptionReportEnhList.clear();
+ if(prescriptions.isInOutPatient){
+ response['ListPRM'].forEach((prescriptions) {
+ prescriptionReportEnhList.add(PrescriptionReportEnh.fromJson(prescriptions));
+ });
+ }else{
+ response['INP_GetPrescriptionReport_List'].forEach((prescriptions) {
+ prescriptionReportList.add(PrescriptionReport.fromJson(prescriptions));
+ });
+ }
+
+
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
@@ -112,24 +89,7 @@ class PrescriptionsService extends BaseService {
RequestSendPrescriptionEmail _requestSendPrescriptionEmail =
RequestSendPrescriptionEmail(
- versionID: 5.5,
- languageID: 2,
- channel: 3,
- iPAdress: '10.20.10.20',
- generalid: 'Cs2020@2016\$2958',
- patientOutSA: 0,
- sessionID: 'twIUmHfOHqFdDfVcyw',
- isDentalAllowedBackend: false,
- deviceTypeID: 2,
- tokenID: '@dm!n',
- patientTypeID: 1,
- patientType: 1,
- to: 'aljammalzmohammad@outlook.com',
- dateofBirth: '/Date(536743800000+0300)/',
- patientIditificationNum: '2344670985',
- patientMobileNumber: '537503378',
- patientName: 'TAMER FANASHEH',
- setupID: '91877');
+ isDentalAllowedBackend: false,);
Future sendPrescriptionEmail(String appointmentDate, int patientID,
String clinicName, String doctorName, int projectID) async {
@@ -139,28 +99,25 @@ class PrescriptionsService extends BaseService {
_requestSendPrescriptionEmail.clinicName = clinicName;
_requestSendPrescriptionEmail.doctorName = doctorName;
_requestSendPrescriptionEmail.projectID = projectID;
+ _requestSendPrescriptionEmail.to = user.emailAddress;
+ _requestSendPrescriptionEmail.dateofBirth = user.dateofBirth;
+ _requestSendPrescriptionEmail.patientIditificationNum = user.patientIdentificationNo;
+ _requestSendPrescriptionEmail.patientMobileNumber = user.mobileNumber;
+ _requestSendPrescriptionEmail.patientName = user.firstName +" "+ user.lastName;
+ _requestSendPrescriptionEmail.setupID = user.setupID;
hasError = false;
- await baseAppClient.post(SEND_PRESCRIPTION_EMAIL,
- onFailure: (String error, int statusCode) {
+ await baseAppClient.post(SEND_PRESCRIPTION_EMAIL, onSuccess: (response, statusCode) {},
+ onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: _requestSendPrescriptionEmail.toJson());
}
- RequestGetListPharmacyForPrescriptions
- requestGetListPharmacyForPrescriptions =
- RequestGetListPharmacyForPrescriptions(
+ RequestGetListPharmacyForPrescriptions requestGetListPharmacyForPrescriptions = RequestGetListPharmacyForPrescriptions(
latitude: 0,
longitude: 0,
- versionID: 5.5,
- channel: 3,
- languageID: 2,
- iPAdress: '10.20.10.20',
- generalid: 'Cs2020@2016\$2958',
- patientOutSA: 0,
- sessionID: 'HGNerTUSXhpaHXBg',
isDentalAllowedBackend: false,
- deviceTypeID: 2,
+
);
List pharmacyPrescriptionsList = List();
@@ -180,44 +137,85 @@ class PrescriptionsService extends BaseService {
}, body: requestGetListPharmacyForPrescriptions.toJson());
}
+ RequestPrescriptionReportEnh _requestPrescriptionReportEnh =
+ RequestPrescriptionReportEnh(isDentalAllowedBackend: false,);
- RequestPrescriptionReportEnh _requestPrescriptionReportEnh = RequestPrescriptionReportEnh(
- versionID: 5.5,
- channel: 3,
- languageID: 2,
- iPAdress: '10.20.10.20',
- generalid: 'Cs2020@2016\$2958',
- patientOutSA: 0,
- sessionID: 'bQQdesEKpyYKTFMVNeg',
- isDentalAllowedBackend: false,
- deviceTypeID: 2,
- patientID: 1231755,
- tokenID: '@dm!n',
- patientTypeID: 1,
- patientType: 1,
- setupID: '91877',
- appointmentNo: 5926390,
- episodeID: 140251928,
- clinicID: 25,
- projectID: 12
+ List prescriptionReportEnhList = List();
- );
+ Future getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder}) async {
+
+ ///This logic copy from the old app from class [order-history.component.ts] in line 45
+ bool isInPatient = false;
+ prescriptionsList.forEach((element) {
+ if (prescriptionsOrder.appointmentNo == "0") {
+ if (element.dischargeNo == int.parse(prescriptionsOrder.dischargeID)) {
+
+ _requestPrescriptionReportEnh.appointmentNo = element.appointmentNo;
+ _requestPrescriptionReportEnh.clinicID = element.clinicID;
+ _requestPrescriptionReportEnh.projectID = element.projectID;
+ _requestPrescriptionReportEnh.episodeID = element.episodeID;
+ _requestPrescriptionReportEnh.setupID = element.setupID;
+ _requestPrescriptionReportEnh.dischargeNo = element.dischargeNo;
+ isInPatient = element.isInOutPatient;
+ }
+ } else {
+ if (int.parse(prescriptionsOrder.appointmentNo) == element.appointmentNo) {
+ _requestPrescriptionReportEnh.appointmentNo = element.appointmentNo;
+ _requestPrescriptionReportEnh.clinicID = element.clinicID;
+ _requestPrescriptionReportEnh.projectID = element.projectID;
+ _requestPrescriptionReportEnh.episodeID = element.episodeID;
+ _requestPrescriptionReportEnh.setupID = element.setupID;
+ _requestPrescriptionReportEnh.dischargeNo = element.dischargeNo;
+ isInPatient = element.isInOutPatient;///call inpGetPrescriptionReport
+ }
+ }
+ });
- List prescriptionReportEnhList = List();
- Future getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder})async{
hasError = false;
- // _requestPrescriptionReportEnh.appointmentNo = int.parse(prescriptionsOrder.appointmentNo);
- // _requestPrescriptionReportEnh.patientID = prescriptionsOrder.projectID;
- await baseAppClient.post(GET_PRESCRIPTION_REPORT_ENH,
+ await baseAppClient.post(isInPatient? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT,
+ onSuccess: (dynamic response, int statusCode) {
+ prescriptionReportEnhList.clear();
+
+ if(isInPatient){
+ response['ListPRM'].forEach((prescriptions) {
+ prescriptionReportEnhList.add(PrescriptionReportEnh.fromJson(prescriptions));
+ });
+ }else{
+ response['INP_GetPrescriptionReport_List'].forEach((prescriptions) {
+
+ PrescriptionReportEnh reportEnh = PrescriptionReportEnh.fromJson(prescriptions);
+ reportEnh.itemDescription = prescriptions['ItemDescriptionN'];
+ prescriptionReportEnhList.add(reportEnh);
+
+ });
+
+ }
+
+
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: _requestPrescriptionReportEnh.toJson());
+
+
+ }
+
+ Future updatePressOrder({@required int presOrderID}) async {
+ hasError = false;
+ Map body = Map();
+ body['PresOrderID'] = presOrderID;
+ body['EditedBy'] = user.patientID;
+ body['RejectionReason'] = '';
+ body['PresOrderStatus'] = 4;
+ body['isDentalAllowedBackend'] = false;
+ await baseAppClient.post(UPDATE_PRESS_ORDER,
onSuccess: (dynamic response, int statusCode) {
- prescriptionReportEnhList.clear();
- response['ListPRM'].forEach((prescriptions) {
- prescriptionReportEnhList.add(PrescriptionReportEnh.fromJson(prescriptions));
- });
+
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
- }, body: _requestPrescriptionReportEnh.toJson());
+ }, body: body);
}
+
}
diff --git a/lib/core/service/medical/reports_monthly_service.dart b/lib/core/service/medical/reports_monthly_service.dart
index 5e643669..479360ac 100644
--- a/lib/core/service/medical/reports_monthly_service.dart
+++ b/lib/core/service/medical/reports_monthly_service.dart
@@ -12,19 +12,8 @@ class ReportsMonthlyService extends BaseService {
isReport: true,
encounterType: 1,
requestType: 1,
- versionID: 5.5,
- channel: 3,
- languageID: 2,
- iPAdress: "10.20.10.20",
- generalid: 'Cs2020@2016\$2958',
- patientOutSA: 0,
- sessionID: 'KIbLoqkytuKJEWECHQ',
isDentalAllowedBackend: false,
- deviceTypeID: 2,
- patientID: 1231755,
- tokenID: '@dm!n',
- patientTypeID: 1,
- patientType: 1);
+ );
Future getReports() async {
hasError = false;
diff --git a/lib/core/service/medical/reports_service.dart b/lib/core/service/medical/reports_service.dart
index 316872ed..19f86e2e 100644
--- a/lib/core/service/medical/reports_service.dart
+++ b/lib/core/service/medical/reports_service.dart
@@ -12,19 +12,8 @@ class ReportsService extends BaseService {
isReport: true,
encounterType: 1,
requestType: 1,
- versionID: 5.5,
- channel: 3,
- languageID: 2,
- iPAdress: "10.20.10.20",
- generalid: 'Cs2020@2016\$2958',
patientOutSA: 0,
- sessionID: 'KIbLoqkytuKJEWECHQ',
- isDentalAllowedBackend: false,
- deviceTypeID: 2,
- patientID: 1231755,
- tokenID: '@dm!n',
- patientTypeID: 1,
- patientType: 1);
+ );
Future getReports() async {
hasError = false;
diff --git a/lib/core/service/notifications_service.dart b/lib/core/service/notifications_service.dart
new file mode 100644
index 00000000..f2cac55e
--- /dev/null
+++ b/lib/core/service/notifications_service.dart
@@ -0,0 +1,40 @@
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/core/model/notifications/get_notifications_request_model.dart';
+import 'package:diplomaticquarterapp/core/model/notifications/get_notifications_response_model.dart';
+import 'package:diplomaticquarterapp/core/model/notifications/mark_message_as_read_request_model.dart';
+import 'package:diplomaticquarterapp/core/service/base_service.dart';
+
+class NotificationService extends BaseService {
+ List notificationsList = List();
+
+ Future getAllNotifications(GetNotificationsRequestModel getNotificationsRequestModel ) async {
+ hasError = false;
+ await baseAppClient.post(PUSH_NOTIFICATION_GET_ALL_NOTIFICATIONS,
+ onSuccess: (dynamic response, int statusCode) {
+ if(getNotificationsRequestModel.currentPage ==0)
+ notificationsList.clear();
+ response['List_GetAllNotificationsFromPool'].forEach((appoint) {
+ notificationsList.add(GetNotificationsResponseModel.fromJson(appoint));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: getNotificationsRequestModel.toJson());
+ }
+ Future markAsRead(MarkMessageAsReadRequestModel markMessageAsReadRequestModel ) async {
+ hasError = false;
+ await baseAppClient.post(PUSH_NOTIFICATION_SET_MESSAGES_FROM_POOL_AS_READ,
+ onSuccess: (dynamic response, int statusCode) {
+ updateNotification(markMessageAsReadRequestModel.notificationPoolID);
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, body: markMessageAsReadRequestModel.toJson());
+ }
+
+ updateNotification(id) {
+ int index = notificationsList.indexWhere((element) => element.id == id);
+ notificationsList[index].isRead = true;
+
+ }
+}
diff --git a/lib/core/service/parmacyModule/order-preview-service.dart b/lib/core/service/parmacyModule/order-preview-service.dart
new file mode 100644
index 00000000..1f3f9ddd
--- /dev/null
+++ b/lib/core/service/parmacyModule/order-preview-service.dart
@@ -0,0 +1,29 @@
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
+import 'package:diplomaticquarterapp/core/service/base_service.dart';
+
+class OrderPreviewService extends BaseService{
+ bool isFinished = true;
+ bool hasError = false;
+ String errorMsg = '';
+
+ List addresses = List();
+
+ Future getBannerListList() async {
+ hasError = false;
+ try {
+ await baseAppClient.get(GET_CUSTOMERS_ADDRESSES,
+ onSuccess: (dynamic response, int statusCode) {
+ addresses.clear();
+ response['customers'][0]['addresses'].forEach((item) {
+ addresses.add(Addresses.fromJson(item));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ });
+ } catch (error) {
+ throw error;
+ }
+ }
+}
\ No newline at end of file
diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart
new file mode 100644
index 00000000..8584e140
--- /dev/null
+++ b/lib/core/service/parmacyModule/parmacy_module_service.dart
@@ -0,0 +1,97 @@
+import 'package:diplomaticquarterapp/config/config.dart';
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/Manufacturer.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyImageObject.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
+import 'package:diplomaticquarterapp/core/service/base_service.dart';
+
+class PharmacyModuleService extends BaseService {
+ bool isFinished = true;
+ bool hasError = false;
+ String errorMsg = '';
+
+ List bannerItems = List();
+ List manufacturerList = List();
+ List bestSellerProducts = List();
+ List lastVisitedProducts = List();
+
+ Future getBannerListList() async {
+ hasError = false;
+ try {
+ await baseAppClient.get(GET_PHARMACY_BANNER,
+ onSuccess: (dynamic response, int statusCode) {
+ bannerItems.clear();
+ response['images'].forEach((item) {
+ bannerItems.add(PharmacyImageObject.fromJson(item));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ });
+ } catch (error) {
+ throw error;
+ }
+ }
+
+ Future getTopManufacturerList() async {
+ Map queryParams = {'page': '1', 'limit': '8'};
+ try {
+ await baseAppClient.get(GET_PHARMACY_TOP_MANUFACTURER,
+ onSuccess: (dynamic response, int statusCode) {
+ manufacturerList.clear();
+ response['manufacturer'].forEach((item) {
+ manufacturerList.add(Manufacturer.fromJson(item));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, queryParams: queryParams);
+ } catch (error) {
+ throw error;
+ }
+ }
+
+ Future getBestSellerProducts() async {
+ Map queryParams = {
+ 'fields':
+ 'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews',
+ };
+ try {
+ await baseAppClient.get(GET_PHARMACY_BEST_SELLER_PRODUCT,
+ onSuccess: (dynamic response, int statusCode) {
+ bestSellerProducts.clear();
+ response['products'].forEach((item) {
+ bestSellerProducts.add(PharmacyProduct.fromJson(item));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ }, queryParams: queryParams);
+ } catch (error) {
+ throw error;
+ }
+ }
+
+ Future getLastVisitedProducts() async {
+ String lastVisited = "";
+ if (await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS) !=
+ null) {
+ lastVisited =
+ await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS);
+ try {
+ await baseAppClient.get("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited",
+ onSuccess: (dynamic response, int statusCode) {
+ lastVisitedProducts.clear();
+ response['products'].forEach((item) {
+ lastVisitedProducts.add(PharmacyProduct.fromJson(item));
+ });
+ }, onFailure: (String error, int statusCode) {
+ hasError = true;
+ super.error = error;
+ });
+ } catch (error) {
+ throw error;
+ }
+ }
+ }
+}
diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart
index 18ab02e3..d8ea5196 100644
--- a/lib/core/viewModels/base_view_model.dart
+++ b/lib/core/viewModels/base_view_model.dart
@@ -30,6 +30,9 @@ class BaseViewModel extends ChangeNotifier {
}
BaseViewModel() {
+ //authenticatedUserObject.getUser();
+ user = authenticatedUserObject.user;
+ this.isLogin = authenticatedUserObject.isLogin;
_getUser();
}
diff --git a/lib/core/viewModels/dashboard_view_model.dart b/lib/core/viewModels/dashboard_view_model.dart
index e2523120..4cf22b23 100644
--- a/lib/core/viewModels/dashboard_view_model.dart
+++ b/lib/core/viewModels/dashboard_view_model.dart
@@ -10,7 +10,7 @@ class DashboardViewModel extends BaseViewModel {
String bloadType = "";
getPatientRadOrders() async {
- if (!isLogin && _vitalSignService.weightKg.isEmpty) {
+ if (isLogin && _vitalSignService.weightKg.isEmpty) {
setState(ViewState.Busy);
await _vitalSignService.getPatientRadOrders();
if (_vitalSignService.hasError) {
diff --git a/lib/core/viewModels/feedback/feedback_view_model.dart b/lib/core/viewModels/feedback/feedback_view_model.dart
index d5f14e2d..4956024d 100644
--- a/lib/core/viewModels/feedback/feedback_view_model.dart
+++ b/lib/core/viewModels/feedback/feedback_view_model.dart
@@ -3,6 +3,8 @@ import 'package:diplomaticquarterapp/core/model/feedback/COC_items.dart';
import 'package:diplomaticquarterapp/core/service/feedback/feedback_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
import 'package:diplomaticquarterapp/pages/feedback/appointment_history.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:flutter/cupertino.dart';
import '../../../locator.dart';
@@ -22,7 +24,31 @@ class FeedbackViewModel extends BaseViewModel {
MessageType messageType = MessageType.NON;
MessageType messageTypeDialog = MessageType.NON;
- String selected = "not selected";
+
+
+ String getSelected(BuildContext context) {
+ switch (messageType) {
+ case MessageType.ComplaintOnAnAppointment:
+ return TranslationBase.of(context).complainAppo;
+ break;
+ case MessageType.ComplaintWithoutAppointment:
+ return TranslationBase.of(context).complainWithoutAppo;
+ break;
+ case MessageType.Question:
+ return TranslationBase.of(context).question;
+ break;
+ case MessageType.Compliment:
+ return TranslationBase.of(context).compliment;
+ break;
+ case MessageType.Suggestion:
+ return TranslationBase.of(context).suggestion;
+ break;
+ case MessageType.NON:
+ return TranslationBase.of(context).notClassified;
+ break;
+ }
+ return TranslationBase.of(context).notClassified;
+ }
setMessageDialogType(MessageType messageType) {
messageTypeDialog = messageType;
@@ -33,19 +59,14 @@ class FeedbackViewModel extends BaseViewModel {
this.messageType = messageType;
switch (messageType) {
case MessageType.ComplaintOnAnAppointment:
- selected = "Complaint on an appointment";
break;
case MessageType.ComplaintWithoutAppointment:
- selected = "Complaint without appointment";
break;
case MessageType.Question:
- selected = "Question";
break;
case MessageType.Compliment:
- selected = "Compliment";
break;
case MessageType.Suggestion:
- selected = "Suggestion";
break;
case MessageType.NON:
break;
diff --git a/lib/core/viewModels/insurance_card_View_model.dart b/lib/core/viewModels/insurance_card_View_model.dart
index e99a53f6..7029f082 100644
--- a/lib/core/viewModels/insurance_card_View_model.dart
+++ b/lib/core/viewModels/insurance_card_View_model.dart
@@ -65,11 +65,12 @@ class InsuranceViewModel extends BaseViewModel {
}
Future getFamilyFiles() async {
- await _insuranceCardService.getFamilyFiles();
+ await _insuranceCardService.getSharedRecordByStatus();
if (_insuranceCardService.hasError) {
error = _insuranceCardService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
}
+
}
diff --git a/lib/core/viewModels/medical/labs_view_model.dart b/lib/core/viewModels/medical/labs_view_model.dart
index 8cbf0efc..582ee745 100644
--- a/lib/core/viewModels/medical/labs_view_model.dart
+++ b/lib/core/viewModels/medical/labs_view_model.dart
@@ -82,6 +82,8 @@ class LabsViewModel extends BaseViewModel {
List get labResultList => _labsService.labResultList;
+ List labResultLists = List();
+
getLaboratoryResult(
{String projectID,
int clinicID,
@@ -110,6 +112,24 @@ class LabsViewModel extends BaseViewModel {
error = _labsService.error;
setState(ViewState.Error);
} else {
+ _labsService.labResultList.forEach((element) {
+ List patientLabOrdersClinic =
+ labResultLists
+ .where((elementClinic) =>
+ elementClinic.filterName == element.testCode)
+ .toList();
+
+ if (patientLabOrdersClinic.length != 0) {
+ labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])]
+ .patientLabResultList
+ .add(element);
+ } else {
+ labResultLists.add(LabResultList(
+ filterName: element.testCode,
+ lab: element));
+ }
+
+ });
setState(ViewState.Idle);
}
}
diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart
index f8b14c6e..52fd221a 100644
--- a/lib/core/viewModels/medical/medical_view_model.dart
+++ b/lib/core/viewModels/medical/medical_view_model.dart
@@ -14,7 +14,6 @@ class MedicalViewModel extends BaseViewModel {
getAppointmentHistory() async {
if (authenticatedUserObject.isLogin) {
setState(ViewState.Busy);
- if (_medicalService.appoitmentAllHistoryResultList.length == 0)
await _medicalService.getAppointmentHistory();
if (_medicalService.hasError) {
error = _medicalService.error;
diff --git a/lib/core/viewModels/medical/my_balance_view_model.dart b/lib/core/viewModels/medical/my_balance_view_model.dart
index b110edcb..62b7868b 100644
--- a/lib/core/viewModels/medical/my_balance_view_model.dart
+++ b/lib/core/viewModels/medical/my_balance_view_model.dart
@@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/blood_groub_details.dart';
import 'package:diplomaticquarterapp/core/model/blooddonation/get_all_cities.dart';
import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart';
+import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_advance_balance_amount.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info_and_mobile_number.dart';
@@ -25,11 +26,15 @@ class MyBalanceViewModel extends BaseViewModel {
_myBalanceService.patientAdvanceBalanceAmountList;
//========================
- BloodDonationService _bloodDonationService =locator();
- List get CitiesModelList => _bloodDonationService.CitiesModelList;
- BloodDetailsService _bloodDetailsService =locator();
- List get BloodDetailsModelList => _bloodDetailsService.BloodModelList;//_bloodDonationService.CitiesModelList;
+ BloodDonationService _bloodDonationService = locator();
+ List get CitiesModelList =>
+ _bloodDonationService.CitiesModelList;
+ BloodDetailsService _bloodDetailsService = locator();
+
+ List get BloodDetailsModelList =>
+ _bloodDetailsService
+ .BloodModelList; //_bloodDonationService.CitiesModelList;
//===========================
@@ -44,8 +49,8 @@ class MyBalanceViewModel extends BaseViewModel {
PatientInfoAndMobileNumber get patientInfoAndMobileNumber =>
_myBalanceService.patientInfoAndMobileNumber;
-
String get logInTokenID => _myBalanceService.logInTokenID;
+
String get verificationCode => _myBalanceService.verificationCode;
getPatientAdvanceBalanceAmount() async {
@@ -68,6 +73,7 @@ class MyBalanceViewModel extends BaseViewModel {
} else
setState(ViewState.Idle);
}
+
//==============
Future getCities() async {
setState(ViewState.Busy);
@@ -79,9 +85,11 @@ class MyBalanceViewModel extends BaseViewModel {
} else
setState(ViewState.Idle);
}
+
Future getBlood() async {
setState(ViewState.Busy);
- await _bloodDetailsService .getAllBloodOrders();;
+ await _bloodDetailsService.getAllBloodOrders();
+ ;
if (_bloodDetailsService.hasError) {
error = _bloodDetailsService.error;
@@ -89,6 +97,7 @@ class MyBalanceViewModel extends BaseViewModel {
} else
setState(ViewState.Idle);
}
+
//===============
Future getPatientInfoByPatientID({String id}) async {
@@ -103,9 +112,10 @@ class MyBalanceViewModel extends BaseViewModel {
}
}
- Future getPatientInfoByPatientIDAndMobileNumber() async {
+ Future getPatientInfoByPatientIDAndMobileNumber(AdvanceModel advanceModel) async {
setState(ViewState.Busy);
- await _myBalanceService.getPatientInfoByPatientIDAndMobileNumber();
+ await _myBalanceService
+ .getPatientInfoByPatientIDAndMobileNumber(advanceModel);
if (_myBalanceService.hasError) {
error = _myBalanceService.error;
setState(ViewState.ErrorLocal);
@@ -115,9 +125,11 @@ class MyBalanceViewModel extends BaseViewModel {
}
}
- Future sendActivationCodeForAdvancePayment({int patientID,int projectID}) async {
+ Future sendActivationCodeForAdvancePayment(
+ {int patientID, int projectID}) async {
setState(ViewState.Busy);
- await _myBalanceService.sendActivationCodeForAdvancePayment(patientID: patientID,projectID: projectID);
+ await _myBalanceService.sendActivationCodeForAdvancePayment(
+ patientID: patientID, projectID: projectID);
if (_myBalanceService.hasError) {
error = _myBalanceService.error;
setState(ViewState.ErrorLocal);
@@ -126,9 +138,12 @@ class MyBalanceViewModel extends BaseViewModel {
setState(ViewState.Idle);
}
}
- Future checkActivationCodeForAdvancePayment({String activationCode}) async {
+
+ Future checkActivationCodeForAdvancePayment(
+ {String activationCode, String patientMobileNumber}) async {
setState(ViewState.Busy);
- await _myBalanceService.checkActivationCodeForAdvancePayment(activationCode: activationCode);
+ await _myBalanceService.checkActivationCodeForAdvancePayment(
+ activationCode: activationCode);
if (_myBalanceService.hasError) {
error = _myBalanceService.error;
setState(ViewState.ErrorLocal);
@@ -139,7 +154,7 @@ class MyBalanceViewModel extends BaseViewModel {
Future getFamilyFiles() async {
setState(ViewState.Busy);
- await _myBalanceService.getFamilyFiles();
+ await _myBalanceService.getSharedRecordByStatus();
if (_myBalanceService.hasError) {
error = _myBalanceService.error;
setState(ViewState.ErrorLocal);
diff --git a/lib/core/viewModels/medical/prescriptions_view_model.dart b/lib/core/viewModels/medical/prescriptions_view_model.dart
index 27b954d4..1cd934e2 100644
--- a/lib/core/viewModels/medical/prescriptions_view_model.dart
+++ b/lib/core/viewModels/medical/prescriptions_view_model.dart
@@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_repor
import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report_enh.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:flutter/cupertino.dart';
import '../../../core/enum/filter_type.dart';
import '../../../core/enum/viewstate.dart';
@@ -102,9 +103,9 @@ class PrescriptionsViewModel extends BaseViewModel {
notifyListeners();
}
- getPrescriptionReport({int dischargeNo}) async {
+ getPrescriptionReport({Prescriptions prescriptions}) async {
setState(ViewState.Busy);
- await _prescriptionsService.getPrescriptionReport(dischargeNo: dischargeNo);
+ await _prescriptionsService.getPrescriptionReport(prescriptions: prescriptions);
if (_prescriptionsService.hasError) {
error = _prescriptionsService.error;
setState(ViewState.ErrorLocal);
@@ -157,4 +158,16 @@ class PrescriptionsViewModel extends BaseViewModel {
}
}
+
+ Future updatePressOrder({@required int presOrderID}) async {
+ setState(ViewState.Busy);
+ await _prescriptionsService.updatePressOrder(presOrderID: presOrderID);
+ if (_prescriptionsService.hasError) {
+ error = _prescriptionsService.error;
+ setState(ViewState.Error);
+ } else {
+ await getPrescriptions();
+ }
+ }
+
}
diff --git a/lib/core/viewModels/notifications_view_model.dart b/lib/core/viewModels/notifications_view_model.dart
new file mode 100644
index 00000000..ac09e3b2
--- /dev/null
+++ b/lib/core/viewModels/notifications_view_model.dart
@@ -0,0 +1,40 @@
+import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
+import 'package:diplomaticquarterapp/core/model/notifications/get_notifications_request_model.dart';
+import 'package:diplomaticquarterapp/core/model/notifications/get_notifications_response_model.dart';
+import 'package:diplomaticquarterapp/core/model/notifications/mark_message_as_read_request_model.dart';
+import 'package:diplomaticquarterapp/core/service/notifications_service.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
+import 'package:flutter/material.dart';
+
+import '../../locator.dart';
+import 'base_view_model.dart';
+
+class NotificationViewModel extends BaseViewModel {
+ NotificationService _notificationService = locator();
+
+ List get notifications =>
+ _notificationService.notificationsList;
+
+ Future getNotifications(
+ GetNotificationsRequestModel getNotificationsRequestModel, BuildContext context) async {
+ if(getNotificationsRequestModel.currentPage == 0)
+ setState(ViewState.Busy);
+
+ await _notificationService
+ .getAllNotifications(getNotificationsRequestModel);
+ if (_notificationService.hasError) {
+ error = _notificationService.error;
+ setState(ViewState.Error);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+
+ Future markAsRead(id) async {
+ // setState(ViewState.Busy);
+ MarkMessageAsReadRequestModel markMessageAsReadRequestModel =
+ new MarkMessageAsReadRequestModel(notificationPoolID: id);
+ await _notificationService.markAsRead(markMessageAsReadRequestModel);
+ setState(ViewState.Idle);
+ }
+}
\ No newline at end of file
diff --git a/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart b/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart
new file mode 100644
index 00000000..00f4819b
--- /dev/null
+++ b/lib/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart
@@ -0,0 +1,8 @@
+import 'package:diplomaticquarterapp/core/service/parmacyModule/order-preview-service.dart';
+
+import '../../../locator.dart';
+import '../base_view_model.dart';
+
+class OrderPreviewViewModel extends BaseViewModel {
+ OrderPreviewService _orderService = locator();
+}
diff --git a/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
new file mode 100644
index 00000000..f8c574f7
--- /dev/null
+++ b/lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
@@ -0,0 +1,73 @@
+import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/Manufacturer.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyImageObject.dart';
+import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
+import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart';
+import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
+
+import '../../../locator.dart';
+
+class PharmacyModuleViewModel extends BaseViewModel {
+ PharmacyModuleService _pharmacyService = locator();
+
+ List get bannerList => _pharmacyService.bannerItems;
+
+ List get manufacturerList => _pharmacyService.manufacturerList;
+
+ List get bestSellerProduct =>
+ _pharmacyService.bestSellerProducts;
+
+ List get lastVisitedProducts =>
+ _pharmacyService.lastVisitedProducts;
+
+ Future getPharmacyHomeData() async {
+ setState(ViewState.Busy);
+ await _pharmacyService.getBannerListList();
+ if (_pharmacyService.hasError) {
+ error = _pharmacyService.error;
+ setState(ViewState.Error);
+ } else {
+ _getTopManufacturerList();
+ }
+ }
+
+ List getBannerImagesUrl() {
+ List images = List();
+ images.add('assets/images/pharmacy_module/pharmacy_logo_green.png');
+ _pharmacyService.bannerItems.forEach((element) {
+ images.add(element.src);
+ });
+
+ return images;
+ }
+
+ _getTopManufacturerList() async {
+ await _pharmacyService.getTopManufacturerList();
+ if (_pharmacyService.hasError) {
+ error = _pharmacyService.error;
+ setState(ViewState.Error);
+ } else {
+ _getBestSellerProducts();
+ }
+ }
+
+ _getBestSellerProducts() async {
+ await _pharmacyService.getBestSellerProducts();
+ if (_pharmacyService.hasError) {
+ error = _pharmacyService.error;
+ setState(ViewState.Error);
+ } else {
+ _getLastVisitedProducts();
+ }
+ }
+
+ _getLastVisitedProducts() async {
+ await _pharmacyService.getLastVisitedProducts();
+ if (_pharmacyService.hasError) {
+ error = _pharmacyService.error;
+ setState(ViewState.Error);
+ } else {
+ setState(ViewState.Idle);
+ }
+ }
+}
diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart
index ea06c8ad..d2b7cf8b 100644
--- a/lib/core/viewModels/project_view_model.dart
+++ b/lib/core/viewModels/project_view_model.dart
@@ -10,19 +10,26 @@ import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
class ProjectViewModel extends BaseViewModel {
AppSharedPreferences sharedPref = AppSharedPreferences();
- Locale _appLocale;
- String currentLanguage = 'en';
+ Locale _appLocale = Locale('ar');
+ String currentLanguage = 'ar';
bool _isArabic = false;
bool isInternetConnection = true;
bool isLoading = false;
bool isError = false;
String error = '';
dynamic searchvalue;
+ bool isLogin
+ = false;
+
+
dynamic get searchValue => searchvalue;
+
Locale get appLocal => _appLocale;
- LocaleType get localeType => isArabic? LocaleType.en:LocaleType.ar;
+ LocaleType get localeType => isArabic ? LocaleType.en : LocaleType.ar;
+
bool get isArabic => _isArabic;
+
// BaseViewModel baseViewModel = locator()
StreamSubscription subscription;
@@ -48,11 +55,10 @@ class ProjectViewModel extends BaseViewModel {
}
void loadSharedPrefLanguage() async {
- currentLanguage = await sharedPref.getString(APP_LANGUAGE);
- _appLocale = Locale(currentLanguage ?? 'en');
- _isArabic = currentLanguage != null
- ? currentLanguage == 'ar' ? true : false
- : true;
+ currentLanguage =
+ await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+ _appLocale = Locale(currentLanguage);
+ _isArabic = currentLanguage == 'ar';
notifyListeners();
}
diff --git a/lib/core/viewModels/qr_view_model.dart b/lib/core/viewModels/qr_view_model.dart
index 03c88462..9833d6c8 100644
--- a/lib/core/viewModels/qr_view_model.dart
+++ b/lib/core/viewModels/qr_view_model.dart
@@ -1,11 +1,11 @@
import 'dart:convert';
-
-// import 'package:barcode_scan/platform_wrapper.dart';
+import 'package:barcode_scan_fix/barcode_scan.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/qr/qr_parking_model.dart';
import 'package:diplomaticquarterapp/core/service/qr_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart';
+
import '../../locator.dart';
class QrViewModel extends BaseViewModel {
@@ -15,25 +15,25 @@ class QrViewModel extends BaseViewModel {
readQr() async {
//TODO fix the barcode scan
- // var result = await BarcodeScanner.scan();
- // var data = json.decode(result.rawContent);
- // var qRParkingID = data['QRParkingID'];
- // setState(ViewState.BusyLocal);
- // await _qrService.getQRParkingByID(qRParkingID);
- // if (_qrService.hasError) {
- // error = _qrService.error;
- // setState(ViewState.ErrorLocal);
- // } else {
- // if (_qrService.qRParkingList.length > 0) {
- // qrParkingModel = _qrService.qRParkingList[0];
- // await sharedPref.setObject(IS_GO_TO_PARKING, qrParkingModel);
- // isSavePark = true;
- // setState(ViewState.Idle);
- // } else {
- // error = "Invalid Qr Code";
- // setState(ViewState.ErrorLocal);
- // }
- // }
+ String result = await BarcodeScanner.scan();
+ var data = json.decode(result);
+ var qRParkingID = data['QRParkingID'];
+ setState(ViewState.BusyLocal);
+ await _qrService.getQRParkingByID(qRParkingID);
+ if (_qrService.hasError) {
+ error = _qrService.error;
+ setState(ViewState.ErrorLocal);
+ } else {
+ if (_qrService.qRParkingList.length > 0) {
+ qrParkingModel = _qrService.qRParkingList[0];
+ await sharedPref.setObject(IS_GO_TO_PARKING, qrParkingModel);
+ isSavePark = true;
+ setState(ViewState.Idle);
+ } else {
+ error = "Invalid Qr Code";
+ setState(ViewState.ErrorLocal);
+ }
+ }
}
getIsSaveParking() async {
diff --git a/lib/d_q_icons_icons.dart b/lib/d_q_icons_icons.dart
index fc9679ca..c3b64559 100644
--- a/lib/d_q_icons_icons.dart
+++ b/lib/d_q_icons_icons.dart
@@ -30,4 +30,13 @@ class DQIcons {
static const IconData thermometer = IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData weight_scale = IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData parking_icon = IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData blood_type_icon = IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData height_icon = IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData online_payment_icon = IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData search_medicine_icon = IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData vital_sign_icon = IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData weight_icon = IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData my_medical_file = IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData family = IconData(0xe810, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+ static const IconData calendar__2_ = IconData(0xe811, fontFamily: _kFontFam, fontPackage: _kFontPkg);
}
diff --git a/lib/locator.dart b/lib/locator.dart
index a71d7964..6b7bb076 100644
--- a/lib/locator.dart
+++ b/lib/locator.dart
@@ -42,7 +42,11 @@ import 'core/service/medical/prescriptions_service.dart';
import 'core/service/medical/radiology_service.dart';
import 'core/service/medical/reports_monthly_service.dart';
import 'core/service/medical/vital_sign_service.dart';
+import 'core/service/parmacyModule/order-preview-service.dart';
+import 'core/service/notifications_service.dart';
import 'core/viewModels/AlHabibMedicalService/cmc_view_model.dart';
+import 'core/service/parmacyModule/parmacy_module_service.dart';
+
import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart';
import 'core/viewModels/appointment_rate_view_model.dart';
import 'core/viewModels/blooddonation/blood_details_view_model.dart';
@@ -74,10 +78,13 @@ import 'core/viewModels/medical/reports_monthly_view_model.dart';
import 'core/viewModels/medical/vital_sign_view_model.dart';
import 'core/viewModels/medical/reports_view_model.dart';
import 'core/viewModels/medical/weight_pressure_view_model.dart';
+import 'core/viewModels/notifications_view_model.dart';
import 'core/viewModels/pharmacies_view_model.dart';
import 'core/service/pharmacies_service.dart';
import 'core/service/insurance_service.dart';
import 'core/viewModels/insurance_card_View_model.dart';
+import 'core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
+import 'core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
import 'core/viewModels/qr_view_model.dart';
import 'core/viewModels/vaccine_view_model.dart';
import 'core/service/vaccine_service.dart';
@@ -110,8 +117,6 @@ void setupLocator() {
locator.registerLazySingleton(() => EReferralService());
locator.registerLazySingleton(() => HomeHealthCareService());
locator.registerLazySingleton(() => CMCService());
-
-
locator.registerLazySingleton(() => PatientSickLeaveService());
locator.registerLazySingleton(() => MyBalanceService());
locator.registerLazySingleton(() => BloodSugarService());
@@ -124,7 +129,6 @@ void setupLocator() {
locator.registerLazySingleton(() => FindusService());
locator.registerLazySingleton(() => LiveChatService());
locator.registerLazySingleton(() => H2OService());
-
locator.registerLazySingleton(() => BloodDonationService());
locator.registerLazySingleton(() => BloodDetailsService());
locator.registerLazySingleton(() => ChildVaccinesService());
@@ -132,9 +136,12 @@ void setupLocator() {
locator.registerLazySingleton(() => CreteNewBabyService());
locator.registerLazySingleton(() => DeleteBabyService());
+ locator.registerLazySingleton(() => VaccinationTableService());
+ locator.registerLazySingleton(() => NotificationService());
- locator.registerLazySingleton(() => VaccinationTableService());
+ locator.registerLazySingleton(() => PharmacyModuleService());
+ locator.registerLazySingleton(() => OrderPreviewService());
/// View Model
@@ -166,9 +173,6 @@ void setupLocator() {
locator.registerFactory(() => ChildVaccinesViewModel());
locator.registerFactory(() => UserInformationViewModel());
locator.registerFactory(() => VaccinationTableViewModel());
-
-
-
locator.registerFactory(() => AddNewChildViewModel());
locator.registerFactory(() => H2OViewModel());
locator.registerFactory(() => BloodSugarViewMode());
@@ -177,8 +181,15 @@ void setupLocator() {
locator.registerFactory(() => EyeViewModel());
locator.registerFactory(() => ActiveMedicationsViewModel());
locator.registerFactory(() => AskDoctorViewModel());
+
locator.registerFactory(() => AllergiesViewModel());
locator.registerFactory(() => HomeHealthCareViewModel());
locator.registerFactory(() => CMCViewModel());
+ locator.registerFactory(() => NotificationViewModel());
+
+
+
+ locator.registerFactory(() => PharmacyModuleViewModel());
+ locator.registerFactory(() => OrderPreviewViewModel());
}
diff --git a/lib/main.dart b/lib/main.dart
index 9cb5cb78..f1ed0a62 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,24 +1,30 @@
+import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
+import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
import 'package:diplomaticquarterapp/routes.dart';
+import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
+import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart';
+import 'package:diplomaticquarterapp/theme/theme_value.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
-import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart';
+
import 'config/size_config.dart';
import 'core/viewModels/project_view_model.dart';
import 'locator.dart';
-import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
void main() async {
setupLocator();
- runApp(MyApp());
+ runApp(ChangeNotifierProvider(
+ create: (context) => ThemeNotifier(defaultTheme), child: MyApp() ));
}
class MyApp extends StatelessWidget {
- /// static final _myTabbedPageKey = new GlobalKey<_LandingPageState>();
@override
Widget build(BuildContext context) {
+ final themeNotifier = Provider.of(context);
+
return LayoutBuilder(
builder: (context, constraints) {
return OrientationBuilder(
@@ -29,6 +35,8 @@ class MyApp extends StatelessWidget {
ChangeNotifierProvider(
create: (context) => ProjectViewModel(),
),
+ ChangeNotifierProvider(
+ create: (context) => ToDoCountProviderModel()),
ChangeNotifierProvider(
create: (context) => SearchProvider()),
ChangeNotifierProvider.value(
@@ -41,6 +49,7 @@ class MyApp extends StatelessWidget {
],
child: Consumer(
builder: (context, projectProvider, child) => MaterialApp(
+
showSemanticsDebugger: false,
title: 'Diplomatic Quarter App',
locale: projectProvider.appLocal,
@@ -48,13 +57,15 @@ class MyApp extends StatelessWidget {
TranslationBaseDelegate(),
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
+ GlobalCupertinoLocalizations.delegate,
],
supportedLocales: [
const Locale('ar', ''), // Arabic
const Locale('en', ''), // English
],
- theme: ThemeData(
- fontFamily: projectProvider.isArabic ? 'Cairo' : 'WorkSans',
+ //theme: themeNotifier.getTheme(),
+ theme:ThemeData(
+ fontFamily:projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.light,
@@ -67,7 +78,7 @@ class MyApp extends StatelessWidget {
hintColor: Colors.grey[400],
disabledColor: Colors.grey[300],
errorColor: Color.fromRGBO(235, 80, 60, 1.0),
- scaffoldBackgroundColor: HexColor('#E9E9E9'), // Colors.grey[100],
+ scaffoldBackgroundColor: Color(0xffE9E9E9), // Colors.grey[100],
textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5),
textSelectionHandleColor: Colors.grey,
canvasColor: Colors.white,
@@ -88,7 +99,7 @@ class MyApp extends StatelessWidget {
),
),
),
- initialRoute: HOME,
+ initialRoute: SPLASH,
routes: routes,
debugShowCheckedModeBanner: false,
),
diff --git a/lib/models/Appointments/toDoCountProviderModel.dart b/lib/models/Appointments/toDoCountProviderModel.dart
new file mode 100644
index 00000000..0fd83491
--- /dev/null
+++ b/lib/models/Appointments/toDoCountProviderModel.dart
@@ -0,0 +1,12 @@
+import 'package:flutter/cupertino.dart';
+
+class ToDoCountProviderModel with ChangeNotifier {
+ int _count;
+
+ int get count => _count == null ? 0 : _count;
+
+ void setState(int count) {
+ _count = count;
+ notifyListeners();
+ }
+}
diff --git a/lib/models/Authentication/authenticated_user.dart b/lib/models/Authentication/authenticated_user.dart
index efccc068..4c7974a3 100644
--- a/lib/models/Authentication/authenticated_user.dart
+++ b/lib/models/Authentication/authenticated_user.dart
@@ -60,6 +60,7 @@ class AuthenticatedUser {
dynamic strDateofBirth;
dynamic tempAddress;
dynamic zipCode;
+ dynamic isFamily;
// dynamic patientPayType;
// dynamic patientType;
// dynamic status;
@@ -123,6 +124,7 @@ class AuthenticatedUser {
this.strDateofBirth,
this.tempAddress,
this.zipCode,
+ this.isFamily
});
AuthenticatedUser.fromJson(Map json) {
@@ -190,6 +192,7 @@ class AuthenticatedUser {
strDateofBirth = json['StrDateofBirth'];
tempAddress = json['TempAddress'];
zipCode = json['ZipCode'];
+ isFamily = json['IsFamily'];
}
Map toJson() {
@@ -255,7 +258,7 @@ class AuthenticatedUser {
data['StrDateofBirth'] = this.strDateofBirth;
data['TempAddress'] = this.tempAddress;
data['ZipCode'] = this.zipCode;
-
+ data['IsFamily'] = this.isFamily;
return data;
}
}
diff --git a/lib/models/Authentication/check_activation_code_request.dart b/lib/models/Authentication/check_activation_code_request.dart
index a4bf79c3..af139ba5 100644
--- a/lib/models/Authentication/check_activation_code_request.dart
+++ b/lib/models/Authentication/check_activation_code_request.dart
@@ -2,7 +2,7 @@ class CheckActivationCodeReq {
int patientMobileNumber;
String mobileNo;
String deviceToken;
- int projectOutSA;
+ bool projectOutSA;
int loginType;
String zipCode;
bool isRegister;
diff --git a/lib/models/Authentication/register_user_requet.dart b/lib/models/Authentication/register_user_requet.dart
index ebefcfcf..7758ce5b 100644
--- a/lib/models/Authentication/register_user_requet.dart
+++ b/lib/models/Authentication/register_user_requet.dart
@@ -76,6 +76,9 @@ class Patientobject {
String firstName;
String middleName;
String lastName;
+ String firstNameN;
+ String middleNameN;
+ String lastNameN;
dynamic strDateofBirth;
String dateofBirth;
int gender;
@@ -93,8 +96,11 @@ class Patientobject {
this.mobileNumber,
this.patientOutSA,
this.firstName,
- this.middleName,
- this.lastName,
+ this.middleName,
+ this.lastName,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
this.strDateofBirth,
this.dateofBirth,
this.gender,
@@ -114,6 +120,9 @@ class Patientobject {
firstName = json['FirstName'];
middleName = json['MiddleName'];
lastName = json['LastName'];
+ firstNameN = json['FirstNameN'];
+ middleNameN = json['MiddleNameN'];
+ lastNameN = json['LastNameN'];
strDateofBirth = json['StrDateofBirth'];
dateofBirth = json['DateofBirth'];
gender = json['Gender'];
@@ -136,6 +145,9 @@ class Patientobject {
data['FirstName'] = this.firstName;
data['MiddleName'] = this.middleName;
data['LastName'] = this.lastName;
+ data['FirstNameN'] = this.firstNameN;
+ data['MiddleNameN'] = this.middleNameN;
+ data['LastNameN'] = this.lastNameN;
data['StrDateofBirth'] = this.strDateofBirth;
data['DateofBirth'] = this.dateofBirth;
data['Gender'] = this.gender;
diff --git a/lib/models/Authentication/send_activation_request.dart b/lib/models/Authentication/send_activation_request.dart
index 804f6ef0..b53e19b8 100644
--- a/lib/models/Authentication/send_activation_request.dart
+++ b/lib/models/Authentication/send_activation_request.dart
@@ -2,7 +2,7 @@ class SendActivationRequest {
int patientMobileNumber;
String mobileNo;
String deviceToken;
- int projectOutSA;
+ bool projectOutSA;
int loginType;
String zipCode;
bool isRegister;
diff --git a/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart b/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart
index da848b65..b21d940f 100644
--- a/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart
+++ b/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart
@@ -1,68 +1,68 @@
class GetAllSharedRecordsByStatusResponse {
- Null date;
+ dynamic date;
int languageID;
int serviceName;
- Null time;
- Null androidLink;
- Null authenticationTokenID;
- Null data;
+ dynamic time;
+ dynamic androidLink;
+ dynamic authenticationTokenID;
+ dynamic data;
bool dataw;
int dietType;
- Null errorCode;
- Null errorEndUserMessage;
- Null errorEndUserMessageN;
- Null errorMessage;
+ dynamic errorCode;
+ dynamic errorEndUserMessage;
+ dynamic errorEndUserMessageN;
+ dynamic errorMessage;
int errorType;
int foodCategory;
- Null iOSLink;
+ dynamic iOSLink;
bool isAuthenticated;
int mealOrderStatus;
int mealType;
int messageStatus;
int numberOfResultRecords;
- Null patientBlodType;
- Null successMsg;
- Null successMsgN;
- Null doctorInformationList;
- Null getAllPendingRecordsList;
+ dynamic patientBlodType;
+ dynamic successMsg;
+ dynamic successMsgN;
+ dynamic doctorInformationList;
+ List getAllPendingRecordsList;
List getAllSharedRecordsByStatusList;
- Null getResponseFileList;
+ List getResponseFileList;
bool isHMGPatient;
bool isLoginSuccessfully;
bool isNeedUpdateIdintificationNo;
bool kioskSendSMS;
- Null list;
- Null listAskHabibMobileLoginInfo;
- Null listAskHabibPatientFile;
- Null listMergeFiles;
- Null listMobileLoginInfo;
- Null listPatientCount;
- Null logInTokenID;
- Null mohemmPrivilegeList;
+ dynamic list;
+ dynamic listAskHabibMobileLoginInfo;
+ dynamic listAskHabibPatientFile;
+ dynamic listMergeFiles;
+ dynamic listMobileLoginInfo;
+ dynamic listPatientCount;
+ dynamic logInTokenID;
+ dynamic mohemmPrivilegeList;
int pateintID;
- Null patientBloodType;
- Null patientERDriverFile;
- Null patientERDriverFileList;
+ dynamic patientBloodType;
+ dynamic patientERDriverFile;
+ dynamic patientERDriverFileList;
bool patientHasFile;
- Null patientMergedIDs;
+ dynamic patientMergedIDs;
bool patientOutSA;
int patientShareRequestID;
int patientType;
int projectIDOut;
- Null returnMessage;
+ dynamic returnMessage;
bool sMSLoginRequired;
- Null servicePrivilegeList;
- Null sharePatientName;
- Null verificationCode;
- Null email;
- Null errorList;
+ dynamic servicePrivilegeList;
+ dynamic sharePatientName;
+ dynamic verificationCode;
+ dynamic email;
+ dynamic errorList;
bool hasFile;
bool isActiveCode;
bool isMerged;
bool isNeedUserAgreement;
bool isSMSSent;
- Null memberList;
- Null message;
+ dynamic memberList;
+ dynamic message;
int statusCode;
GetAllSharedRecordsByStatusResponse(
@@ -133,78 +133,92 @@ class GetAllSharedRecordsByStatusResponse {
this.statusCode});
GetAllSharedRecordsByStatusResponse.fromJson(Map json) {
- date = json['Date'];
- languageID = json['LanguageID'];
- serviceName = json['ServiceName'];
- time = json['Time'];
- androidLink = json['AndroidLink'];
- authenticationTokenID = json['AuthenticationTokenID'];
- data = json['Data'];
- dataw = json['Dataw'];
- dietType = json['DietType'];
- errorCode = json['ErrorCode'];
- errorEndUserMessage = json['ErrorEndUserMessage'];
- errorEndUserMessageN = json['ErrorEndUserMessageN'];
- errorMessage = json['ErrorMessage'];
- errorType = json['ErrorType'];
- foodCategory = json['FoodCategory'];
- iOSLink = json['IOSLink'];
- isAuthenticated = json['IsAuthenticated'];
- mealOrderStatus = json['MealOrderStatus'];
- mealType = json['MealType'];
- messageStatus = json['MessageStatus'];
- numberOfResultRecords = json['NumberOfResultRecords'];
- patientBlodType = json['PatientBlodType'];
- successMsg = json['SuccessMsg'];
- successMsgN = json['SuccessMsgN'];
- doctorInformationList = json['DoctorInformation_List'];
- getAllPendingRecordsList = json['GetAllPendingRecordsList'];
- if (json['GetAllSharedRecordsByStatusList'] != null) {
- getAllSharedRecordsByStatusList =
- new List();
- json['GetAllSharedRecordsByStatusList'].forEach((v) {
- getAllSharedRecordsByStatusList
- .add(new GetAllSharedRecordsByStatusList.fromJson(v));
- });
+ try {
+ date = json['Date'];
+ languageID = json['LanguageID'];
+ serviceName = json['ServiceName'];
+ time = json['Time'];
+ androidLink = json['AndroidLink'];
+ authenticationTokenID = json['AuthenticationTokenID'];
+ data = json['Data'];
+ dataw = json['Dataw'];
+ dietType = json['DietType'];
+ errorCode = json['ErrorCode'];
+ errorEndUserMessage = json['ErrorEndUserMessage'];
+ errorEndUserMessageN = json['ErrorEndUserMessageN'];
+ errorMessage = json['ErrorMessage'];
+ errorType = json['ErrorType'];
+ foodCategory = json['FoodCategory'];
+ iOSLink = json['IOSLink'];
+ isAuthenticated = json['IsAuthenticated'];
+ mealOrderStatus = json['MealOrderStatus'];
+ mealType = json['MealType'];
+ messageStatus = json['MessageStatus'];
+ numberOfResultRecords = json['NumberOfResultRecords'];
+ patientBlodType = json['PatientBlodType'];
+ successMsg = json['SuccessMsg'];
+ successMsgN = json['SuccessMsgN'];
+ doctorInformationList = json['DoctorInformation_List'];
+// getAllPendingRecordsList = json['GetAllPendingRecordsList'];
+
+ if (json['GetAllPendingRecordsList'] != null) {
+ getAllSharedRecordsByStatusList = new List();
+ json['GetAllPendingRecordsList'].forEach((v) {
+ getAllSharedRecordsByStatusList
+ .add(new GetAllSharedRecordsByStatusList.fromJson(v));
+ });
+ }
+
+ if (json['GetAllSharedRecordsByStatusList'] != null) {
+ getAllSharedRecordsByStatusList = new List();
+ json['GetAllSharedRecordsByStatusList'].forEach((v) {
+ getAllSharedRecordsByStatusList
+ .add(new GetAllSharedRecordsByStatusList.fromJson(v));
+ });
+ }
+ getResponseFileList = json['GetResponseFileList'];
+ isHMGPatient = json['IsHMGPatient'];
+ isLoginSuccessfully = json['IsLoginSuccessfully'];
+ isNeedUpdateIdintificationNo = json['IsNeedUpdateIdintificationNo'];
+ kioskSendSMS = json['KioskSendSMS'];
+ list = json['List'];
+ listAskHabibMobileLoginInfo = json['List_AskHabibMobileLoginInfo'];
+ listAskHabibPatientFile = json['List_AskHabibPatientFile'];
+ listMergeFiles = json['List_MergeFiles'];
+ listMobileLoginInfo = json['List_MobileLoginInfo'];
+ listPatientCount = json['List_PatientCount'];
+ logInTokenID = json['LogInTokenID'];
+ mohemmPrivilegeList = json['MohemmPrivilege_List'];
+ pateintID = json['PateintID'];
+ patientBloodType = json['PatientBloodType'];
+ patientERDriverFile = json['PatientER_DriverFile'];
+ patientERDriverFileList = json['PatientER_DriverFileList'];
+ patientHasFile = json['PatientHasFile'];
+ patientMergedIDs = json['PatientMergedIDs'];
+ patientOutSA = json['PatientOutSA'];
+ patientShareRequestID = json['PatientShareRequestID'];
+ patientType = json['PatientType'];
+ projectIDOut = json['ProjectIDOut'];
+ returnMessage = json['ReturnMessage'];
+ sMSLoginRequired = json['SMSLoginRequired'];
+ servicePrivilegeList = json['ServicePrivilege_List'];
+ sharePatientName = json['SharePatientName'];
+ verificationCode = json['VerificationCode'];
+ email = json['email'];
+ errorList = json['errorList'];
+ hasFile = json['hasFile'];
+ isActiveCode = json['isActiveCode'];
+ isMerged = json['isMerged'];
+ isNeedUserAgreement = json['isNeedUserAgreement'];
+ isSMSSent = json['isSMSSent'];
+ memberList = json['memberList'];
+ message = json['message'];
+ statusCode = json['statusCode'];
+ }catch (e){
+ var asd ="";
+ print(e);
+
}
- getResponseFileList = json['GetResponseFileList'];
- isHMGPatient = json['IsHMGPatient'];
- isLoginSuccessfully = json['IsLoginSuccessfully'];
- isNeedUpdateIdintificationNo = json['IsNeedUpdateIdintificationNo'];
- kioskSendSMS = json['KioskSendSMS'];
- list = json['List'];
- listAskHabibMobileLoginInfo = json['List_AskHabibMobileLoginInfo'];
- listAskHabibPatientFile = json['List_AskHabibPatientFile'];
- listMergeFiles = json['List_MergeFiles'];
- listMobileLoginInfo = json['List_MobileLoginInfo'];
- listPatientCount = json['List_PatientCount'];
- logInTokenID = json['LogInTokenID'];
- mohemmPrivilegeList = json['MohemmPrivilege_List'];
- pateintID = json['PateintID'];
- patientBloodType = json['PatientBloodType'];
- patientERDriverFile = json['PatientER_DriverFile'];
- patientERDriverFileList = json['PatientER_DriverFileList'];
- patientHasFile = json['PatientHasFile'];
- patientMergedIDs = json['PatientMergedIDs'];
- patientOutSA = json['PatientOutSA'];
- patientShareRequestID = json['PatientShareRequestID'];
- patientType = json['PatientType'];
- projectIDOut = json['ProjectIDOut'];
- returnMessage = json['ReturnMessage'];
- sMSLoginRequired = json['SMSLoginRequired'];
- servicePrivilegeList = json['ServicePrivilege_List'];
- sharePatientName = json['SharePatientName'];
- verificationCode = json['VerificationCode'];
- email = json['email'];
- errorList = json['errorList'];
- hasFile = json['hasFile'];
- isActiveCode = json['isActiveCode'];
- isMerged = json['isMerged'];
- isNeedUserAgreement = json['isNeedUserAgreement'];
- isSMSSent = json['isSMSSent'];
- memberList = json['memberList'];
- message = json['message'];
- statusCode = json['statusCode'];
}
Map toJson() {
@@ -287,7 +301,7 @@ class GetAllSharedRecordsByStatusList {
int responseID;
int regionID;
int status;
- Null isActive;
+ dynamic isActive;
String editedOn;
String createdOn;
String emaiLAddress;
diff --git a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
index ea98921d..ea699381 100644
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
@@ -10,9 +10,10 @@ import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/parking_page.da
import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart';
import 'package:diplomaticquarterapp/pages/ChildVaccines/child_vaccines_page.dart';
+import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart';
+import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart';
import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
-import 'package:diplomaticquarterapp/pages/family/my-family.dart';
import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
@@ -22,6 +23,7 @@ import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/services)contaniner.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
@@ -29,6 +31,11 @@ import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart';
class AllHabibMedicalService extends StatefulWidget {
+ //TODO
+ final Function goToMyProfile;
+
+ AllHabibMedicalService({Key key, this.goToMyProfile});
+
@override
_AllHabibMedicalServiceState createState() => _AllHabibMedicalServiceState();
}
@@ -60,47 +67,58 @@ class _AllHabibMedicalServiceState extends State {
shrinkWrap: true,
children: [
Container(
+ margin: EdgeInsets.all(8),
width: double.infinity,
- height: 190,
+ height: 150,
decoration: BoxDecoration(
- image: DecorationImage(
- image: ExactAssetImage('assets/images/timeline_bg.png'),
- fit: BoxFit.cover,
- ),
- ),
+ image: DecorationImage(
+ image: ExactAssetImage('assets/images/Weather_img.png'),
+ fit: BoxFit.cover,
+ ),
+ borderRadius: BorderRadius.circular(8.0)),
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 10.0),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- 'Health Weather Indicators',
- style: TextStyle(
+ child: Row(
+ children: [
+ Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Texts(
+ TranslationBase.of(context)
+ .healthWeatherIndicators,
color: Colors.white,
- fontSize: 22.0,
fontWeight: FontWeight.w600,
),
- ),
- SizedBox(
- height: 35.0,
- ),
- Text(
- 'Health Tips Based On Current Weather',
- style: TextStyle(
+ Texts(
+ TranslationBase.of(context).healthTipsBasedOnCurrentWeather,
color: Colors.white,
+ fontSize: 14,
),
+ ],
+ ),
+ Expanded(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
+ children: [
+ Image.asset('assets/images/Weather_ico.png',width: 80,height: 80,),
+ Texts(
+ TranslationBase.of(context).moreDetails,
+ color: Colors.white,
+ decoration: TextDecoration.underline,
+ ),
+ ],
),
- ]),
+ )
+ ],
+ ),
),
),
ServicesContainer(
- onTap: () => Navigator.push(
- context,
- FadePage(
- page: MedicalProfilePage(),
- ),
- ),
+ onTap: () {
+ Navigator.pop(context);
+ widget.goToMyProfile();
+ },
imageLocation:
'assets/images/new-design/my_file_bottom_bar.png',
title: TranslationBase.of(context).myMedicalFile,
@@ -314,7 +332,7 @@ class _AllHabibMedicalServiceState extends State {
onTap: () => Navigator.push(
context,
FadePage(
- page: ParkingPage(),
+ page: FindUsPage(),
),
),
imageLocation: 'assets/images/new-design/find_us_icon.png',
diff --git a/lib/pages/Blood/confirm_payment_page.dart b/lib/pages/Blood/confirm_payment_page.dart
index cc5df0a6..9ad6d68f 100644
--- a/lib/pages/Blood/confirm_payment_page.dart
+++ b/lib/pages/Blood/confirm_payment_page.dart
@@ -213,6 +213,9 @@ class ConfirmPaymentPage extends StatelessWidget {
appo.projectID.toString(),
authenticatedUser.emailAddress,
paymentMethod,
+ authenticatedUser.patientType,
+ authenticatedUser.firstName,
+ authenticatedUser.patientID,
authenticatedUser,
browser);
}
@@ -269,7 +272,7 @@ class ConfirmPaymentPage extends StatelessWidget {
DoctorsListService service = new DoctorsListService();
String paymentReference = res['Fort_id'].toString();
service
- .createAdvancePayment(appo, res['Amount'], res['Fort_id'],
+ .createAdvancePayment(appo, appo.projectID.toString(), res['Amount'], res['Fort_id'],
res['PaymentMethod'], AppGlobal.context)
.then((res) {
print(res['OnlineCheckInAppointments'][0]['AdvanceNumber']);
diff --git a/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart b/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart
index 8dd2b29e..d165a895 100644
--- a/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart
+++ b/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart
@@ -6,12 +6,14 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/AdvanceModel.dart';
import 'package:diplomaticquarterapp/core/model/my_balance/patient_info_and_mobile_number.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
import 'package:smart_progress_bar/smart_progress_bar.dart';
class ConfirmSMSDialog extends StatefulWidget {
@@ -97,6 +99,7 @@ class _ConfirmSMSDialogState extends State {
@override
Widget build(BuildContext context) {
+ ProjectViewModel projectViewModel = Provider.of(context);
return BaseView(
builder: (_, model, w) => Dialog(
elevation: 0.6,
@@ -107,20 +110,18 @@ class _ConfirmSMSDialogState extends State {
Container(
width: double.infinity,
height: 40,
- color: Colors.grey[700],
- child: Row(
- crossAxisAlignment: CrossAxisAlignment.center,
+ color: Theme.of(context).primaryColor,
+ child: Stack(
+
children: [
- Expanded(
- flex: 4,
- child: Center(
- child: Texts(
+ Center(
+ child: Texts(
'SMS',
color: Colors.white,
textAlign: TextAlign.center,
- ))),
- Expanded(
- flex: 1,
+ ),
+ ),
+ Positioned(child: Container(
child: InkWell(
onTap: () => Navigator.pop(context),
child: Container(
@@ -131,8 +132,12 @@ class _ConfirmSMSDialogState extends State {
color: Colors.grey[900],
)),
),
+ ),
+ left: projectViewModel.isArabic? 2:0,
+ right: projectViewModel.isArabic? 0:2,
)
],
+
),
),
Image.asset(
diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart
index b0110d2b..fa69d913 100644
--- a/lib/pages/BookAppointment/BookConfirm.dart
+++ b/lib/pages/BookAppointment/BookConfirm.dart
@@ -3,10 +3,12 @@ import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResu
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
import 'package:diplomaticquarterapp/models/Appointments/PatientShareResposne.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
+import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -100,7 +102,7 @@ class _BookConfirmState extends State {
fit: BoxFit.fill, height: 70.0, width: 70.0),
),
Container(
- width: MediaQuery.of(context).size.width * 0.6,
+ width: MediaQuery.of(context).size.width * 0.58,
margin: EdgeInsets.fromLTRB(20.0, 5.0, 10.0, 5.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -302,7 +304,7 @@ class _BookConfirmState extends State {
width: 60.0),
),
Container(
- width: MediaQuery.of(context).size.width * 0.6,
+ width: MediaQuery.of(context).size.width * 0.58,
margin: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -382,8 +384,10 @@ class _BookConfirmState extends State {
cancelAppointment(DoctorList docObject, AppoitmentAllHistoryResultList appo,
BuildContext context) {
ConfirmDialog.closeAlertDialog(context);
+ GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService();
service.cancelAppointment(appo, context).then((res) {
+ GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
Future.delayed(new Duration(milliseconds: 1500), () {
if (!widget.isLiveCareAppointment) {
@@ -397,11 +401,12 @@ class _BookConfirmState extends State {
}
}).catchError((err) {
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ GifLoaderDialogUtils.hideDialog(context);
+ });
}
insertAppointment(context, DoctorList docObject) {
+ GifLoaderDialogUtils.showMyDialog(context);
AppoitmentAllHistoryResultList appo;
widget.service
.insertAppointment(
@@ -421,6 +426,7 @@ class _BookConfirmState extends State {
docObject.projectID, docObject);
});
} else {
+ GifLoaderDialogUtils.hideDialog(context);
appo = new AppoitmentAllHistoryResultList();
appo.appointmentNo = res['SameClinicApptList'][0]['AppointmentNo'];
appo.clinicID = res['SameClinicApptList'][0]['DoctorID'];
@@ -445,11 +451,11 @@ class _BookConfirmState extends State {
}).catchError((err) {
AppToast.showErrorToast(message: err);
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
insertLiveCareScheduledAppointment(context, DoctorList docObject) {
+ GifLoaderDialogUtils.showMyDialog(context);
AppoitmentAllHistoryResultList appo;
widget.service
.insertLiveCareScheduleAppointment(
@@ -470,6 +476,7 @@ class _BookConfirmState extends State {
docObject.clinicID, docObject.projectID, docObject);
});
} else {
+ GifLoaderDialogUtils.hideDialog(context);
appo = new AppoitmentAllHistoryResultList();
appo.appointmentNo = res['SameClinicApptList'][0]['AppointmentNo'];
appo.clinicID = res['SameClinicApptList'][0]['DoctorID'];
@@ -507,13 +514,16 @@ class _BookConfirmState extends State {
widget.patientShareResponse = new PatientShareResponse.fromJson(res);
navigateToBookSuccess(context, docObject, widget.patientShareResponse);
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: err);
+ navigateToHome(context);
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
getLiveCareAppointmentPatientShare(context, String appointmentNo,
int clinicID, int projectID, DoctorList docObject) {
+ GifLoaderDialogUtils.hideDialog(context);
widget.service
.getLiveCareAppointmentPatientShare(
appointmentNo, clinicID, projectID, context)
@@ -522,9 +532,11 @@ class _BookConfirmState extends State {
widget.patientShareResponse = new PatientShareResponse.fromJson(res);
navigateToBookSuccess(context, docObject, widget.patientShareResponse);
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: err);
+ navigateToHome(context);
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
String getTime(DateTime dateTime) {
@@ -579,8 +591,13 @@ class _BookConfirmState extends State {
}
}
+ Future navigateToHome(context) async {
+ Navigator.of(context).popAndPushNamed(HOME);
+ }
+
Future navigateToBookSuccess(context, DoctorList docObject,
PatientShareResponse patientShareResponse) async {
+ GifLoaderDialogUtils.hideDialog(context);
Navigator.push(
context,
MaterialPageRoute(
diff --git a/lib/pages/BookAppointment/BookSuccess.dart b/lib/pages/BookAppointment/BookSuccess.dart
index 34dbdc2f..82248560 100644
--- a/lib/pages/BookAppointment/BookSuccess.dart
+++ b/lib/pages/BookAppointment/BookSuccess.dart
@@ -8,10 +8,12 @@ import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:smart_progress_bar/smart_progress_bar.dart';
import 'QRCode.dart';
@@ -21,6 +23,8 @@ class BookSuccess extends StatefulWidget {
DoctorList docObject;
MyInAppBrowser browser;
+ final ChromeSafariBrowser chromeBrowser =
+ new MyChromeSafariBrowser(new MyInAppBrowser());
String appoDateFormatted;
String appoTimeFormatted;
@@ -78,12 +82,14 @@ class _BookSuccessState extends State {
width: 80.0),
),
Container(
+ width: MediaQuery.of(context).size.width * 0.62,
margin: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
Text(widget.docObject.projectName,
+ overflow: TextOverflow.clip,
style: _getTextStyling()),
Container(
margin: EdgeInsets.only(top: 5.0),
@@ -93,6 +99,7 @@ class _BookSuccessState extends State {
Container(
margin: EdgeInsets.only(top: 5.0, bottom: 3.0),
child: Text(widget.docObject.clinicName,
+ overflow: TextOverflow.clip,
style: _getTextStyling()),
),
Container(
@@ -101,6 +108,7 @@ class _BookSuccessState extends State {
widget.appoDateFormatted +
", " +
widget.appoTimeFormatted,
+ overflow: TextOverflow.clip,
style: _getTextStyling()),
),
Container(
@@ -110,7 +118,7 @@ class _BookSuccessState extends State {
widget.docObject.doctorTitle +
" " +
widget.docObject.name,
- overflow: TextOverflow.ellipsis,
+ overflow: TextOverflow.clip,
style: _getTextStyling()),
),
],
@@ -230,9 +238,10 @@ class _BookSuccessState extends State {
children: [
_getBulletPoint("1"),
Container(
+ width: MediaQuery.of(context).size.width * 0.8,
child: Text(
"Please confirm the appointment to avoid the cancellation",
- overflow: TextOverflow.fade,
+ overflow: TextOverflow.clip,
style: TextStyle(fontSize: 13.0)),
),
],
@@ -294,7 +303,8 @@ class _BookSuccessState extends State {
appo.appointmentNo =
widget.patientShareResponse.appointmentNo;
appo.serviceID = widget.patientShareResponse.serviceID;
- appo.isLiveCareAppointment = widget.patientShareResponse.isLiveCareAppointment;
+ appo.isLiveCareAppointment =
+ widget.patientShareResponse.isLiveCareAppointment;
appo.doctorID = widget.patientShareResponse.doctorID;
confirmAppointment(appo);
},
@@ -314,7 +324,7 @@ class _BookSuccessState extends State {
minWidth: MediaQuery.of(context).size.width * 0.7,
height: 45.0,
child: RaisedButton(
- color: new Color(0xFFc5272d),
+ color: new Color(0xFF40ACC9),
textColor: Colors.white,
disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4),
@@ -340,8 +350,8 @@ class _BookSuccessState extends State {
confirmAppointment(AppoitmentAllHistoryResultList appo) {
DoctorsListService service = new DoctorsListService();
service
- .confirmAppointment(
- appo.appointmentNo, appo.clinicID, appo.projectID, appo.isLiveCareAppointment, context)
+ .confirmAppointment(appo.appointmentNo, appo.clinicID, appo.projectID,
+ appo.isLiveCareAppointment, context)
.then((res) {
if (res['MessageStatus'] == 1) {
AppToast.showSuccessToast(message: res['ErrorEndUserMessage']);
@@ -483,7 +493,7 @@ class _BookSuccessState extends State {
minWidth: MediaQuery.of(context).size.width * 0.7,
height: 45.0,
child: RaisedButton(
- color: new Color(0xFFc5272d),
+ color: new Color(0xFF40ACC9),
textColor: Colors.white,
disabledTextColor: Colors.white,
disabledColor: new Color(0xFFbcc2c4),
@@ -541,22 +551,34 @@ class _BookSuccessState extends State {
AuthenticatedUser authenticatedUser,
double amount,
PatientShareResponse patientShareResponse,
- AppoitmentAllHistoryResultList appo) {
- widget.browser = new MyInAppBrowser(
- onExitCallback: onBrowserExit,
- appo: appo,
- onLoadStartCallback: onBrowserLoadStart);
-
- widget.browser.openPaymentBrowser(
- amount,
- "Appointment check in",
- Utils.getAppointmentTransID(
- appo.projectID, appo.clinicID, appo.appointmentNo),
- appo.projectID.toString(),
- authenticatedUser.emailAddress,
- paymentMethod,
- authenticatedUser,
- widget.browser);
+ AppoitmentAllHistoryResultList appo) async {
+ if (paymentMethod == "ApplePay") {
+ await widget.chromeBrowser.open(
+ url: "https://flutter.dev/",
+ options: ChromeSafariBrowserClassOptions(
+ android: AndroidChromeCustomTabsOptions(
+ addDefaultShareMenuItem: false),
+ ios: IOSSafariOptions(barCollapsingEnabled: true)));
+ } else {
+ widget.browser = new MyInAppBrowser(
+ onExitCallback: onBrowserExit,
+ appo: appo,
+ onLoadStartCallback: onBrowserLoadStart);
+
+ widget.browser.openPaymentBrowser(
+ amount,
+ "Appointment check in",
+ Utils.getAppointmentTransID(
+ appo.projectID, appo.clinicID, appo.appointmentNo),
+ appo.projectID.toString(),
+ authenticatedUser.emailAddress,
+ paymentMethod,
+ authenticatedUser.patientType,
+ authenticatedUser.firstName,
+ authenticatedUser.patientID,
+ authenticatedUser,
+ widget.browser);
+ }
}
onBrowserLoadStart(String url) {
@@ -586,6 +608,31 @@ class _BookSuccessState extends State {
}
checkPaymentStatus(AppoitmentAllHistoryResultList appo) {
+ GifLoaderDialogUtils.showMyDialog(context);
+ DoctorsListService service = new DoctorsListService();
+ service
+ .checkPaymentStatus(
+ Utils.getAppointmentTransID(
+ appo.projectID, appo.clinicID, appo.appointmentNo),
+ context)
+ .then((res) {
+ print("Printing Payment Status Reponse!!!!");
+ print(res);
+ String paymentInfo = res['Response_Message'];
+ if (paymentInfo == 'Success') {
+ createAdvancePayment(res, appo);
+ } else {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: res['Response_Message']);
+ }
+ }).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: err);
+ print(err);
+ });
+ }
+
+ getApplePayAPQ(AppoitmentAllHistoryResultList appo) {
DoctorsListService service = new DoctorsListService();
service
.checkPaymentStatus(
@@ -611,8 +658,8 @@ class _BookSuccessState extends State {
DoctorsListService service = new DoctorsListService();
String paymentReference = res['Fort_id'].toString();
service
- .createAdvancePayment(
- appo, res['Amount'], res['Fort_id'], res['PaymentMethod'], context)
+ .createAdvancePayment(appo, appo.projectID.toString(), res['Amount'],
+ res['Fort_id'], res['PaymentMethod'], context)
.then((res) {
print(res['OnlineCheckInAppointments'][0]['AdvanceNumber']);
addAdvancedNumberRequest(
@@ -620,9 +667,10 @@ class _BookSuccessState extends State {
paymentReference,
appo.appointmentNo.toString());
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: err);
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
addAdvancedNumberRequest(
@@ -635,9 +683,10 @@ class _BookSuccessState extends State {
print(res);
getAppoQR(context);
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: err);
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
Widget _getQRAppo() {
@@ -791,11 +840,13 @@ class _BookSuccessState extends State {
.generateAppointmentQR(widget.patientShareResponse, context)
.then((res) {
print(res);
+ GifLoaderDialogUtils.hideDialog(context);
navigateToQR(context, res['AppointmentQR']);
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
+ AppToast.showErrorToast(message: err);
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
Future navigateToQR(context, String appoQR) async {
diff --git a/lib/pages/BookAppointment/BookingOptions.dart b/lib/pages/BookAppointment/BookingOptions.dart
index b6dc5500..83af454f 100644
--- a/lib/pages/BookAppointment/BookingOptions.dart
+++ b/lib/pages/BookAppointment/BookingOptions.dart
@@ -31,6 +31,7 @@ class _BookingOptionsState extends State {
Widget build(BuildContext context) {
return AppScaffold(
isShowAppBar: widget.isAppbar,
+ isShowDecPage: false,
appBarTitle: TranslationBase.of(context).bookAppo,
body: Container(
margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
diff --git a/lib/pages/BookAppointment/DentalComplaints.dart b/lib/pages/BookAppointment/DentalComplaints.dart
index 9d3da450..34a7e1e1 100644
--- a/lib/pages/BookAppointment/DentalComplaints.dart
+++ b/lib/pages/BookAppointment/DentalComplaints.dart
@@ -55,7 +55,7 @@ class _DentalComplaintsState extends State {
}
getLanguageID() async {
- languageID = await sharedPref.getString(APP_LANGUAGE);
+ languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
}
getChiefComplaintsList() {
diff --git a/lib/pages/BookAppointment/DoctorProfile.dart b/lib/pages/BookAppointment/DoctorProfile.dart
index d6986f6f..6864e6b1 100644
--- a/lib/pages/BookAppointment/DoctorProfile.dart
+++ b/lib/pages/BookAppointment/DoctorProfile.dart
@@ -40,6 +40,8 @@ class _DoctorProfileState extends State
bool showFooterButton = false;
var event = RobotProvider();
+ AppSharedPreferences sharedPref = AppSharedPreferences();
+
@override
void initState() {
_tabController = new TabController(
@@ -69,6 +71,7 @@ class _DoctorProfileState extends State
return AppScaffold(
appBarTitle: TranslationBase.of(context).bookAppo,
isShowAppBar: true,
+ isShowDecPage: false,
bottomSheet: showFooterButton
? Container(
width: MediaQuery.of(context).size.width,
@@ -153,7 +156,7 @@ class _DoctorProfileState extends State
child: Text(
"(" +
widget.doctor.noOfPatientsRate.toString() +
- " Reviews)",
+ " " + TranslationBase.of(context).reviews + ")",
style: TextStyle(
fontSize: 14.0,
color: Colors.blue[800],
@@ -211,7 +214,6 @@ class _DoctorProfileState extends State
}
getPatientData() async {
- AppSharedPreferences sharedPref = AppSharedPreferences();
if (await sharedPref.getObject(USER_PROFILE) != null) {
var data =
AuthenticatedUser.fromJson(await sharedPref.getObject(USER_PROFILE));
@@ -222,14 +224,14 @@ class _DoctorProfileState extends State
}
}
- void goToBookConfirm() {
+ void goToBookConfirm() async {
if (DocAvailableAppointments.areSlotsAvailable) {
- if (widget.authUser.patientID != null) {
+ if (await sharedPref.getObject(USER_PROFILE) != null) {
navigateToBookConfirm(context);
} else {
ConfirmDialog dialog = new ConfirmDialog(
context: context,
- confirmMessage: "You have to login to use this service",
+ confirmMessage: TranslationBase.of(context).loginToUseService,
okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => {navigateToLogin()},
diff --git a/lib/pages/BookAppointment/QRCode.dart b/lib/pages/BookAppointment/QRCode.dart
index c632a26e..e92c2348 100644
--- a/lib/pages/BookAppointment/QRCode.dart
+++ b/lib/pages/BookAppointment/QRCode.dart
@@ -151,6 +151,7 @@ class _QRCodeState extends State {
),
),
Container(
+ margin: EdgeInsets.zero,
alignment: Alignment.bottomCenter,
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
@@ -252,7 +253,9 @@ class _QRCodeState extends State {
ConfirmDialog.closeAlertDialog(context);
AppToast.showErrorToast(message: err);
print(err);
- }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ }).showProgressBar(
+ text: "Loading",
+ backgroundColor: Colors.blue.withOpacity(0.6));
},
cancelFunction: () => {});
dialog.showAlertDialog(context);
@@ -290,9 +293,11 @@ class _QRCodeState extends State {
String getDoctorSpeciality(List docSpecial) {
String docSpeciality = "";
- docSpecial.forEach((v) {
- docSpeciality = docSpeciality + v + "\n";
- });
+ if (docSpecial != null && docSpecial.length != 0) {
+ docSpecial.forEach((v) {
+ docSpeciality = docSpeciality + v + "\n";
+ });
+ }
return docSpeciality;
}
}
diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
index 3e9ae0cd..70b6aaa0 100644
--- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
+++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
@@ -1,13 +1,14 @@
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
import 'package:diplomaticquarterapp/models/Appointments/FreeSlot.dart';
import 'package:diplomaticquarterapp/models/Appointments/timeSlot.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
-import 'package:smart_progress_bar/smart_progress_bar.dart';
import 'package:table_calendar/table_calendar.dart';
import '../../../uitl/date_uitl.dart';
@@ -49,6 +50,8 @@ class _DocAvailableAppointmentsState extends State
ScrollController _scrollController;
+ var language;
+
@override
void initState() {
// TODO: implement initState
@@ -62,6 +65,7 @@ class _DocAvailableAppointmentsState extends State
};
WidgetsBinding.instance.addPostFrameCallback((_) async {
+ getCurrentLanguage();
if (widget.isLiveCareAppointment)
getDoctorScheduledFreeSlots(context, widget.doctor);
else {
@@ -88,7 +92,8 @@ class _DocAvailableAppointmentsState extends State
void _onDaySelected(DateTime day, List events) {
final DateFormat formatter = DateFormat('yyyy-MM-dd');
setState(() {
- this.selectedDate = DateUtil.getMonthDayYearDateFormatted(day);
+ this.selectedDate =
+ DateUtil.getWeekDayMonthDayYearDateFormatted(day, language);
openTimeSlotsPickerForDate(day, docFreeSlots);
DocAvailableAppointments.selectedDate = formatter.format(day);
print(DocAvailableAppointments.selectedDate);
@@ -154,7 +159,7 @@ class _DocAvailableAppointmentsState extends State
Widget _buildTableCalendarWithBuilders() {
return TableCalendar(
- locale: 'en_US',
+ locale: language == "en" ? 'en_US' : 'ar_SA',
calendarController: _calendarController,
events: _events,
initialCalendarFormat: CalendarFormat.month,
@@ -219,9 +224,8 @@ class _DocAvailableAppointmentsState extends State
),
);
},
- markersBuilder: (context, date, events, holidays) {
+ markersBuilder: (context, date, events, _) {
final children = [];
-
if (events.isNotEmpty) {
children.add(
Positioned(
@@ -235,8 +239,8 @@ class _DocAvailableAppointmentsState extends State
return children;
},
),
- onDaySelected: (date, events,format) {
- _onDaySelected(date, events);
+ onDaySelected: (date, event, _) {
+ _onDaySelected(date, event);
_animationController.forward(from: 0.0);
},
onVisibleDaysChanged: _onVisibleDaysChanged,
@@ -287,8 +291,8 @@ class _DocAvailableAppointmentsState extends State
setState(() {
DocAvailableAppointments.selectedDate = dateFormatter
.format(DateUtil.convertStringToDate(freeSlotsResponse[0]));
- selectedDate = DateUtil.getMonthDayYearDateFormatted(
- DateUtil.convertStringToDate(freeSlotsResponse[0]));
+ selectedDate = DateUtil.getWeekDayMonthDayYearDateFormatted(
+ DateUtil.convertStringToDate(freeSlotsResponse[0]), language);
selectedDateJSON = freeSlotsResponse[0];
});
openTimeSlotsPickerForDate(
@@ -331,11 +335,13 @@ class _DocAvailableAppointmentsState extends State
}
getDoctorFreeSlots(context, DoctorList docObject) {
+ GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService();
service
.getDoctorFreeSlots(docObject.doctorID, docObject.clinicID,
docObject.projectID, context)
.then((res) {
+ GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
if (res['FreeTimeSlots'].length != 0) {
freeSlotsResponse = res['FreeTimeSlots'];
@@ -350,16 +356,17 @@ class _DocAvailableAppointmentsState extends State
}
}).catchError((err) {
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
getDoctorScheduledFreeSlots(context, DoctorList docObject) {
+ GifLoaderDialogUtils.showMyDialog(context);
DoctorsListService service = new DoctorsListService();
service
.getDoctorScheduledFreeSlots(docObject.doctorID, docObject.clinicID,
docObject.projectID, docObject.serviceID, context)
.then((res) {
+ GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
if (res['PatientER_DoctorFreeSlots'].length != 0) {
freeSlotsResponse = res['PatientER_DoctorFreeSlots'];
@@ -374,8 +381,15 @@ class _DocAvailableAppointmentsState extends State
}
}).catchError((err) {
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
+ }
+
+ getCurrentLanguage() async {
+ var languageID =
+ await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+ setState(() {
+ this.language = languageID;
+ });
}
Widget _buildEventsMarker(DateTime date, List events) {
diff --git a/lib/pages/BookAppointment/components/DocInfo.dart b/lib/pages/BookAppointment/components/DocInfo.dart
index ff24b1ca..aa6e3b9f 100644
--- a/lib/pages/BookAppointment/components/DocInfo.dart
+++ b/lib/pages/BookAppointment/components/DocInfo.dart
@@ -1,9 +1,9 @@
import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
class DoctorInformation extends StatelessWidget {
-
DoctorProfileList docProfileList;
DoctorInformation({@required this.docProfileList});
@@ -27,8 +27,8 @@ class DoctorInformation extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
- Image.asset(
- "assets/images/new-design/doctor_information_icon.png"),
+ SvgPicture.asset(
+ "assets/images/DQ/doctor_information_icon.svg"),
Container(
margin: EdgeInsets.fromLTRB(15.0, 5.0, 15.0, 0.0),
child: Text(TranslationBase.of(context).docInfo,
@@ -43,12 +43,21 @@ class DoctorInformation extends StatelessWidget {
child: Table(
children: [
TableRow(children: [
- TableCell(child: _getHeadingText(TranslationBase.of(context).gender)),
- TableCell(child: _getHeadingText(TranslationBase.of(context).nationality)),
+ TableCell(
+ child: _getHeadingText(
+ TranslationBase.of(context).gender)),
+ TableCell(
+ child: _getHeadingText(
+ TranslationBase.of(context).nationality)),
]),
TableRow(children: [
- TableCell(child: _getNormalText(docProfileList.genderDescription)),
- TableCell(child: _getNormalTextWithIcon(docProfileList.nationalityName, docProfileList.nationalityFlagURL)),
+ TableCell(
+ child: _getNormalText(
+ docProfileList.genderDescription)),
+ TableCell(
+ child: _getNormalTextWithIcon(
+ docProfileList.nationalityName,
+ docProfileList.nationalityFlagURL)),
]),
],
),
@@ -82,13 +91,14 @@ class DoctorInformation extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
- Image.asset(
- "assets/images/new-design/doctor_qualification_icon.png"),
+ SvgPicture.asset(
+ "assets/images/DQ/doctor_qualification_icon.svg"),
Container(
margin: EdgeInsets.fromLTRB(15.0, 5.0, 15.0, 0.0),
- child: Text(TranslationBase.of(context).docQualifications,
+ child: Text(
+ TranslationBase.of(context).docQualifications,
style:
- TextStyle(fontSize: 16.0, letterSpacing: 0.8)),
+ TextStyle(fontSize: 16.0, letterSpacing: 0.8)),
),
],
),
@@ -146,10 +156,7 @@ class DoctorInformation extends StatelessWidget {
color: Colors.grey[700])),
Container(
margin: EdgeInsets.only(left: 5.0, right: 5.0),
- child: Image.network(
- icon,
- width: 18.0,
- height: 18.0),
+ child: Image.network(icon, width: 18.0, height: 18.0),
),
],
),
diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart
index 9d833db1..7943e423 100644
--- a/lib/pages/BookAppointment/components/SearchByClinic.dart
+++ b/lib/pages/BookAppointment/components/SearchByClinic.dart
@@ -8,8 +8,8 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DentalComplaints.dart
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart';
-import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
import 'package:flutter/material.dart';
@@ -17,7 +17,9 @@ import 'package:smart_progress_bar/smart_progress_bar.dart';
class SearchByClinic extends StatefulWidget {
final List clnicIds;
+
SearchByClinic({this.clnicIds});
+
@override
_SearchByClinicState createState() => _SearchByClinicState();
}
@@ -26,11 +28,13 @@ class _SearchByClinicState extends State {
bool nearestAppo = false;
String dropdownValue;
String projectDropdownValue;
+
// var event = RobotProvider();
List clinicsList = [];
List projectsList = [];
bool isMobileAppDentalAllow = false;
bool isLoaded = false;
+
@override
void initState() {
WidgetsBinding.instance.addPostFrameCallback((_) => getClinicsList());
@@ -47,7 +51,7 @@ class _SearchByClinicState extends State {
Row(
children: [
Checkbox(
- activeColor: new Color(0xFFc5272d),
+ activeColor: new Color(0xFF40ACC9),
value: nearestAppo,
onChanged: (bool value) {
setState(() {
@@ -77,12 +81,6 @@ class _SearchByClinicState extends State {
}
});
},
- // trailing: Icon(TranslationBase.of(AppGlobal.context)
- // .locale
- // .languageCode ==
- // 'en'
- // ? Icons.keyboard_arrow_right
- // : Icons.keyboard_arrow_left),
title: Text(result.clinicDescription,
style: TextStyle(
fontSize: 14.0,
@@ -104,7 +102,7 @@ class _SearchByClinicState extends State {
width: MediaQuery.of(context).size.width,
child: DropdownButtonHideUnderline(
child: DropdownButton(
- hint: new Text("Select Clinic"),
+ hint: new Text(TranslationBase.of(context).selectClinic),
value: dropdownValue,
items: clinicsList.map((item) {
return new DropdownMenuItem(
@@ -168,27 +166,21 @@ class _SearchByClinicState extends State {
}
getClinicsList() {
+ GifLoaderDialogUtils.showMyDialog(context);
ClinicListService service = new ClinicListService();
- service
- .getClinicsList(context)
- .then((res) {
- if (res['MessageStatus'] == 1) {
- setState(() {
- isMobileAppDentalAllow = res['ISMobileAppDentalAllow'];
- res['ListClinicCentralized'].forEach((v) {
- clinicsList.add(new ListClinicCentralized.fromJson(v));
- });
- });
- } else {}
- })
- .catchError((err) {
- print(err);
- })
- .showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6))
- .then((value) {
- getProjectsList();
+ service.getClinicsList(context).then((res) {
+ if (res['MessageStatus'] == 1) {
+ setState(() {
+ isMobileAppDentalAllow = res['ISMobileAppDentalAllow'];
+ res['ListClinicCentralized'].forEach((v) {
+ clinicsList.add(new ListClinicCentralized.fromJson(v));
+ });
});
+ getProjectsList();
+ } else {}
+ }).catchError((err) {
+ print(err);
+ });
}
getProjectsList() {
@@ -199,23 +191,24 @@ class _SearchByClinicState extends State {
res['ListProject'].forEach((v) {
projectsList.add(new HospitalsModel.fromJson(v));
});
- print(projectsList.length);
});
+ GifLoaderDialogUtils.hideDialog(context);
filterClinic();
} else {}
}).catchError((err) {
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
getDoctorsList(BuildContext context) {
+ GifLoaderDialogUtils.showMyDialog(context);
SearchInfo searchInfo = new SearchInfo();
if (dropdownValue == "17") {
searchInfo.ProjectID = int.parse(projectDropdownValue);
searchInfo.ClinicID = int.parse(dropdownValue);
searchInfo.date = DateTime.now();
+ GifLoaderDialogUtils.hideDialog(context);
navigateToDentalComplaints(context, searchInfo);
} else {
List doctorsList = [];
@@ -231,6 +224,7 @@ class _SearchByClinicState extends State {
nearestAppo,
context)
.then((res) {
+ GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
setState(() {
if (res['DoctorList'].length != 0) {
@@ -249,17 +243,16 @@ class _SearchByClinicState extends State {
result = LinkedHashSet.from(arr).toList();
numAll = result.length;
-
navigateToSearchResults(
context, doctorsList, result, numAll, arrDistance);
} else {
AppToast.showErrorToast(message: res['ErrorEndUserMessage']);
}
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
print(err);
AppToast.showErrorToast(message: err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
}
@@ -296,8 +289,6 @@ class _SearchByClinicState extends State {
.where((i) => widget.clnicIds.indexOf(i.clinicID) > -1)
.toList();
isLoaded = true;
-
- ///print(clinicsList);
}
});
}
diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart
index 80288085..1e1945b5 100644
--- a/lib/pages/BookAppointment/components/SearchByDoctor.dart
+++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart
@@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
import 'package:smart_progress_bar/smart_progress_bar.dart';
@@ -82,6 +83,7 @@ class _SearchByDoctorState extends State {
}
getDoctorsList(BuildContext context) {
+ GifLoaderDialogUtils.showMyDialog(context);
List doctorsList = [];
DoctorsListService service = new DoctorsListService();
@@ -123,7 +125,7 @@ class _SearchByDoctorState extends State {
});
} else {}
});
-
+ GifLoaderDialogUtils.hideDialog(context);
navigateToSearchResults(
context, doctorsList, _patientDoctorAppointmentListHospital);
} else {
@@ -131,8 +133,7 @@ class _SearchByDoctorState extends State {
}
}).catchError((err) {
print(err);
- }).showProgressBar(
- text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
_onDocTextChanged(content) {
diff --git a/lib/pages/BookAppointment/widgets/BranchView.dart b/lib/pages/BookAppointment/widgets/BranchView.dart
index 4ba5a9d3..747775d5 100644
--- a/lib/pages/BookAppointment/widgets/BranchView.dart
+++ b/lib/pages/BookAppointment/widgets/BranchView.dart
@@ -27,6 +27,7 @@ class _BranchViewState extends State {
return AppScaffold(
appBarTitle: TranslationBase.of(context).bookAppo,
isShowAppBar: true,
+ isShowDecPage: false,
isBottomBar: false,
body: new ListView.builder(
itemBuilder: (BuildContext context, int index) {
@@ -109,7 +110,7 @@ class _ExpandableListViewState extends State {
height: 28.0,
width: 30.0,
decoration: new BoxDecoration(
- color: Colors.red,
+ color: Color(0xFF40ACC9),
shape: BoxShape.circle,
),
child: new Center(
diff --git a/lib/pages/BookAppointment/widgets/CardCommon.dart b/lib/pages/BookAppointment/widgets/CardCommon.dart
index a6cf648f..e56ba965 100644
--- a/lib/pages/BookAppointment/widgets/CardCommon.dart
+++ b/lib/pages/BookAppointment/widgets/CardCommon.dart
@@ -31,7 +31,7 @@ class CardCommon extends StatelessWidget {
child: Text(this.text,
overflow: TextOverflow.clip,
style: TextStyle(
- color: new Color(0xFFc5272d),
+ color: new Color(0xFF40ACC9),
letterSpacing: 1.0,
fontSize: 20.0)),
),
diff --git a/lib/pages/BookAppointment/widgets/DoctorView.dart b/lib/pages/BookAppointment/widgets/DoctorView.dart
index 40c0e2fc..d419e4af 100644
--- a/lib/pages/BookAppointment/widgets/DoctorView.dart
+++ b/lib/pages/BookAppointment/widgets/DoctorView.dart
@@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:flutter/material.dart';
import 'package:rating_bar/rating_bar.dart';
import 'package:smart_progress_bar/smart_progress_bar.dart';
@@ -135,12 +136,14 @@ class DoctorView extends StatelessWidget {
}
getDoctorsProfile(context, DoctorList docObject, {isAppo}) {
+ GifLoaderDialogUtils.showMyDialog(context);
List docProfileList = [];
DoctorsListService service = new DoctorsListService();
service
.getDoctorsProfile(docObject.doctorID, docObject.clinicID,
docObject.projectID, context)
.then((res) {
+ GifLoaderDialogUtils.hideDialog(context);
if (res['MessageStatus'] == 1) {
if (res['DoctorProfileList'].length != 0) {
res['DoctorProfileList'].forEach((v) {
@@ -154,7 +157,7 @@ class DoctorView extends StatelessWidget {
}
}).catchError((err) {
print(err);
- }).showProgressBar(text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6));
+ });
}
String getDate(String date) {
diff --git a/lib/pages/ChildVaccines/ChidDetailsWidget.dart b/lib/pages/ChildVaccines/ChidDetailsWidget.dart
new file mode 100644
index 00000000..bce5d54e
--- /dev/null
+++ b/lib/pages/ChildVaccines/ChidDetailsWidget.dart
@@ -0,0 +1,108 @@
+import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
+import 'package:diplomaticquarterapp/core/model/childvaccines/delete_baby_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart';
+import 'package:diplomaticquarterapp/pages/ChildVaccines/vaccinationtable_page.dart';
+import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class ChildDetailsWidget extends StatelessWidget {
+ final ChildVaccinesViewModel model;
+ final List_BabyInformationModel babyInfo;
+ DeleteBaby deleteBaby = DeleteBaby();
+
+ ChildDetailsWidget({this.model, this.babyInfo});
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ margin: EdgeInsets.only(left: 5, right: 5, bottom: 10),
+ decoration: BoxDecoration(
+ shape: BoxShape.rectangle,
+ border: Border.all(color: Colors.white, width: 0.5),
+ borderRadius: BorderRadius.all(Radius.circular(5)),
+ color: Colors.white,
+ ),
+ padding: EdgeInsets.all(12),
+ width: 200,
+ //double.infinity,
+ child: Column(
+ children: [
+ Row(children: [
+ Texts(TranslationBase.of(context).childName),
+ ]),
+ Row(children: [
+ Texts(babyInfo.babyName.trim()),
+ ]),
+ Row(children: [
+ IconButton(
+ icon: Image.asset(babyInfo.gender == 1
+ ? 'assets/images/new-design/male.png'
+ : 'assets/images/new-design/female.png'),
+ tooltip: '',
+ onPressed: () {
+ },
+ ),
+ Texts(babyInfo.genderDescription),
+ IconButton(
+ icon: Icon(
+ Icons.remove_red_eye,
+ color: Colors.red,
+ ),
+ tooltip: '',
+ onPressed: () {
+ Navigator.push(
+ context,
+ FadePage(
+ page: VaccinationTablePage(babyInfo: babyInfo,),
+ ),
+ );
+ },
+ )
+ ]),
+ Row(children: [
+ Texts(TranslationBase.of(context).childDob),
+ ]),
+ Row(
+ children: [
+ IconButton(
+ icon: new Image.asset(
+ 'assets/images/new-design/calender-secondary.png'),
+ tooltip: '',
+ ),
+ Texts(
+ DateUtil.yearMonthDay(babyInfo.dOB),
+ ),
+ ],
+ ),
+ Row(children: [
+ IconButton(
+ icon: new Image.asset('assets/images/new-design/garbage.png'),
+ tooltip: '',
+ onPressed: () async {
+ await model.deleteBabyOrders(newChild: deleteBaby);
+ deleteBaby.babyID = babyInfo.babyID;
+
+ await model.deleteBabyOrders(newChild: deleteBaby);
+ if (model.isDeleted) {
+ AppToast.showSuccessToast(message: TranslationBase.of(context).deletedChild);
+ Navigator.pop(context, model.isDeleted);
+ } else {
+ //TODO handling error
+ }
+ },
+ ),
+ Texts(TranslationBase.of(context).delete),
+ ]),
+ SizedBox(
+ height: 12,
+ ),
+ ],
+ ),
+ );
+ }
+}
diff --git a/lib/pages/ChildVaccines/child_page.dart b/lib/pages/ChildVaccines/child_page.dart
index 806a5b71..7493a492 100644
--- a/lib/pages/ChildVaccines/child_page.dart
+++ b/lib/pages/ChildVaccines/child_page.dart
@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/pages/ChildVaccines/add_newchild_page.dart'
import 'package:diplomaticquarterapp/pages/ChildVaccines/vaccinationtable_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -13,190 +14,85 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'ChidDetailsWidget.dart';
import 'dialogs/delete_child.dart';
class ChildPage extends StatefulWidget {
@override
_ChildPageState createState() => _ChildPageState();
}
-
+//TODO
class _ChildPageState extends State
with SingleTickerProviderStateMixin {
-
DeleteBaby deleteBaby = DeleteBaby();
@override
Widget build(BuildContext context) {
var checkedValue = true;
return BaseView(
- onModelReady: (model) => model.getNewUserOrders(),
- builder: (_, model, widget) => AppScaffold(
- isShowAppBar: true,
- appBarTitle: " Vaccination",
- baseViewModel: model,
- body: SingleChildScrollView(
- child: Container(
- margin: EdgeInsets.only(left: 15, right: 15, top: 70),
- child: Column(
- children: [
- ...List.generate(
- model.babyInformationModelList.length,
- (index) => Container(
- margin: EdgeInsets.only(
- left: 0, right: 0, bottom: 20),
-
- decoration: BoxDecoration(
- shape: BoxShape.rectangle,
- border: Border.all(
- color: Colors.white, width: 0.5),
- borderRadius:
- BorderRadius.all(Radius.circular(5)),
- color: Colors.white,
- ),
- padding: EdgeInsets.all(12),
- width: 200,//double.infinity,
- child: Column(
- children: [
- Row(children: [
- Texts("CHILD NAME"),
- ]),
- Row(children: [
- Texts(model
- .babyInformationModelList[index]
- .babyName
- .trim()),
- ]),
- Row(children: [
- IconButton(
- icon: Image.asset(model
- .babyInformationModelList[
- index]
- .gender ==
- 1
- ? 'assets/images/new-design/male.png'
- : 'assets/images/new-design/female.png'),
- tooltip: '',
- onPressed: () {
- setState(() {
- // _volume += 10;
- // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber);
- });
- },
- ),
- Texts(model
- .babyInformationModelList[index]
- .genderDescription),
- IconButton(
- icon: Icon(
- Icons.remove_red_eye,
- color: Colors.red,
- ),
- tooltip: '',
- onPressed: () {
- Navigator.push(
- context,
- FadePage(
-
-
- page: VaccinationTablePage(),
-
-
- ),
- );
-
- },
- )
- ]),
- Row(children: [
- Texts("Birthday"),
- ]),
- Row(children: [
- IconButton(
- icon: new Image.asset(
- 'assets/images/new-design/calender-secondary.png'),
- tooltip: '',
- onPressed: () {
- setState(() {
-
- });
- },
- ),
- Texts(DateUtil.yearMonthDay(model
- .babyInformationModelList[index]
- .dOB)),
- ]),
- Row(children: [
- IconButton(
- icon: new Image.asset(
- 'assets/images/new-design/garbage.png'),
- tooltip: '',
- onPressed: ()async {
-
- //=====================
- await model.deleteBabyOrders(newChild:deleteBaby );
-
-
- deleteBaby.babyID=model.babyInformationModelList[index]
- .babyID;
-
- await model.deleteBabyOrders(newChild:deleteBaby );
- if(model.isDeleted){
- AppToast.showSuccessToast(message: "Record Deleted");
- Navigator.pop(context,model.isDeleted);
- }else{
-
- //TODO handling error
- }
-
-
-
-
-
- },
- ),
- Texts("Delete"),
- ]),
- SizedBox(
- height: 12,
- ),
- ],
- ),
-
- ),
-
-
- )
- ],
- ))
- ),
- bottomSheet: Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
- padding: EdgeInsets.all(15),
- child: SecondaryButton(
- textColor: Colors.white,
- color: checkedValue == false
- ? Colors.white24
- : Color.fromRGBO(
- 63,
- 72,
- 74,
- 1,
- ),
- label: "ADD NEW CHILD ",
- //
- onTap: () {
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => AddNewChildPage(),
- ),
- ).then((value) {
- if (value) model.getNewUserOrders();
- });
+ onModelReady: (model) => model.getNewUserOrders(),
+ builder: (_, model, widget) => AppScaffold(
+ isShowAppBar: true,
+ appBarTitle: TranslationBase.of(context).vaccination,
+ baseViewModel: model,
+ body: SingleChildScrollView(
+ child: Container(
+ margin: EdgeInsets.only(left: 10, right: 10, top: 10),
+ child: Column(
+ children: [
+ GridView.builder(
+ shrinkWrap: true,
+ primary: false,
+ physics: NeverScrollableScrollPhysics(),
+ gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+ crossAxisCount: 2,
+ childAspectRatio: MediaQuery.of(context).size.width /
+ (MediaQuery.of(context).size.height / 1.45),
+ ),
+ itemCount: model.babyInformationModelList.length,
+ itemBuilder: (BuildContext context, int index) {
+ return ChildDetailsWidget(
+ model: model,
+ babyInfo: model.babyInformationModelList[index],
+ );
},
),
- ),
- ));
+ SizedBox(
+ height: 15,
+ ),
+ ],
+ ),
+ ),
+ ),
+ bottomSheet: Container(
+ height: MediaQuery.of(context).size.height * 0.10,
+ width: double.infinity,
+ padding: EdgeInsets.all(15),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: checkedValue == false
+ ? Colors.white24
+ : Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
+ ),
+ label: TranslationBase.of(context).addChild,
+ //
+ onTap: () {
+ Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => AddNewChildPage(),
+ ),
+ ).then((value) {
+ if (value) model.getNewUserOrders();
+ });
+ },
+ ),
+ ),
+ ),
+ );
}
}
diff --git a/lib/pages/ChildVaccines/child_vaccines_page.dart b/lib/pages/ChildVaccines/child_vaccines_page.dart
index 92f3a0be..4dd4c7f5 100644
--- a/lib/pages/ChildVaccines/child_vaccines_page.dart
+++ b/lib/pages/ChildVaccines/child_vaccines_page.dart
@@ -1,10 +1,10 @@
-
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/user_information_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
import 'package:diplomaticquarterapp/pages/ChildVaccines/child_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
@@ -13,214 +13,147 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-
-
class ChildVaccinesPage extends StatefulWidget {
@override
_ChildVaccinesPageState createState() => _ChildVaccinesPageState();
}
class _ChildVaccinesPageState extends State
- with SingleTickerProviderStateMixin{
+ with SingleTickerProviderStateMixin {
TextEditingController titleController = TextEditingController();
- var checkedValue=false;
- String addEmail="";
+ var checkedValue = false;
+ String addEmail = "";
+
@override
Widget build(BuildContext context) {
-
return BaseView(
onModelReady: (model) => model.getUserInformationRequestOrders(),
builder: (_, model, w) => AppScaffold(
- isShowAppBar: true,
- baseViewModel: model,
- appBarTitle: " Vaccination",//TranslationBase.of(context).advancePayment,
- body: SingleChildScrollView(
- physics: ScrollPhysics(),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: [
- SizedBox(
- height: 20,
- ),
-
- Padding(
- padding: const EdgeInsets.all(10.0),
- child:Container(
- child: Texts("Welcome back",fontSize: 20,),
- ) ,
- ),
- Divider(color:Colors.black , indent: 10,
- endIndent: 10,),
- SizedBox(
- height: 20,
- ),
- Padding(
- padding: const EdgeInsets.all(10.0),
- child:Container(
- child: Texts("Please ensure that the email address is up-to-date and process to view the schedule",fontSize: 20,),
- ) ,
+ isShowAppBar: true,
+ baseViewModel: model,
+ appBarTitle: TranslationBase.of(context).vaccination,
+ body: SingleChildScrollView(
+ physics: ScrollPhysics(),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
+ children: [
+ SizedBox(
+ height: 20,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(10.0),
+ child: Container(
+ child: Texts(
+ TranslationBase.of(context).welcomeBackV,
+ fontSize: 20,
),
-
- Divider(color:Colors.black , indent: 10,
- endIndent: 10,),
- Padding(
- padding: const EdgeInsets.all(10.0),
- child:Container(
-
- margin: EdgeInsets.only(left: 10, right: 10, top: 15),
- child: TextFields(
- fillColor: Colors.red,
-
- hintText: model.user.emailAddress,
- controller: titleController,
- fontSize: 20,
- hintColor: Colors.black,
- fontWeight: FontWeight.w600,
- onChanged: (text) {
- addEmail=text;
- model.user.emailAddress==addEmail?checkedValue=false:checkedValue=true;
-
-
- },
- validator: (value) {
-
- if (value == null)
- {
- return model.user.emailAddress;
-
- }
- else
-
- {
- return model.user.emailAddress;}
- },
- ),
- ),
+ ),
+ ),
+ Divider(
+ color: Colors.black,
+ indent: 10,
+ endIndent: 10,
+ ),
+ SizedBox(
+ height: 20,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(10.0),
+ child: Container(
+ child: Texts(
+ TranslationBase.of(context).instructions,
+ fontSize: 20,
),
- Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
-
- padding: EdgeInsets.all(15),
- child: SecondaryButton(
- textColor: Colors.white,
- color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,),
- label: "UPDATE EMAIL",
- //
- onTap: (){
- model.user.emailAddress=addEmail.toString();
- AppToast.showSuccessToast(
- message: "Email updated");
- // bloodDetails.city=_selectedHospital.toString();
-
- // bloodDetails.
- },
-
-
- ),
+ ),
+ ),
+ Divider(
+ color: Colors.black,
+ indent: 10,
+ endIndent: 10,
+ ),
+ Padding(
+ padding: const EdgeInsets.all(10.0),
+ child: Container(
+ margin: EdgeInsets.only(left: 10, right: 10, top: 15),
+ child: TextFields(
+ fillColor: Colors.red,
+ hintText: model.user.emailAddress,
+ controller: titleController,
+ fontSize: 20,
+ hintColor: Colors.black,
+ fontWeight: FontWeight.w600,
+ onChanged: (text) {
+ addEmail = text;
+ model.user.emailAddress == addEmail
+ ? checkedValue = false
+ : checkedValue = true;
+ },
+ validator: (value) {
+ if (value == null) {
+ return model.user.emailAddress;
+ } else {
+ return model.user.emailAddress;
+ }
+ },
),
- Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
-
- padding: EdgeInsets.all(15),
- child: SecondaryButton(
- textColor: Colors.white,
- color: Color.fromRGBO(63, 72, 74, 1,),
- label: " VIEW LIST OF CHILDREN",
- //
- onTap: () => Navigator.push(
- context,
- FadePage(
- page: ChildPage(),
-
-
-
- ),
+ ),
+ ),
+ Container(
+ height: MediaQuery.of(context).size.height * 0.10,
+ width: double.infinity,
+ padding: EdgeInsets.all(15),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: checkedValue == false
+ ? Colors.white24
+ : Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
),
-
-
- ),
- ),
-
- // Texts(
- // // TranslationBase.of(context).advancePaymentLabel,
- // model.user.emailAddress,
- // textAlign: TextAlign.center,
- // ),
- SizedBox(
- height: 12,
- ),
- SizedBox(
- height: 12,
- ),
- SizedBox(
- height: 12,
- ),
-
- SizedBox(
- height: 12,
- ),
-
- SizedBox(
- height: 12,
+ label: TranslationBase.of(context).updateEmail,
+ //
+ onTap: () {
+ model.user.emailAddress = addEmail.toString();
+ AppToast.showSuccessToast(
+ message: TranslationBase.of(context).updatedEmail);
+ // bloodDetails.city=_selectedHospital.toString();
+
+ // bloodDetails.
+ },
+ ),
+ ),
+ Container(
+ height: MediaQuery.of(context).size.height * 0.10,
+ width: double.infinity,
+ padding: EdgeInsets.all(15),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: Color.fromRGBO(
+ 63,
+ 72,
+ 74,
+ 1,
),
-
- SizedBox(
- height: 10,
+ label: TranslationBase.of(context).viewListChildren,
+ //
+ onTap: () => Navigator.push(
+ context,
+ FadePage(
+ page: ChildPage(),
+ ),
),
- // Row(
- // mainAxisAlignment: MainAxisAlignment.center,
- // crossAxisAlignment: CrossAxisAlignment.center,
- // children: [
- // Center(
- // child: Container(
- // color: Colors.white,
- // width: 350,
- // child: InkWell(
- // onTap: () {
- // showDialog(
- // context: context,
- // builder: (_) =>
- // AssetGiffyDialog(
- // title: Text(
- // "",
- // style: TextStyle(
- // fontSize: 22.0,
- // fontWeight:
- // FontWeight
- // .w600),
- // ),
- // image: Image.asset(
- // 'assets/images/BloodChrt_EN.png'),
- // buttonCancelText:
- // Text('cancel'),
- // buttonCancelColor:
- // Colors.grey,
- // onlyCancelButton: true,
- // ));
- // },
- // child: Container(
- // width: 250,
- // height: 200,
- // child:Image.asset(
- // 'assets/images/BloodChrt_EN.png')),
- // ),
- // ),
- // ),
- // ],
- // ),
-
- SizedBox(
- height: MediaQuery.of(context).size.height * 0.15,
- )
- ],
+ ),
),
-
- ),
+ SizedBox(
+ height: MediaQuery.of(context).size.height * 0.15,
+ )
+ ],
),
+ ),
+ ),
);
}
}
-
diff --git a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart
index 259bbdb7..33c11020 100644
--- a/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart
+++ b/lib/pages/ChildVaccines/dialogs/SelectGenderDialog.dart
@@ -14,6 +14,7 @@ class SelectGenderDialog extends StatefulWidget {
}
class _SelectGenderDialogState extends State {
+
@override
Widget build(BuildContext context) {
return SimpleDialog(
diff --git a/lib/pages/ChildVaccines/vaccinationtable_page.dart b/lib/pages/ChildVaccines/vaccinationtable_page.dart
index c160acfb..4654c75a 100644
--- a/lib/pages/ChildVaccines/vaccinationtable_page.dart
+++ b/lib/pages/ChildVaccines/vaccinationtable_page.dart
@@ -1,101 +1,154 @@
+import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/vaccination_table_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/reports_monthly_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
-import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
-
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'dialogs/SelectGenderDialog.dart';
class VaccinationTablePage extends StatelessWidget {
+ final List_BabyInformationModel babyInfo;
+
+ const VaccinationTablePage({Key key, this.babyInfo}) : super(key: key);
@override
Widget build(BuildContext context) {
var checkedValue;
return BaseView(
- onModelReady: (model) => model.getCreateVaccinationTable(),//getUserTermsAndConditions(),
+ onModelReady: (model) => model.getCreateVaccinationTable(),
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
baseViewModel: model,
- appBarTitle: "Vaccination",
+ appBarTitle: TranslationBase.of(context).vaccination,
body: SingleChildScrollView(
- child:Container(
- margin: EdgeInsets.only(left: 15,right: 15,top: 70),
+ child: Container(
+ margin: EdgeInsets.only(left: 15, right: 15, top: 10),
child: Column(
- children: [//babyInformationModelList.length
- ...List.generate(model.creteVaccinationTableModelList.length, (index) =>
- Container(
- decoration: BoxDecoration(
- shape: BoxShape.rectangle,
- border: Border.all(color: Colors.white, width: 0.5),
- borderRadius: BorderRadius.all(Radius.circular(5)),
- color: Colors.white,
-
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(
+ children: [
+ Expanded(
+ child: Column(
+ children: [
+ Texts(TranslationBase.of(context).childName),
+ Texts(babyInfo.babyName??'',fontWeight: FontWeight.w600,),
+ ],
+ ),
+ ),
+ Expanded(
+ child: Column(children: [
+
+ Texts(TranslationBase.of(context).childDob),
+ Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(FontAwesomeIcons.calendarCheck,color: Colors.red,),
+ SizedBox(width: 15,),
+ Texts(DateUtil.yearMonthDay(babyInfo.dOB)??''),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ SizedBox(height: 15,),
+ Divider(),
+ Column(
+ children: [
+ Row(
+ children: [
+ Texts(TranslationBase.of(context).visit),
+ SizedBox(
+ width: 10,
+ ),
+ Expanded(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Texts(TranslationBase.of(context).descriptionVaccination),
+ ],
+ ),
),
- padding: EdgeInsets.all(12),
- width: double.infinity,
- child: Column(
+ Texts(TranslationBase.of(context).dueDate),
+ ],
+ ),
+ ],
+ ),
+ ...List.generate(
+ model.creteVaccinationTableModelList.length,
+ (index) => Container(
+ // decoration: BoxDecoration(
+ // shape: BoxShape.rectangle,
+ // border: Border.all(color: Colors.white, width: 0.5),
+ // borderRadius: BorderRadius.all(Radius.circular(5)),
+ // // color: Colors.white,
+ // ),
+ padding: EdgeInsets.all(12),
+ width: double.infinity,
+ child: Column(
+ children: [
+ Row(
children: [
- Row(children: [
- Text(model.creteVaccinationTableModelList[index].visit),
- SizedBox(width: 10,),
-
- Expanded(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Html(
- // data:""//model.creteVaccinationTableModelList[index].vaccinesDescription
- data:model.creteVaccinationTableModelList[index].vaccinesDescription,
-
- ),
- ],),
- ),
- Text(model.creteVaccinationTableModelList[index].givenAt),
-
-
- ],),
- Divider(color:Colors.black ,),
-
+ Texts(model
+ .creteVaccinationTableModelList[index].visit),
+ SizedBox(
+ width: 10,
+ ),
+ Expanded(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Html(
+ data: model.creteVaccinationTableModelList[index].vaccinesDescription,
+ ),
+ ],
+ ),
+ ),
+ Texts(model.creteVaccinationTableModelList[index].givenAt),
],
- )
-
-
- )
-
+ ),
+ Divider(
+ color: Colors.white,height: 3,thickness: 1.0,
+ ),
+ ],
+ ),
+ ),
)
],
),
-
+ ),
),
- ),
- bottomSheet: Container(
- height: MediaQuery.of(context).size.height * 0.12,
- width: double.infinity,
-
- padding: EdgeInsets.all(12),
- child: SecondaryButton(
- textColor: Colors.white,
- color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,),
- label: "Send Email ",
- //
- onTap: () {
- //SelectGenderDialog();
-//===============
- showDialog(
- context: context,
- child: SelectGenderDialog(
- ),
- );
- //=========
- }
-
-
+ bottomSheet: Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Container(
+ height: MediaQuery.of(context).size.height * 0.10,
+ width: double.infinity,
+ padding: EdgeInsets.all(12),
+ child: SecondaryButton(
+ textColor: Colors.white,
+ color: checkedValue == false
+ ? Colors.white24
+ : Color.fromRGBO(63, 72, 74, 1,),
+ label: TranslationBase.of(context).sendEmail,
+ onTap: () {
+ showDialog(
+ context: context,
+ child: SelectGenderDialog(),
+ );
+ },
+ ),
),
),
),
diff --git a/lib/pages/ContactUs/contact_us_page.dart b/lib/pages/ContactUs/contact_us_page.dart
index 7d2192f9..d301df3e 100644
--- a/lib/pages/ContactUs/contact_us_page.dart
+++ b/lib/pages/ContactUs/contact_us_page.dart
@@ -27,8 +27,8 @@ class _ContactUsPageState extends State {
@override
Widget build(BuildContext context) {
return AppScaffold(
- isShowAppBar: true,//widget.isAppbar,
- appBarTitle: "HMG Services",//TranslationBase.of(context).bookAppo,
+ isShowAppBar: true,
+ appBarTitle: TranslationBase.of(context).hMGServiceLabel,
isShowDecPage: false,
body: Container(
margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
@@ -43,7 +43,7 @@ class _ContactUsPageState extends State {
Expanded(
child: CardCommonContact(
image: 'assets/images/new-design/find_us_icon.png',
- text: "Find us",
+ text: TranslationBase.of(context).findUs,
subText: "",
type: 0,
@@ -52,7 +52,7 @@ class _ContactUsPageState extends State {
Expanded(
child: CardCommonContact(
image: 'assets/images/new-design/feedback_icon.png',
- text: "Feedback",
+ text: TranslationBase.of(context).feedback,
subText: "",
type: 1),
@@ -66,21 +66,14 @@ class _ContactUsPageState extends State {
Expanded(
child: CardCommonContact(
image: 'assets/images/new-design/live_chat_icon.png',
- text: "Live Chat",
- subText: "Service",
+ text: TranslationBase.of(context).liveChat,
+ subText: TranslationBase.of(context).service,
type: 2,
),
),
Expanded(
- child: Opacity(
- opacity: 0,
- child: CardCommonContact(
- image: 'assets/images/new-design/feedback_icon.png',
- text: "Feedback",
- subText: "",
- type: 3),
- ),
+ child: Container(),
),
],
diff --git a/lib/pages/ContactUs/findus/findus_page.dart b/lib/pages/ContactUs/findus/findus_page.dart
index 9b39de3a..807ac1c7 100644
--- a/lib/pages/ContactUs/findus/findus_page.dart
+++ b/lib/pages/ContactUs/findus/findus_page.dart
@@ -34,9 +34,11 @@ class _FindUsPageState extends State
@override
Widget build(BuildContext context) {
return BaseView(
+ allowAny: true,
onModelReady: (model) => model.getFindUsRequestOrders(), //model.getCOC(),
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
+ isShowDecPage: false,
appBarTitle: 'Locations',
baseViewModel: model,
body: Scaffold(
diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart
index d8d898e3..7aa968a5 100644
--- a/lib/pages/ContactUs/findus/hospitrals_page.dart
+++ b/lib/pages/ContactUs/findus/hospitrals_page.dart
@@ -23,6 +23,7 @@ class _HospitalsPageState extends State {
@override
Widget build(BuildContext context) {
return AppScaffold(
+ isShowDecPage: false,
body: SingleChildScrollView(
child: Container(
// margin: EdgeInsets.only(left: 15,right: 15,top: 70),
diff --git a/lib/pages/ContactUs/findus/pharmacies_page.dart b/lib/pages/ContactUs/findus/pharmacies_page.dart
index 663bd3ec..cab201e3 100644
--- a/lib/pages/ContactUs/findus/pharmacies_page.dart
+++ b/lib/pages/ContactUs/findus/pharmacies_page.dart
@@ -23,6 +23,7 @@ class _PharmaciesPageState extends State {
@override
Widget build(BuildContext context) {
return AppScaffold(
+ isShowDecPage: false,
body: SingleChildScrollView(
child: Container(
margin: EdgeInsets.only(left: 15, right: 15, top: 70),
diff --git a/lib/pages/ContactUs/widgets/card_common_contat.dart b/lib/pages/ContactUs/widgets/card_common_contat.dart
index 9ad74aff..67580dbf 100644
--- a/lib/pages/ContactUs/widgets/card_common_contat.dart
+++ b/lib/pages/ContactUs/widgets/card_common_contat.dart
@@ -1,8 +1,10 @@
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/LiveChat/livechat_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart';
import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
class CardCommonContact extends StatelessWidget {
final image;
@@ -17,6 +19,7 @@ class CardCommonContact extends StatelessWidget {
@override
Widget build(BuildContext context) {
+ ProjectViewModel projectViewModel = Provider.of(context);
return GestureDetector(
onTap: () {
navigateToSearch(context, this.type);
@@ -45,10 +48,12 @@ class CardCommonContact extends StatelessWidget {
style: TextStyle(
color: Colors.black, letterSpacing: 1.0, fontSize: 15.0)),
),
- Container(
- alignment: Alignment.bottomRight,
- margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0),
- child: Image.asset(this.image, width: 60.0, height: 60.0),
+ Align(
+ alignment: projectViewModel.isArabic? Alignment.bottomLeft:Alignment.bottomRight,
+ child: Container(
+ margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 8.0),
+ child: Image.asset(this.image, width: 60.0, height: 60.0),
+ ),
),
],
),
diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
index 9f2418fd..3e58b657 100644
--- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
+++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
@@ -348,8 +348,11 @@ class _CovidTimeSlotsState extends State
return children;
},
),
- onDaySelected: (date, event,formats) {
- _onDaySelected(date, event,);
+ onDaySelected: (date, event, _) {
+ _onDaySelected(
+ date,
+ event,
+ );
_animationController.forward(from: 0.0);
},
onVisibleDaysChanged: _onVisibleDaysChanged,
diff --git a/lib/pages/family/add-family-member.dart b/lib/pages/DrawerPages/family/add-family-member.dart
similarity index 89%
rename from lib/pages/family/add-family-member.dart
rename to lib/pages/DrawerPages/family/add-family-member.dart
index f1742141..084b43e6 100644
--- a/lib/pages/family/add-family-member.dart
+++ b/lib/pages/DrawerPages/family/add-family-member.dart
@@ -3,9 +3,9 @@ import 'package:diplomaticquarterapp/core/model/family-file/add_family_file_requ
import 'package:diplomaticquarterapp/core/model/family-file/insert_share_file_request.dart';
import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
-import 'package:diplomaticquarterapp/pages/family/add-family_type.dart';
import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
@@ -20,6 +20,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'add-family_type.dart';
+
class AddMember extends StatefulWidget {
@override
_AddMember createState() => _AddMember();
@@ -143,7 +145,7 @@ class _AddMember extends State {
request.zipCode = countryCode;
request.isRegister = false;
request.patientStatus = 2;
- loading(true);
+ GifLoaderDialogUtils.showMyDialog(context);
familyFileProvider
.addFamilyFile(request)
.then((value) => manageFamily(value))
@@ -153,18 +155,21 @@ class _AddMember extends State {
}
manageFamily(addMemberResult) {
- loading(false);
- ConfirmDialog dialog = new ConfirmDialog(
- context: context,
- confirmMessage: addMemberResult['ShareFamilyFileObj']['Message'],
- okText: TranslationBase.of(context).confirm,
- cancelText: TranslationBase.of(context).cancel_nocaps,
- okFunction: () => {
- insertFamilyData(addMemberResult),
- ConfirmDialog.closeAlertDialog(context)
- },
- cancelFunction: () => {});
- dialog.showAlertDialog(context);
+ GifLoaderDialogUtils.hideDialog(context);
+ if(addMemberResult is String ==false){
+ ConfirmDialog dialog = new ConfirmDialog(
+ context: context,
+ confirmMessage: addMemberResult['ShareFamilyFileObj']['Message'],
+ okText: TranslationBase.of(context).confirm,
+ cancelText: TranslationBase.of(context).cancel_nocaps,
+ okFunction: () => {
+ insertFamilyData(addMemberResult),
+ ConfirmDialog.closeAlertDialog(context)
+ },
+ cancelFunction: () => {});
+ dialog.showAlertDialog(context);
+ }
+
}
insertFamilyData(addMemberResult) {
@@ -179,8 +184,7 @@ class _AddMember extends State {
request.regionID = 1;
}
loading(true);
- this
- .familyFileProvider
+ familyFileProvider
.insertNewMember(request)
.then((value) => sendActivationCode(value));
}
@@ -189,8 +193,7 @@ class _AddMember extends State {
// var request = this.getCommonRequest();
loading(true);
patientShareRequestID = result['PatientShareRequestID'];
- this
- .familyFileProvider
+ familyFileProvider
.sendActivationCode(mobileNo, countryCode, nationalIDorFile.text)
.then((result) => {
if (result != null && result['isSMSSent'] == true)
@@ -203,11 +206,13 @@ class _AddMember extends State {
startSMSService(type, result) {
loading(false);
- new SMSOTP(
+ SMSOTP(
context,
type,
- this.mobileNo,
- (value) => {this.checkActivationCode(value, result)},
+ mobileNo,
+ (value) {
+ this.checkActivationCode(value, result);
+ },
() => {
print('Faild..'),
},
@@ -215,8 +220,7 @@ class _AddMember extends State {
}
checkActivationCode(value, result) {
- this
- .familyFileProvider
+ familyFileProvider
.checkActivationCode(
result['LogInTokenID'], value, nationalIDorFile.text, mobileNo)
.then((result) => {
@@ -226,8 +230,7 @@ class _AddMember extends State {
}
handleFamilyRequests(id, stauts) {
- this
- .familyFileProvider
+ familyFileProvider
.acceptAndRejectRecievedRequests(id, stauts)
.then((result) => {
sharedPref.remove(FAMILY_FILE),
diff --git a/lib/pages/family/add-family_type.dart b/lib/pages/DrawerPages/family/add-family_type.dart
similarity index 97%
rename from lib/pages/family/add-family_type.dart
rename to lib/pages/DrawerPages/family/add-family_type.dart
index 96e055b3..2c85b043 100644
--- a/lib/pages/family/add-family_type.dart
+++ b/lib/pages/DrawerPages/family/add-family_type.dart
@@ -75,7 +75,7 @@ class AddFamilyMemberType extends StatelessWidget {
),
AppText(
TranslationBase.of(context)
- .nationalID,
+ .idNo,
fontSize: SizeConfig
.textMultiplier *
2,
@@ -113,9 +113,10 @@ class AddFamilyMemberType extends StatelessWidget {
AppText(
TranslationBase.of(context)
.fileNo,
+ textAlign: TextAlign.center,
fontSize: SizeConfig
.textMultiplier *
- 2,
+ 1.8,
)
],
),
diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart
new file mode 100644
index 00000000..0e6d86bf
--- /dev/null
+++ b/lib/pages/DrawerPages/family/my-family.dart
@@ -0,0 +1,637 @@
+import 'dart:ui';
+
+import 'package:diplomaticquarterapp/config/size_config.dart';
+import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart';
+import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
+import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
+import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
+import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/uitl/utils.dart';
+import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart';
+import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart';
+import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart';
+import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/routes.dart';
+
+class MyFamily extends StatefulWidget {
+ final bool isAppbarVisible;
+ MyFamily({this.isAppbarVisible =true});
+ @override
+ _MyFamily createState() => _MyFamily();
+}
+
+class _MyFamily extends State with TickerProviderStateMixin {
+ final familyFileProvider = FamilyFilesProvider();
+ AppSharedPreferences sharedPref = new AppSharedPreferences();
+ var userID;
+ TabController _tabController;
+ int _tabIndex = 0;
+ @override
+ void initState() {
+ _tabController = new TabController(length: 2, vsync: this, initialIndex: 0);
+
+ super.initState();
+ }
+
+ bool expandFlag = false;
+ Widget build(BuildContext context) {
+ return AppScaffold(
+ appBarTitle: TranslationBase.of(context).myFamilyFiles,
+ isShowAppBar: widget.isAppbarVisible,
+ body: Scaffold(
+ extendBodyBehindAppBar: true,
+ appBar: PreferredSize(
+ preferredSize: Size.fromHeight(65.0),
+ child: Stack(
+ children: [
+ Positioned(
+ bottom: 1,
+ left: 0,
+ right: 0,
+ child: BackdropFilter(
+ filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
+ child: Container(
+ color: Theme.of(context)
+ .scaffoldBackgroundColor
+ .withOpacity(0.8),
+ height: 70.0,
+ ),
+ ),
+ ),
+ Center(
+ child: Container(
+ height: 60.0,
+ margin: EdgeInsets.only(top: 10.0),
+ width: MediaQuery.of(context).size.width * 0.92, // 0.9,
+ decoration: BoxDecoration(
+ border: Border(
+ bottom: BorderSide(
+ color: Theme.of(context).dividerColor,
+ width: 0.9), //width: 0.7
+ ),
+ color: Colors.white),
+ child: Center(
+ child: TabBar(
+ isScrollable: true,
+ controller: _tabController,
+ indicatorWeight: 5.0,
+ //indicatorSize: TabBarIndicatorSize.label,
+ indicatorSize: TabBarIndicatorSize.tab,
+
+ indicatorColor: Colors.red[800],
+ labelColor: Theme.of(context).primaryColor,
+ labelPadding:
+ EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0),
+ unselectedLabelColor: Colors.grey[800],
+ tabs: [
+
+ Container(
+ width: MediaQuery.of(context).size.width * 0.30,
+ child: Center(
+ child: AppText(TranslationBase.of(context).family),
+ ),
+ ),
+ Container(
+ width: MediaQuery.of(context).size.width * 0.30,
+ child: Center(
+ child: AppText(TranslationBase.of(context).request),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ body: Column(
+ children: [
+ Expanded(
+ child: TabBarView(
+ physics: BouncingScrollPhysics(),
+ controller: _tabController,
+ children: [
+ myFamilyDetails(context),
+ myFamilyRequest(context)
+ ],
+ ),
+ )
+ ],
+ ),
+ ),
+ );
+
+
+
+
+ return AppScaffold(
+ appBarTitle: TranslationBase.of(context).myFamilyFiles,
+ isShowAppBar: widget.isAppbarVisible,
+ body: SingleChildScrollView(
+ child: Container(
+ height: SizeConfig.screenHeight *.9,
+ width: SizeConfig.realScreenWidth,
+ padding: EdgeInsets.all(20),
+ child: Stack(
+ children: [
+ TabBar(
+ controller: _tabController,
+ indicatorColor: Colors.red,
+ tabs: [
+ Tab( // padding: EdgeInsets.all(6),
+ child:AppText(TranslationBase.of(context).family)),
+ Tab(
+ // padding: EdgeInsets.all(6),
+ child:AppText(TranslationBase.of(context).request)),
+ ],
+ ),
+ TabBarView(
+ controller: _tabController,
+ children: [
+ myFamilyDetails(context),
+ myFamilyRequest(context)
+ ],
+ )
+ ],
+ ))));
+ }
+
+ Widget myFamilyDetails(context) {
+ return Container(
+ height: MediaQuery.of(context).size.height,
+ margin: EdgeInsets.fromLTRB(20.0, 0, 20.0, 0.0),
+ child: Column(
+ children: [
+ Expanded(
+ flex: 4,
+ child: FutureBuilder(
+ future: getFamilyFiles(), // async work
+ builder: (BuildContext context,
+ AsyncSnapshot
+ snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ return Padding(
+ padding: EdgeInsets.only(top: 50),
+ child: Text('Loading....'));
+ default:
+ if (snapshot.hasError)
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Text("No data found"));
+ else
+ return Padding(
+ padding: EdgeInsets.only(top: 50),
+ child: Column(children: [
+ Row(
+ mainAxisAlignment:
+ MainAxisAlignment.spaceBetween,
+ children: [
+ Expanded(
+ flex: 3,
+ child: Text(
+ TranslationBase.of(context).request)),
+ Expanded(
+ flex: 2,
+ child: Text(
+ TranslationBase.of(context).switchUser,
+ )),
+ Expanded(
+ flex: 1,
+ child: Text(
+ TranslationBase.of(context).deleteView,
+ )),
+ ],
+ ),
+ Column(
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: snapshot
+ .data.getAllSharedRecordsByStatusList
+ .map((result) {
+ return result.status == 3
+ ? Padding(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child: Text(
+ result.patientName)),
+ Expanded(
+ flex: 2,
+ child: IconButton(
+ icon: Icon(Icons.group),
+ color: Colors.black,
+ onPressed: () {
+ switchUser(
+ result, context);
+ },
+ )),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: Icon(
+ Icons.delete,
+ color: Colors.black,
+ ),
+ onPressed: () {
+ deleteFamily(
+ result, context);
+ },
+ )),
+ ],
+ ))
+ : SizedBox();
+ }).toList())
+ ]));
+ }
+ },
+ ),
+ ),
+ Expanded(
+ flex: 1,
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ Row(
+ children: [
+ Expanded(
+ child: DefaultButton(
+ TranslationBase.of(context).addFamilyMember,
+ () => {
+ Navigator.of(context)
+ .pushNamed(ADD_FAMILY_MEMBER_TYPE)
+ },
+ color: Colors.grey[900],
+ textColor: Colors.white,
+ ))
+ ],
+ ),
+ ],
+ ),
+ )
+ ],
+ ));
+ }
+
+ Widget myFamilyRequest(context) {
+ return //Padding(
+ // padding: const EdgeInsets.symmetric(horizontal: 10.0),
+ // child:
+ SingleChildScrollView(
+ child: Container(
+ height: MediaQuery.of(context).size.height,
+ margin: EdgeInsets.only(top:65),
+ child: Column(
+ children: [
+ RoundedContainer(
+ child: ExpansionTile(
+ title: Text(
+ TranslationBase.of(context).userViewRequest,
+ style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold),
+ ),
+ children: [
+ FutureBuilder(
+ future: getUserViewRequest(), // async work
+ builder: (BuildContext context,
+ AsyncSnapshot snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ return Padding(
+ padding: EdgeInsets.only(top: 50),
+ child: Text('Loading....'));
+ default:
+ if (snapshot.hasError)
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Text('No data found'));
+ else
+ return Column(
+ children: [
+ // Padding(padding: EdgeInsets.only(left:10, right:10),
+ // child:
+ // Row(
+ // mainAxisAlignment:
+ // MainAxisAlignment.spaceBetween,
+ // children: [
+ // Expanded(
+ // flex: 3,
+ // child: Text(TranslationBase.of(context)
+ // .request)),
+ // Expanded(
+ // flex: 2,
+ // child: Text(
+ // TranslationBase.of(context)
+ // .switchUser,
+ // )),
+ // Expanded(
+ // flex: 1,
+ // child: Text(
+ // TranslationBase.of(context)
+ // .deleteView,
+ // )),
+ // ],
+ // )),
+ Column(children: [
+ Padding(
+ padding: EdgeInsets.only(left:10, right:10), child:Row(children: [
+ Expanded(flex: 3, child: AppText('Name')),
+ Expanded(flex: 1, child: AppText('Allow')),
+ Expanded(flex: 1, child: AppText('Reject')),
+ ])),
+ Column(
+ children:familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList
+ .map((result) {
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child:
+ Text(result.patientName)),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: Icon(
+ Icons.check_circle,
+ color: Colors.black,
+ ),
+ onPressed: () {
+ acceptRemoveRequest(
+ result.iD, 3, context);
+ },
+ )),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: Icon(
+ Icons.delete,
+ color: Colors.black,
+ ),
+ onPressed: () {
+ acceptRemoveRequest(
+ result.iD,4, context);
+ },
+ ))
+ ],
+ ));
+ }).toList())
+ ])
+ ],
+ );
+ }
+ })
+ ],
+ ),
+ ),
+ RoundedContainer(
+ child: ExpansionTile(
+ title: Text(
+ TranslationBase.of(context).sentRequest,
+ style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold),
+ ),
+ children: [
+ FutureBuilder(
+ future: getSentRequest(), // async work
+ builder: (BuildContext context,
+ AsyncSnapshot
+ snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ return Padding(
+ padding: EdgeInsets.only(top: 50),
+ child: Text('Loading....'));
+ default:
+ if (snapshot.hasError)
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Text('No data found'));
+ else
+ return SingleChildScrollView(
+ child: Container(
+ height: SizeConfig.screenHeight * .3,
+ child: ListView(
+ children: snapshot
+ .data.getAllSharedRecordsByStatusList
+ .map((result) {
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child:
+ Text(result.patientName)),
+ Expanded(
+ flex: 2,
+ child: AppText(
+ result.statusDescription,
+ color: result.status==3 ? Colors.green: Colors.red,
+ )),
+ ],
+ ));
+ }).toList(),
+ )));
+ }
+ })
+ ],
+ )),
+ RoundedContainer(
+ child: ExpansionTile(
+ title: Text(
+ TranslationBase.of(context).userView,
+ style: TextStyle(fontSize: 18.0, fontWeight: FontWeight.bold),
+ ),
+ children: [
+ FutureBuilder(
+ future: getUserViewRequest(), // async work
+ builder:
+ (BuildContext context, AsyncSnapshot snapshot) {
+ switch (snapshot.connectionState) {
+ case ConnectionState.waiting:
+ return Padding(
+ padding: EdgeInsets.only(top: 50),
+ child: Text('Loading....'));
+ default:
+ if (snapshot.hasError)
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Text('No data found'));
+ else
+ return Column(
+ children: [
+ // Padding(
+ // padding:EdgeInsets.only(left:10, right:10),
+ // child: Row(
+ // mainAxisAlignment:
+ // MainAxisAlignment.spaceBetween,
+ // children: [
+ // Expanded(
+ // flex: 3,
+ // child: AppText(
+ // TranslationBase.of(context).request),
+ // ),
+ // Expanded(
+ // flex: 2,
+ // child: AppText(
+ // TranslationBase.of(context).switchUser,
+ // )),
+ // Expanded(
+ // flex: 1,
+ // child: AppText(
+ // TranslationBase.of(context).deleteView,
+ // )),
+ // ],
+ // )),
+ Column(children: [
+ Padding(
+ padding:EdgeInsets.only(left:10, right:10),
+ child: Row(children: [
+ Expanded(flex: 3, child: AppText('Name')),
+ Expanded(flex: 1, child: AppText('Delete')),
+ ])),
+ Column(
+ children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList
+ .map((result) {
+ return Padding(
+ padding: EdgeInsets.all(10),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 3,
+ child: AppText(result.patientName)),
+ Expanded(
+ flex: 1,
+ child: IconButton(
+ icon: Icon(
+ Icons.delete,
+ color: Colors.black,
+ ),
+ onPressed: () {
+ deactivateRequest(result.iD,
+ 5, context);
+ },
+ )),
+ ],
+ ));
+ }).toList())
+ ])
+ ],
+ );
+ }
+ })
+ ],
+ ))
+ ],
+ ),
+ ),
+ );
+ }
+
+ Future getFamilyFiles() async {
+ if (await sharedPref.getObject(FAMILY_FILE) != null) {
+ // print(await sharedPref.getObject(FAMILY_FILE));
+ return Future.value(GetAllSharedRecordsByStatusResponse.fromJson(
+ await sharedPref.getObject(FAMILY_FILE)));
+ } else {
+ return familyFileProvider.getSharedRecordByStatus();
+ }
+ }
+
+ Future getUserViewRequest() async {
+ var user = await sharedPref.getObject(USER_PROFILE);
+ return familyFileProvider.getUserViewRequest(user['PatientID']);
+ }
+
+ Future getSentRequest() async {
+ // var user = await sharedPref.getObject(USER_PROFILE);
+ return familyFileProvider.getUserSentRequest();
+ }
+
+ deleteFamily(family, context) {
+ ConfirmDialog dialog = new ConfirmDialog(
+ context: context,
+ confirmMessage: TranslationBase.of(context).removeFamilyMember,
+ okText: TranslationBase.of(context).confirm,
+ cancelText: TranslationBase.of(context).cancel_nocaps,
+ okFunction: () => {
+ removeFamily(family, context),
+ ConfirmDialog.closeAlertDialog(context)
+ },
+ cancelFunction: () => {});
+ dialog.showAlertDialog(context);
+ }
+
+ removeFamily(GetAllSharedRecordsByStatusList family, context) {
+ this.userID = family.iD;
+ Map request = {};
+ request['ID'] = this.userID;
+ request['IsActive'] = false;
+ this
+ .familyFileProvider
+ .deativateActivateMemberFile(request)
+ .then((value) => refreshFamily(context));
+ }
+
+ refreshFamily(context) {
+ //sharedPref.remove(FAMILY_FILE);
+ setState(() {
+ sharedPref.remove(FAMILY_FILE);
+ });
+ }
+
+ switchUser(user, context) {
+ GifLoaderDialogUtils.showMyDialog(context);
+ this
+ .familyFileProvider
+ .silentLoggin(user)
+ .then((value) => loginAfter(value, context));
+ }
+
+ loginAfter(result, context) async{
+ GifLoaderDialogUtils.hideDialog(context);
+ var familyFile = await sharedPref.getObject(FAMILY_FILE);
+ result = CheckActivationCode.fromJson(result);
+ this.sharedPref.clear();
+ this.sharedPref.setObject(FAMILY_FILE, familyFile);
+ this.sharedPref.setObject(USER_PROFILE, result.list);
+ this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);
+ this.sharedPref.setString(TOKEN, result.authenticationTokenID);
+ //this.checkIfUserAgreedBefore(result),
+ Navigator.of(context).pushNamed(
+ HOME,
+ );
+ }
+
+ deactivateRequest(ID, status, context) {
+ GifLoaderDialogUtils.showMyDialog(context);
+ Map request = {};
+ request["ID"] = ID;
+ request["Status"] = status;
+ this.familyFileProvider.deactivateFamily(request).then((value) => {
+ GifLoaderDialogUtils.hideDialog(context),
+ refreshFamily(context)
+ });
+ }
+ acceptRemoveRequest(ID, status, context) {
+ GifLoaderDialogUtils.showMyDialog(context);
+ Map request = {};
+ request["ID"] = ID;
+ request["Status"] = status;
+ this.familyFileProvider.acceptRejectFamily(request).then((value) => {
+ GifLoaderDialogUtils.hideDialog(context),
+ refreshFamily(context)
+ });
+ }
+}
diff --git a/lib/pages/DrawerPages/notifications/notification_details_page.dart b/lib/pages/DrawerPages/notifications/notification_details_page.dart
new file mode 100644
index 00000000..3858c940
--- /dev/null
+++ b/lib/pages/DrawerPages/notifications/notification_details_page.dart
@@ -0,0 +1,103 @@
+import 'package:diplomaticquarterapp/core/model/notifications/get_notifications_response_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/notifications_view_model.dart';
+import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart';
+import 'package:flutter/material.dart';
+
+class NotificationsDetailsPage extends StatelessWidget {
+ final GetNotificationsResponseModel notification;
+
+ NotificationsDetailsPage({this.notification});
+
+ getDateForm(String date) {
+ DateTime d = DateUtil.convertStringToDate(date);
+ String monthName = DateUtil.getMonth(d.month).toString();
+ TimeOfDay timeOfDay = TimeOfDay(hour: d.hour, minute: d.minute);
+ String minute = timeOfDay.minute < 10
+ ? timeOfDay.minute.toString().padLeft(2, '0')
+ : timeOfDay.minute.toString();
+
+ String hour = '${timeOfDay.hourOfPeriod}:$minute';
+ if (timeOfDay.period == DayPeriod.am) {
+ hour = hour + "AM";
+ } else {
+ {
+ hour = hour + "PM";
+ }
+ }
+ return monthName + ',${d.day},${d.year}, $hour';
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return BaseView(
+ builder: (_, model, widget) => AppScaffold(
+ isShowAppBar: true,
+ appBarTitle: TranslationBase.of(context).notificationDetails,
+ body: SingleChildScrollView(
+ child: Center(
+ child: FractionallySizedBox(
+ widthFactor: 0.9,
+ child: Column(
+ children: [
+ SizedBox(
+ height: 25,
+ ),
+ Container(
+ // margin: EdgeInsets.only(left: 30),
+ width: double.infinity,
+ color: Colors.grey[400],
+ child: Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Texts(
+ getDateForm(notification.createdOn),
+ fontSize: 16,
+ ),
+ ),
+ ),
+ SizedBox(
+ height: 15,
+ ),
+ if (notification.messageTypeData.length != 0)
+ FractionallySizedBox(
+ widthFactor: 0.9,
+ child: Image.network(notification.messageTypeData,
+ loadingBuilder: (BuildContext context, Widget child,
+ ImageChunkEvent loadingProgress) {
+ if (loadingProgress == null) return child;
+ return Center(
+ child: SizedBox(
+ width: 40.0,
+ height: 40.0,
+ child: AppCircularProgressIndicator(),
+ ),
+ );
+ },
+ fit: BoxFit
+ .fill) //Image.network(notification.messageTypeData),
+ ),
+ SizedBox(
+ height: 15,
+ ),
+ Row(
+ children: [
+ Expanded(
+ child: Center(
+ child: Texts(notification.message),
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/DrawerPages/notifications/notifications_page.dart b/lib/pages/DrawerPages/notifications/notifications_page.dart
new file mode 100644
index 00000000..53aad843
--- /dev/null
+++ b/lib/pages/DrawerPages/notifications/notifications_page.dart
@@ -0,0 +1,148 @@
+import 'package:diplomaticquarterapp/core/model/notifications/get_notifications_request_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/notifications_view_model.dart';
+import 'package:diplomaticquarterapp/pages/DrawerPages/notifications/notification_details_page.dart';
+import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
+import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
+// ignore: must_be_immutable
+class NotificationsPage extends StatelessWidget {
+ getDateForm(String date) {
+ DateTime d = DateUtil.convertStringToDate(date);
+ String monthName = DateUtil.getMonth(d.month).toString();
+ TimeOfDay timeOfDay = TimeOfDay(hour: d.hour, minute: d.minute);
+ String minute = timeOfDay.minute < 10
+ ? timeOfDay.minute.toString().padLeft(2, '0')
+ : timeOfDay.minute.toString();
+
+ String hour = '${timeOfDay.hourOfPeriod}:$minute';
+ if (timeOfDay.period == DayPeriod.am) {
+ hour = hour + "AM";
+ } else {
+ {
+ hour = hour + "PM";
+ }
+ }
+
+ //DayPeriod.am
+ return monthName + ',${d.day},${d.year}, $hour';
+ }
+
+ int currentIndex = 0;
+
+ @override
+ Widget build(BuildContext context) {
+ var prescriptionReport;
+ return BaseView