Merge branch 'development_new_design_2.0' into 'sultan_new_design'

# Conflicts:
#   lib/pages/login/register.dart
merge-update-with-lab-changes
haroon amjad 4 years ago
commit f15090c634

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="213.0989011392084" height="154.19780227841704">
<path fill="#ffffff" d="M137.6977818608284,28.21590642023085 C109.1977818608284,21.843906420230837 99.1977818608284,21.087906420230865 72.6977818608284,28.087906420230865 s-65,-10.5 -73.25,-18.25 c3.5,6.75 2,12 3.75,17.75 s5,21.334 0.5,41.501 s-1.6670000000000007,35.666 -0.5,40.166 c0.785,3.029 2.326,5.001 1.419,8.813 C16.1977818608284,129.58790642023087 35.0317818608284,152.58790642023087 105.11478186082837,152.58790642023087 s86.417,-20.498 98.75,-33.499 c-1.6660000000000008,-4.5 -0.501,-12 2.499,-21.167 s-3.499,-44.667 -3.833,-52.833 s2.501,-21.5 2.7510000000000003,-27.584 s4.25,-13.25 5.5,-16.5 C190.3657818608284,25.42190642023087 166.1977818608284,34.587906420230865 137.6977818608284,28.21590642023085 z" style="" id="svg_1" class="selected" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 912 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="255.2087860107422" height="233.3186798095703">
<path fill="#ffffff" d="M251.42306643724442,57.73625564575195 c-2.018,-20.749 -37.75,-48.25 -48.562,-51.137 c-4.605,0.4470000000000002 -9.488,0.37600000000000017 -14.438,-0.36300000000000016 c-12.805,-1.911 -47,-1.6670000000000007 -50.833,4.333 s-15.5,5.833 -19.667,0 s-29.667,-4.5 -45.333,-3.6670000000000007 c-5.2940000000000005,0.281 -10.873,-0.6740000000000006 -16.059,-2.159 c-8.004,3.48 -46.033,26.426 -52.127,58.308 c-0.459,2.402 -0.7440000000000003,4.852 -0.8140000000000003,7.351 c-1,35.667 0.003000000000000003,72.11 -0.1650000000000001,85.722 c0.3830000000000002,-0.09600000000000009 9.666,25.111 12.166,30.778 S20.673066437244415,204.73625564575195 24.173066437244415,211.48625564575195 C32.423066437244415,219.23625564575195 70.92306643724442,236.73625564575195 97.42306643724442,229.73625564575195 s36.5,-6.244 65,0.128 s52.668,-2.794 73.084,-27.211 c1.25,-3.25 4.75,-11.75 5.333,-15 s2.6670000000000007,-6.999 4.084,-9.749 s7.455,-21.675 8.005,-21.176 C253.6010664372444,143.38625564575193 252.59006643724445,69.73725564575193 251.42306643724442,57.73625564575195 z" style="" id="svg_1" class="selected" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="116" height="168.19780227841704" style="">
<path d="M112.92739588880539,53.61538380384445 C111.2613958888054,21.615383803844452 76.59339588880539,2.615383803844452 57.59339588880539,2.615383803844452 c-30.833,0 -50.167,31.5 -53.167,44.5 c-1.915,8.295 -2.833,23.5 -2.5,28.167 s1,12.333 0.6670000000000003,16.167 c2.04,7.695 6.667,23 6.667,33 c0.6670000000000003,5.167 1.167,12.5 3.333,18.833 c3,4 22.5,23.333 44.167,23.333 s36.5,-8.667 45.708,-23 c2.625,-5.625 5,-15.25 4.75,-18.625 c-0.7080000000000002,-5.125 4.708,-28.042 5.709,-32.708 C113.59439588880537,84.94938380384446 114.59339588880539,85.61538380384445 112.92739588880539,53.61538380384445 z" id="svg_1" class="" fill="#FFFFFF" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 795 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="54.05493937159417" height="60.63735393095271">
<path fill="#FFFFFF" fill-opacity="1" d="M3.265236490249606,9.021899536132878 c-0.36300000000000027,3.847 -1.3880000000000001,8.108 -1.7680000000000002,11.147 c-0.5,4 2.125,8.625 1.375,15.875 c-0.03400000000000004,0.3320000000000004 -0.09100000000000014,0.6700000000000008 -0.14600000000000013,1.008 c12.665000000000001,-4.423 40.242,8.668 48.998,21.075 c1.177,-7.814 1.063,-15.23 -0.47800000000000026,-19.082 c-1.6670000000000007,-4.166 -2.167,-7.167 -0.8330000000000005,-12.5 s-0.6670000000000008,-18.667 -1.8330000000000002,-21.834 c-0.17800000000000013,-0.48200000000000026 -0.36800000000000027,-1.097 -0.562,-1.79 C39.72823649024963,-0.8481004638672403 10.257236490249625,-2.4631004638672493 3.265236490249606,9.021899536132878 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 901 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="90.24175671007515" height="155.41757810468494">
<path fill="#ffffff" d="M88.20545846652982,11.61204547119138 c0.07,-2.499 0.35400000000000015,-4.949 0.8140000000000003,-7.351 c-14.58,24.029 -45.423,27.768 -58.288,43.156 c-0.43700000000000017,6.049 -2.914,8.093 -7.442,14.778 C18.038458466529846,69.9450454711914 8.038458466529846,101.4450454711914 4.538458466529846,113.4450454711914 c-0.507,1.738 -0.8960000000000004,3.229 -1.221,4.551 c-1.413,17.735 10.718,25.876 24.421,31.618 c11.394,4.774 24.501,8.306000000000001 33.45,1.5430000000000001 c0.7110000000000003,-1.544 1.6340000000000003,-3.368 2.85,-5.712 c3.5,-6.75 23.363,-47.953 24.001,-48.111 C88.20745846652983,83.7220454711914 87.20545846652982,47.27904547119141 88.20545846652982,11.61204547119138 z" style="" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 898 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="19.50549430395722" height="43">
<path fill="#FFFFFF" fill-opacity="1" d="M4.256141479492214,4.517237305641174 c-4,4 -1.8330000000000002,17 -0.8330000000000004,20.667 s5.833,14.667 7.167,15.833 s5.167,4.833 8.5,-1.6670000000000007 c0,-10 -4.627,-25.305 -6.667,-33 C11.423141479492188,4.517237305641174 8.256141479492214,0.5172373056411743 4.256141479492214,4.517237305641174 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 499 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.30769202554006" height="95">
<path fill="#FFFFFF" fill-opacity="1" d="M60.156039428710926,35.87777075195311 c-13.704,-5.742 -25.834,-13.883000000000001 -24.421,-31.618 c-1.917,7.803 -1.51,9.506 -8.779,18.699 c-5.907,7.47 -15.794,29.063 -22.538,48.927 c15.882,-28.244 68.495,4.695 75.547,19.871 c6.154,-16.332 11.13,-43.69 11.49,-47.172 c0.24500000000000005,-2.366 0.8140000000000002,-4.26 2.15,-7.163 C84.65803942871094,44.18377075195315 71.55003942871093,40.65177075195311 60.156039428710926,35.87777075195311 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 627 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="33.670316086718" height="21.175817726631493">
<path fill="#FFFFFF" fill-opacity="1" d="M16.961529970169067,20.480769634246826 c8.561,0 15.5,-4.197 15.5,-9.375 s-6.939,-9.375 -15.5,-9.375 c-9.75,0 -15.5,4.197 -15.5,9.375 S8.400529970169089,20.480769634246826 16.961529970169067,20.480769634246826 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1" /></svg>

Before

Width:  |  Height:  |  Size: 418 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.60439544316591" height="109.80219772158284" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M45.03393640899657,5.183765991210976 c-1.15,7.047 -6.68,15.393 -10.854,23.742 c-4.375,8.75 -13,19.375 -21,28.25 c-2.286,2.536 -4.111,5.777 -5.548,9.185 c-3.593,8.519 -4.755,18.083 -4.577,20.315 c0.25,3.125 3.125,5.875 6.125,5.5 c0,1.125 1,2.875 4.25,2.5 c0.25,2 0,6.25 8.25,5 c4,4.875 7.875,4.625 10.75,1.75 c5.292,6.314 10.383000000000001,6.492 15.75,5.809 c4.375,-0.558 11.125,-7.809 12.25,-10.559 s2.25,-3.875 5.875,-6.75 c1.972,-1.5630000000000002 3.795,-4.086 5.156,-8.824 c0.6830000000000007,-2.376 1.247,-5.519 1.657,-8.232 c0.275,-1.824 0.4810000000000002,-3.456 0.6040000000000004,-4.525 c0.6670000000000007,-5.833 0.6670000000000007,-10.834 4.5,-21.334 c8.667,-3.6670000000000007 14,-10.333 15.5,-18.833 c0.11300000000000006,-0.6420000000000005 0.2150000000000001,-1.28 0.3110000000000002,-1.9180000000000001 C85.27593640899659,13.851765991210868 57.699936408996564,0.7607659912109739 45.03393640899657,5.183765991210976 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="110.87911797698439" height="137.95604190036374">
<path fill="#FFFFFF" fill-opacity="1" d="M32.440017807006825,15.292371704101583 c-2.96,8.722 -5.318,17.111 -6.462,23.823 c-2.028,11.896 -8.779,39.212 -16.707,62.487 c-1.735,5.094 -3.563,9.992 -5.337,14.495 c1.722,9.015 32.508,23.476 42.632,18.606 c1.457,-2.714 2.7640000000000002,-5.01 3.745,-6.587 c4.667,-7.5 11.917,-19.251 24.917,-35.251 s25.5,-39.75 32,-55.75 c0.255,-0.6290000000000003 0.508,-1.2850000000000001 0.7600000000000003,-1.953 C100.93601780700683,19.987371704101577 48.323017807006835,-12.951628295898445 32.440017807006825,15.292371704101583 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 722 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="111.769224561883" height="148.25274165001133">
<path fill="#FFFFFF" fill-opacity="1" d="M109.73409777450561,27.123008911132843 c0.09600000000000009,-0.975 0.3440000000000003,-2.156 0.7050000000000003,-3.481 c-14.027,-10.755 -33.958,-19.024 -43.015,-19.44 c-1.911,1.612 -5.3260000000000005,3.042 -12.773,5.13 c-1.854,0.52 -3.833,1.291 -5.8740000000000006,2.231 c-12.688,5.84 -27.892,18.435 -31.876,21.019 c-4.625,3 -7.75,8.375 -11.875,10.5 s-4.125,8.625 0,10.5 s9.625,0.125 13,-1.5 s9.042,-8.457 15.5,-10.5 c3.7880000000000003,-1.198 7.625,-1.5 7.625,0.125 s-8.5,22.375 -9.125,25.5 s-3.875,13.875 -5.875,21.125 s-5.5,21.25 -6.75,29.25 s0.8750000000000003,11.75 5.125,12.625 s7.875,-7.625 8.646,-10.625 s2.854,-12.75 3.979,-15.5 s6.625,-18.75 8,-22 s2.375,-8.625 4.375,-7.75 s-0.37500000000000017,5.875 -1.75,9.75 S40.651097774505615,108.83100891113281 39.901097774505615,112.70600891113281 s-5,19.75 -5.25,22.5 s-1.875,8.75 2.75,10.5 s7.75,-1.875 9.5,-5.625 s5.375,-17.625 7.375,-26.125 s5.75,-19.5 7.125,-24 s2.125,-8 3.875,-7.875 s1.5,2.5 0.7500000000000003,4.75 S59.901097774505615,107.45600891113281 58.901097774505615,112.45600891113281 s-4.25,16.125 -5.375,20.375 s-1.75,9.25 2.5,10.75 s6.875,-1.5 8.75,-4.75 s7.875,-21.5 9.369,-27.125 s4.756,-18.5 6.131,-22.375 s2.5,-5.625 3.625,-5.5 s0.25,2.625 -1.125,7 s-5.375,18.5 -7.125,25 s-2.25,9.625 0,12 s7.083,-0.541 8.25,-2.541 s3,-11 5.667,-16.333 c1.6760000000000006,-3.352 3.669,-11.246 6.53,-19.381 c1.6910000000000007,-4.808 4.336,-9.699 5.636,-13.786 c0.35200000000000015,-1.106 0.6700000000000006,-2.172 0.973,-3.219 c2.707,-9.367 3.628,-16.586 6.027,-25.281 C111.40109777450562,37.62300891113284 108.90109777450562,35.62300891113284 109.73409777450561,27.123008911132843 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="93.69230797445994" height="113.3626313971343">
<path fill="#FFFFFF" fill-opacity="1" d="M3.2159081115722756,4.3555316467285365 c1.212,2.56 2.353,4.901 3.361,7.073 c6.5,14 6,37.5 6.5,61 c0.07800000000000007,3.657 0.262,7.679 0.3480000000000004,11.921 c10.591,44.449 51.024,21.223 68.904,3.938 c0.32500000000000034,-1.35 0.929,-2.6580000000000004 1.373,-3.483 c0.8750000000000006,-1.625 2.125,-10.625 3.375,-16.625 s2,-18.5 4,-26.75 c0.17500000000000004,-0.7210000000000005 0.38600000000000034,-1.6430000000000002 0.6230000000000006,-2.715 C57.014908111572254,61.1215316467285 38.86990811157227,17.55553164672847 3.2159081115722756,4.3555316467285365 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 762 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="87.39559722087756" height="246.04394709570136">
<path fill="#FFFFFF" fill-opacity="1" d="M7.380958030700697,3.580294128418018 c0.0850000000000001,4.202 0.07200000000000002,8.622 -0.23900000000000013,13.122 c-1.393,20.15 -4.799,41.913 -4.109,52.957 c1,16 4.5,62 7.5,83 s6.875,83 7.125,87.5 c0.06000000000000005,1.082 0.008000000000000009,2.26 -0.10700000000000007,3.478 c6.992,-11.484 36.463,-9.869 44.754,-6.101 c-1.079,-3.858 -2.297,-10.522 -2.438,-15.043 c-0.16700000000000023,-5.333 7.5,-47.167 8.333,-58.333 s3.6670000000000007,-29.5 4.333,-33.333 s5.75,-17.168 9.5,-25.918 s3.5,-20 2.5,-27.25 s-3.75,-45.75 -4.5,-51.375 s-2.25,-13.125 -3.5,-15.125 c-0.6150000000000005,-0.984 -0.5630000000000005,-2.333 -0.24800000000000014,-3.6420000000000003 C58.4049580307007,24.803294128417974 17.971958030700705,48.02929412841797 7.380958030700697,3.580294128418018 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 972 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="111.80220031738281" height="113.0988998413086">
<path fill="#FFFFFF" fill-opacity="1" d="M59.89757202148439,67.99731256103513 c6.094,-31.882 44.123,-54.828 52.127,-58.308 c-10.162,-2.91 -18.816,-7.853 -20.857,-9.508 c-8,3.5 -15.5,2 -26.75,4.25 S22.917572021484375,17.681312561035156 10.917572021484375,42.181312561035156 s-9.5,57 -9.25,65.75 c0.034000000000000016,1.202 0.012000000000000004,2.258 -0.05800000000000002,3.222 C14.475572021484368,95.76431256103518 45.31757202148435,92.02631256103518 59.89757202148439,67.99731256103513 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 655 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="137.47252481223563" height="341">
<path fill="#FFFFFF" fill-opacity="1" d="M32.98633227539062,4.236250400543213 c-2.021,14.389 -3.102,29.611 -2.827,34 c0.5,8 -6.5,46 -11.5,70 c-3.981,19.107 -12.131,56.915 -14.375,92.478 c-0.5750000000000004,9.105 0.17200000000000001,18.063 0.3750000000000002,26.522 c0.8450000000000004,35.062 9.541,55.489 16.139,69.427 c35.654,13.2 53.799,56.767 88.484,34.358 c2.478,-11.204 8.03,-39.965 9.627,-52.285 c1.75,-13.5 10.083,-66.333 11.815,-88.167 s1.2690000000000001,-38.833 0.4350000000000002,-43.166 s-0.16700000000000018,-12.667 -0.4170000000000002,-21.334 s3.083,-10.166 4.083,-12.333 c-3.834,-8.171 -10.12,-17.359 -17.755,-26.864 C89.19733227539064,52.17525040054318 43.3263322753906,13.263250400543257 32.98633227539062,4.236250400543213 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 889 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="60.90109886079142" height="53.19780227841717">
<path fill="#FFFFFF" fill-opacity="1" d="M16.021927147865284,2.361089355468721 c-5.112,12.975 -9.774000000000001,22.651 -10.456,24.143 c-0.8860000000000005,1.939 -1.456,3.337 -2.977,4.62 c9.057,0.4160000000000002 28.988,8.686 43.015,19.44 c2.127,-7.809 8.37,-20.88 13.05,-29.598 C48.529927147865294,25.83708935546872 17.743927147865293,11.376089355468707 16.021927147865284,2.361089355468721 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 560 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="49.5054931640625" height="22.208791732788086">
<path fill="#FFFFFF" fill-opacity="1" d="M35.32691764831543,3.6785664558410645 c-2.2560000000000002,-2.723 -6.231,-1.6520000000000001 -7.875,-0.7500000000000002 c-0.8820000000000002,0.4840000000000001 -3.5,0.8750000000000002 -5.125,-0.3750000000000001 s-6.125,-0.125 -7.375,1.625 s-11.75,5.125 -12.625,8.125 s8.625,3.25 11,4.125 s4.5,3.75 13.125,3.75 s10.966,-2.787 13.25,-3.25 s8.125,-1.125 8.5,-3.5 S38.95191764831543,8.053566455841064 35.32691764831543,3.6785664558410645 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 645 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="195" height="95.29670341762565">
<path fill="#FFFFFF" fill-opacity="1" d="M39.07358569335935,86.57358569335938 c15.667,-0.8330000000000001 41.167,-2.166 45.333,3.6670000000000003 s15.834,6 19.667,0 s38.028,-6.245 50.833,-4.333 c4.95,0.7390000000000001 9.833,0.81 14.438,0.36300000000000004 c10.975999999999999,-1.066 20.373,-5.078 25.342,-10.017 c-8.889,0.08100000000000002 -18.524,-5.195 -31.03,-10.721 C147.53158569335938,58.406585693359375 139.03158569335938,49.656585693359375 138.40658569335938,46.906585693359375 s0.125,-34.5 0.8750000000000001,-44.5 c-9.208,14.333 -24.041,23 -45.708,23 S52.406585693359375,6.073585693359377 49.406585693359375,2.0735856933593766 c2.167,6.333 1.5,29.833 0.7500000000000001,45.333 c-8.5,15.25 -40,24 -48,27.5 c2.042,1.6550000000000002 10.695,6.598 20.857,9.508 C28.19958569335938,85.89958569335937 33.779585693359365,86.85458569335938 39.07358569335935,86.57358569335938 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30.846137481327787" height="45.65933481475997">
<path fill="#FFFFFF" fill-opacity="1" d="M7.111236572265625,25.129119873046875 c-0.37500000000000006,3.125 -5,6.375 -5.625,13.125 c-0.43800000000000006,4.731 6.25,7.5 10.25,6.5 c5,2.625 6.75,0.6250000000000001 9.875,-0.6250000000000001 c5.75,0.8750000000000001 8,-3.25 8,-7.75 s-4.375,-6.75 -4.875,-12.25 s-3.375,-7.625 -3.125,-13.5 s-2.375,-9.875 -6.086,-9.875 c-5.21,0 -6.289,7.875 -5.914,10.625 S7.486236572265625,22.004119873046875 7.111236572265625,25.129119873046875 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 636 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="223.2966997496476" height="116.6043954431658">
<path fill="#ffffff" d="M111.43578478729161,34.617916805506866 c-70.25856240105628,0 -89.13974277663232,-23.107868432998657 -100.7497539229393,-34.681896448135376 c-0.4411022281646732,1.8606857538223267 -1.4616523833274842,4.1564022481441505 -3.4275648138523103,7.221711230278014 c-2.7147837133407595,4.233763372898102 -5.021547865629197,15.56365173459053 -6.689716292142868,27.46018521785736 c10.365902361869813,9.069336014986037 56.35080964803696,48.16383064389229 84.29463580226899,83.02355720996856 c8.275679303407669,-3.8198311209678653 36.04707458662987,-5.127937412261963 49.730266205310826,-0.4551245391368866 c28.284677875995634,-33.18490844964981 75.15178961849213,-71.37920089960099 85.8635562274456,-79.88791993260384 c-1.0025050640106201,-13.73009260892868 -8.354877203464508,-31.815516072511674 -10.025050640106201,-36.33662076592446 C198.06926490389742,14.023782582045667 181.69434718834793,34.617916805506866 111.43578478729161,34.617916805506866 z" id="svg_1" class="selected" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="51.34065628051758" height="31.69230079650879">
<path fill="#ffffff" d="M1.1372588272094504,5.004125915527311 c7.636,9.505 13.921,18.693 17.755,26.864 c1,-2.167 2.75,-2.833 6.833,-3.167 s5.75,0.8340000000000005 6.917,1.584 c3.8,-7.69 10.229,-16.519 18.101,-25.734 C37.09325882720947,-0.10087408447270718 9.392258827209446,1.20212591552729 1.1372588272094504,5.004125915527311 z" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 505 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="54.714277854332295" height="62.39560088885588" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M5.684631164550808,4.6438108215331795 c-2.167,6.167 -3.166,21 -2.6660000000000004,22.667 s0.8330000000000006,9.333 -1,13.499 s-1.6670000000000007,13.334 -0.667000000000001,21.5 c6,-13.583 37,-29.917 50,-23.667 c-2,-5.5 -2.25,-5.75 -1,-9.25 s2.25,-12 1.5,-16.25 C48.35163116455078,-2.357189178466797 12.351631164550781,0.14281082153320312 5.684631164550808,4.6438108215331795 z" id="svg_1" class="selected" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 594 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="91" height="159.80219772158284">
<path fill="#ffffff" d="M66.14440219211576,153.46020635986326 c14.284,-5.985 25.869,-14.57 23.177,-33.919 c-1.625,-11.25 -17.875,-51.25 -22,-57.25 c-2.265,-3.294 -4.53,-6.027 -5.655,-11.061 C49.09340219211583,33.002206359863294 16.571402192115784,32.79220635986326 3.0714021921157837,2.7912063598632812 c1.167,12.001 2.178,85.65 1.506,98.992 c0.10800000000000005,0.09800000000000011 20.827,42.675 23.494,48.175 C36.58340219211573,163.0722063598633 52.5804021921158,159.1442063598633 66.14440219211576,153.46020635986326 z" style="" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 692 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21" height="40.80219772158284">
<path fill="#FFFFFF" fill-opacity="1" d="M3.372222900390625,36.528844118118286 c3.75,6.375 8.875,3.25 10,-1.75 s7.625,-7.875 6.75,-23.625 s-8.041,-11.667 -11.041,-7.333 C8.080222900390652,8.486844118118285 2.664222900390598,31.403844118118286 3.372222900390625,36.528844118118286 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 427 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="99.96703050827819" height="97.89010658489872" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M96.74723815917969,77.65657043457031 c-2.028,-7.8580000000000005 -4.954,-16.438 -9.03,-24.074 c-4.97,-9.31 -16.414,-30.066 -17.72,-32.176 c-3.25,-5.25 -5.336,-9.194 -6.5,-17.25 c2.692,19.349 -8.893,27.934 -23.177,33.919 c-13.564,5.684 -29.562,9.612 -38.073,-3.502 c2.6670000000000007,5.5 7,11.333 7,17.333 c0,1.363 1.6920000000000006,13.781 4.385,25.354 c2.187,9.396 5.372,18.235 6.115,20.146 C18.247238159179688,84.40657043457031 82.24723815917969,40.40657043457031 96.74723815917969,77.65657043457031 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 713 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.406593164748756" height="20.2087908863316">
<path fill="#FFFFFF" fill-opacity="1" d="M16.060431718826294,19.931314945220947 c8.561,0 15.5,-4.197 15.5,-9.375 s-5.5,-9.375 -15.5,-9.375 c-8.561,0 -15.5,4.197 -15.5,9.375 S7.499431718826315,19.931314945220947 16.060431718826294,19.931314945220947 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 412 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="99.6153767151236" height="107.40658582879212">
<path fill="#FFFFFF" fill-opacity="1" d="M92.26488106584554,64.1449751300811 c-1.167,-4.167 -9.666,-14.833 -16.333,-21.833 s-7.833,-11.333 -12.5,-18.667 S56.09888106584549,8.977975130081177 54.09888106584549,3.4779751300811768 c-13,-6.25 -44,10.084 -50,23.667 c1,8.166 12,15 15,16.5 s3,4.167 3.833,7 s2.834,10.667 3.834,21 s6.25,15.749 8.666,17.666 s2.834,3 3.6670000000000007,4.667 s3.417,6.083 11.167,9.75 s14.999,-1.167 16.749,-4.75 c4.5,4.5 11.084,0.4160000000000003 12.25,-2.084 c4.916,1.416 7.834,-3.25 7.917,-5.166 c1.5830000000000002,0.3340000000000006 3.584,-1.082 4.25,-2.582 c0.8330000000000006,0.3340000000000006 2.5,0.6660000000000011 5,-3.334 S93.43188106584546,68.31197513008124 92.26488106584554,64.1449751300811 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 889 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="111.32966557339068" height="138.12087835503763">
<path fill="#ffffff" d="M108.19560986328122,113.02800787544254 c-2.89,-7.644 -5.897,-16.096 -8.083,-21.561 c-4,-10 -12.75,-51 -18.75,-74.25 C66.86260986328125,-20.032992124557495 2.86260986328125,23.967007875442505 4.36260986328125,36.967007875442505 c7,18 35.75,60.25 40.375,65.875 s16.49,23.007 19.5,28.25 C70.77660986328124,141.2460078754425 110.02960986328128,122.63400787544253 108.19560986328122,113.02800787544254 z" id="svg_1" class="" fill-opacity="1" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 600 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="114.59339949929495" height="149.68131569856712">
<path fill="#FFFFFF" fill-opacity="1" d="M101.78844451904297,33.656578063964844 c-2.75,-3.75 -17.5,-11.5 -21.75,-14.5 c-2.125,-1.5 -7.938,-4.375 -14.281,-7.375 S52.53844451904297,5.656578063964844 48.28844451904297,3.6565780639648438 c-8.417,-0.5840000000000004 -30,7.584 -44.875,19.5 c1,1.75 -0.8750000000000004,7.125 0.125,16.25 s4.125,23.25 6.375,32.125 s7,18.375 8.5,22.875 s9.403,29.364 12.625,32 c2.75,2.25 7.5,0.7500000000000004 8.25,-2.75 s-1.625,-10.875 -2.5,-14.125 s-5.625,-19.25 -6.5,-21.75 s-2,-5.125 -0.25,-5.125 s2.125,2.75 3.25,5.625 s5.875,19.5 6.875,24.125 s4.5,17 6.25,21.75 s5,10 9,9.75 s4.875,-4.75 5.125,-8.375 s-5.875,-23.5 -6.375,-27.625 s-5.375,-19.25 -6.125,-21.25 s-1.375,-5 0.6250000000000004,-5.125 s2.875,5.625 3.75,8.625 s9.75,31.875 10.25,35.5 s2.625,14.5 6,17.75 c2.744,2.6430000000000002 5.625,3.875 8.625,0.8750000000000004 s2.25,-10 0.8750000000000004,-15.25 s-4.625,-21.125 -5.5,-25 s-6.375,-20.875 -7.25,-24 s-2.125,-5.375 -1.125,-5.75 s2.25,1.125 3.5,5.25 s6.625,20.5 8.375,25.5 s1.5,11.625 4.125,17.375 s7,7.625 10.625,7.125 s4.277,-7.391 4.375,-10.125 s-4.75,-20.5 -6.25,-27.375 s-5.25,-16.625 -6.5,-23 s-7.375,-23.375 -8.625,-26 s-0.6250000000000004,-4.75 2.5,-3.875 s9.25,2.625 13,7.625 s10.875,6.75 13.375,7 s8.5,0.3750000000000002 9.25,-6.375 S104.53844451904297,37.406578063964844 101.78844451904297,33.656578063964844 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="95.43955165253556" height="110.99998899606521">
<path fill="#FFFFFF" fill-opacity="1" d="M2.230752944946289,36.163635620117134 c2,8.333 4.333,14.167 4.333,24 s4,22.167 5.167,25 c17.417,18.167 61,46.833 69.25,-8.834 c0,-11.5 3.25,-39.334 3.584,-50.334 s1.3330000000000002,-13 7,-23 C54.709752944946274,16.140635620117223 38.56475294494629,61.99663562011722 2.230752944946289,36.163635620117134 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 506 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="88.62636165506001" height="255.91208380072771">
<path fill="#FFFFFF" fill-opacity="1" d="M11.730757296085358,13.185617813110298 c1.167,2.833 -1.25,16.416 -4.25,33.916 s-4.083,48.751 -3.083,56.751 s9.667,28.833 11.833,35 s0.6670000000000009,8.833 2,20.833 s7.167,47.334 9,59 s1.5,21 -0.6670000000000009,27.167 C33.23075729608536,241.35161781311035 69.23075729608536,238.85161781311035 72.73075729608536,254.35161781311035 c-0.7500000000000007,-4.25 -1.75,-10 -1,-22.25 s5,-60.25 8.25,-87.75 s6.75,-82 4.5,-96.5 s-3.5,-32 -3.5,-43.5 C72.73075729608536,60.01861781311038 29.14775729608533,31.352617813110328 11.730757296085358,13.185617813110298 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 756 B

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="110.90109886079154" height="113.80219772158287" style="">
<path fill="#FFFFFF" fill-opacity="1" d="M50.873603105545044,64.87911415100098 c13.5,30.001 46.022,30.211 58.595,48.439 c-0.7680000000000002,-3.438 -1.004,-7.947 -0.3450000000000002,-14.439 c1.931,-19.007 -4.875,-52.125 -17.875,-68.5 s-53.125,-26.75 -63.595,-26.654 c-4.969,4.939 -14.366,8.951 -25.342,10.017 C13.123603105545044,16.629114151000977 48.855603105545015,44.13011415100095 50.873603105545044,64.87911415100098 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 596 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="141.01098493993612" height="337.2417493741184">
<path fill="#FFFFFF" fill-opacity="1" d="M23.270727508544894,83.6719907836914 c-7.872,9.216 -14.301,18.044 -18.101,25.734 c1.167,0.7500000000000004 3.083,5.083 4.333,8.083 s1,20.75 -0.25,31.5 s1.5,59.75 3.75,71 s8.417,55.334 10.084,67.001 s5.166,31.5 7.166,39.833 c36.334,25.833 52.479,-20.023 89.334,-33.168 c5.667,-10 13.999,-27.333 15.999,-52.333 c0.8740000000000004,-10.926 1.6030000000000002,-27.168 0.8240000000000004,-43.078 c-1.002,-20.493 -3.8440000000000003,-40.436 -5.157,-47.754 c-2.333,-13 -14.834,-82.834 -17,-92.667 s-4.333,-40 -5.333,-53.666 C98.23372750854492,12.62599078369135 51.483727508544916,50.64099078369145 23.270727508544894,83.6719907836914 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 829 B

@ -1,2 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="62.75823228599029" height="51.72526646224685">
<path fill="#FFFFFF" fill-opacity="1" d="M60.9257869720459,31.12909698486328 c-8.5,-4 -5.75,-8.25 -9.5,-15 c-1.7000000000000002,-3.061 -4.019,-8.847 -6.417,-15.189 c1.834,9.606 -37.419,28.219 -43.958,18.064 c1.544,2.689 5.188,10.48 8.506,17.668 c3.15,6.824 6.007,13.104 6.494,13.957 C30.9257869720459,38.71309698486323 52.50878697204587,30.545096984863335 60.9257869720459,31.12909698486328 z" id="svg_1" class="" stroke="#000000" stroke-opacity="1"/></svg>

Before

Width:  |  Height:  |  Size: 551 B

@ -17,8 +17,8 @@ const PACKAGES_ORDERS = '/api/orders';
const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -1612,4 +1612,5 @@ const Map localizedValues = {
"viewDocList": {"en": "View List of Doctors", "ar": "عرض قائمة الأطباء"},
"bodyFatTitle": {"en": "Body Fat", "ar": " الدهون في الجسم"},
"cholesTitle": {"en": "Blood Cholesterol", "ar": " الكولسترول في الدم"},
"laserClinic": {"en": "Laser Clinic", "ar": "عيادة الليزر"},
};

@ -26,6 +26,7 @@ class COCItem {
String status;
String statusAr;
dynamic statusEn;
int statusId;
COCItem({
this.appointment,
@ -55,6 +56,7 @@ class COCItem {
this.status,
this.statusAr,
this.statusEn,
this.statusId,
});
COCItem.fromJson(Map<String, dynamic> json) {
@ -85,6 +87,7 @@ class COCItem {
status = json['Status'];
statusAr = json['StatusAr'];
statusEn = json['StatusEn'];
statusId = json['StatusId'];
}
Map<String, dynamic> toJson() {

@ -223,8 +223,6 @@ class _AllHabibMedicalSevicePage2State extends State<AllHabibMedicalSevicePage2>
var data = await this.sharedPref.getObject(WEATHER);
if (data == null) {
var d = await _weatherService.getWeatherData();
print(d);
weatherNum = d.temperature;
setState(() {
weather = d != null ? d.temperature.toString() + '\u2103' : '--';

@ -6,7 +6,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
class H2OPageIndexPage extends StatelessWidget {
@override
@ -23,7 +22,7 @@ class H2OPageIndexPage extends StatelessWidget {
"Water Tracker:",
fontWeight: FontWeight.normal,
fontSize: 25,
color: HexColor("#60686b"),
color: Color(0xFF60686b),
),
SizedBox(
height: 12,

@ -3,8 +3,6 @@ import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_v
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/charts/app_bar_chart.dart';
import 'package:diplomaticquarterapp/widgets/errors/app_embedded_error.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/cupertino.dart';

@ -11,8 +11,6 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:percent_indicator/circular_percent_indicator.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:wave/config.dart';
import 'package:wave/wave.dart';

@ -2,8 +2,6 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.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_info.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart';
@ -20,10 +18,10 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/radio_selection_dialog.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/show_zoom_image_dialog.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
import 'package:provider/provider.dart';
enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON }
@ -74,14 +72,38 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
super.initState();
}
int getSelectedCityID(MyBalanceViewModel model) {
int cityID = 1;
model.CitiesModelList.forEach((element) {
if (element.description == model.bloodModelList[0].city) {
cityID = element.iD;
}
});
return cityID;
}
@override
Widget build(BuildContext context) {
projectProvider = Provider.of(context);
return BaseView<MyBalanceViewModel>(
onModelReady: (model) {
model.getCities();
model.getBlood();
model.getCities().then((value) {
model.getBlood().then((value) {
if (model.bloodModelList.length > 0) {
CitiesModel citiesModel = new CitiesModel();
citiesModel.iD = getSelectedCityID(model);
_selectedHospitalIndex = (citiesModel.iD - 1);
citiesModel.description = model.CitiesModelList[_selectedHospitalIndex].description;
citiesModel.descriptionN = model.CitiesModelList[_selectedHospitalIndex].descriptionN;
_selectedHospital = citiesModel;
} else {
_selectedHospital = model.CitiesModelList[0];
}
});
});
},
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
@ -89,6 +111,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
backgroundColor: Color(0xffF7F7F7),
showNewAppBarTitle: true,
baseViewModel: model,
isShowDecPage: true,
imagesInfo: imagesInfo,
description: TranslationBase.of(context).bloodDonationInfo,
appBarTitle: TranslationBase.of(context).bloodD,
@ -106,31 +129,32 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64),
),
SizedBox(height: 12),
CommonDropDownView(
TranslationBase.of(context).city,
model.bloodModelList.isNotEmpty
? model.bloodModelList[0].city
: projectProvider.isArabic
? model.CitiesModelList[_selectedHospitalIndex].descriptionN
: model.CitiesModelList[_selectedHospitalIndex].description, () {
List<RadioSelectionDialogModel> list = [
for (int i = 0; i < model.CitiesModelList.length; i++)
RadioSelectionDialogModel(projectProvider.isArabic ? model.CitiesModelList[i].descriptionN : model.CitiesModelList[i].description, i),
];
if (projectProvider.isLogin && model.state != ViewState.Busy)
CommonDropDownView(
TranslationBase.of(context).city,
// (model.bloodModelList.isNotEmpty && model.CitiesModelList.isNotEmpty)
// ? model.bloodModelList[0].city
// :
projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description, () {
List<RadioSelectionDialogModel> list = [
for (int i = 0; i < model.CitiesModelList.length; i++)
RadioSelectionDialogModel(projectProvider.isArabic ? model.CitiesModelList[i].descriptionN : model.CitiesModelList[i].description, i),
];
showDialog(
context: context,
child: RadioSelectionDialog(
listData: list,
selectedIndex: _selectedHospitalIndex,
isScrollable: true,
onValueSelected: (index) {
_selectedHospitalIndex = index;
_selectedHospital = model.CitiesModelList[index];
},
),
);
}).withBorderedContainer,
showDialog(
context: context,
child: RadioSelectionDialog(
listData: list,
selectedIndex: _selectedHospitalIndex,
isScrollable: true,
onValueSelected: (index) {
_selectedHospitalIndex = index;
_selectedHospital = model.CitiesModelList[index];
setState(() {});
},
),
);
}).withBorderedContainer,
SizedBox(height: 12),
CommonDropDownView(TranslationBase.of(context).gender, _selectedGenderIndex == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female, () {
List<RadioSelectionDialogModel> list = [
@ -226,19 +250,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
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(TranslationBase.of(context).cancel),
buttonCancelColor: Colors.grey,
onlyCancelButton: true,
),
);
showZoomImageDialog(context, 'assets/images/BloodChrt_EN.png', isNetworkImage: false);
},
child: Container(width: 250, height: 200, child: Image.asset('assets/images/BloodChrt_EN.png'), color: Colors.white),
),
@ -261,7 +273,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
AppToast.showErrorToast(message: TranslationBase.of(context).selectCity);
return;
}
bloodDetails.city = projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description;
bloodDetails.city = _selectedHospital.description;
bloodDetails.cityCode = _selectedHospital.iD.toString();
bloodDetails.gender = _selectedGenderIndex;
bloodDetails.bloodGroup = getBlood(_selectedBloodTypeIndex);

@ -1,6 +1,6 @@
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
class LaserBooking extends StatefulWidget {
@override
@ -10,118 +10,6 @@ class LaserBooking extends StatefulWidget {
class _LaserBookingState extends State<LaserBooking> {
@override
Widget build(BuildContext context) {
return AppScaffold(
isShowDecPage: false,
isShowAppBar: true,
showNewAppBarTitle: true,
showNewAppBar: true,
appBarTitle: "Laser",
body: Container(
child: Column(
children: [
HumanAnatomy(),
],
),
));
}
}
class HumanAnatomy extends StatefulWidget {
final ValueChanged<List> onChanged;
const HumanAnatomy({Key key, this.onChanged}) : super(key: key);
@override
_HumanAnatomyState createState() => new _HumanAnatomyState();
}
class _HumanAnatomyState extends State<HumanAnatomy> {
var _bodyPartList = [];
@override
void initState() {
super.initState();
if (mounted) {
_publishSelection(_bodyPartList);
}
}
@override
Widget build(BuildContext context) {
return humanAnatomy();
}
Widget humanAnatomy() {
return Container(
width: 320.0,
height: 560.0,
child: SizedBox(
child: Stack(
children: <Widget>[
bodyPart("assets/images/new/body/head.svg", "Head", 0.0, 0.0, 0.0, 70.0),
bodyPart("assets/images/new/body/left_ear.svg", "leftEar", 32.0, 50.0, 0.0, 20.0),
bodyPart("assets/images/new/body/right_ear.svg", "rightEar", 32.0, 0.0, 50.0, 20.0),
bodyPart("assets/images/new/body/left_eye.svg", "LeftEye", 22.0, 20.0, 0.0, 10.0),
bodyPart("assets/images/new/body/right_eye.svg", "rightEye", 22.0, 0.0, 20.0, 10.0),
bodyPart("assets/images/new/body/nose.svg", "Nose", 25.0, 0.0, 0.0, 20.0),
bodyPart("assets/images/new/body/mouth.svg", "Mouth", 48.0, 0.0, 0.0, 10.0),
bodyPart("assets/images/new/body/neck.svg", "Neck", 58.0, 0.0, 0.0, 40.0),
bodyPart("assets/images/new/body/chest.svg", "Chest", 93.0, 0.0, 0.0, 95.0),
bodyPart("assets/images/new/body/abdomin.svg", "Abdomin", 175.0, 0.0, 0.0, 65.0),
bodyPart("assets/images/new/body/pelvis.svg", "Pelvis", 225.0, 0.0, 0.0, 50.0),
bodyPart("assets/images/new/body/publs.svg", "Publs", 275.0, 0.0, 0.0, 15.0),
bodyPart("assets/images/new/body/left_soulder.svg", "leftSoulder", 90.0, 105.0, 0.0, 50.0),
bodyPart("assets/images/new/body/right_soulder.svg", "rightSoulder", 89.0, 0.0, 110.0, 50.0),
bodyPart("assets/images/new/body/left_arm.svg", "leftArm", 120.0, 145.0, 0.0, 70.0),
bodyPart("assets/images/new/body/right_arm.svg", "rightArm", 118.0, 0.0, 142.0, 70.0),
bodyPart("assets/images/new/body/left_elbow.svg", "leftElbow", 172.0, 172.0, 0.0, 39.0),
bodyPart("assets/images/new/body/right_elbow.svg", "rightElbow", 170.0, 0.0, 170.0, 40.0),
bodyPart("assets/images/new/body/left_forearm.svg", "leftForearm", 195.0, 190.0, 0.0, 54.0),
bodyPart("assets/images/new/body/right_forearm.svg", "rightForearm", 195.0, 0.0, 190.0, 54.0),
bodyPart("assets/images/new/body/left_wrist.svg", "leftWrist", 238.0, 220.0, 0.0, 23.0),
bodyPart("assets/images/new/body/right_wrist.svg", "rightWrist", 238.0, 0.0, 220.0, 23.0),
bodyPart("assets/images/new/body/left_hand.svg", "leftHand", 250.0, 250.0, 0.0, 60.0),
bodyPart("assets/images/new/body/right_hand.svg", "rightHand", 250.0, 0.0, 250.0, 60.0),
bodyPart("assets/images/new/body/left_thigh.svg", "leftThigh", 242.0, 63.0, 0.0, 138.0),
bodyPart("assets/images/new/body/right_thigh.svg", "rightThigh", 242.0, 0.0, 63.0, 138.0),
bodyPart("assets/images/new/body/left_knee.svg", "leftKnee", 360.0, 68.0, 0.0, 48.0),
bodyPart("assets/images/new/body/right_knee.svg", "rightKnee", 360.0, 0.0, 68.0, 48.0),
bodyPart("assets/images/new/body/left_leg.svg", "leftLeg", 395.0, 64.0, 0.0, 105.0),
bodyPart("assets/images/new/body/right_leg.svg", "rightLeg", 393.0, 0.0, 65.0, 106.0),
bodyPart("assets/images/new/body/left_ankle.svg", "leftAnkle", 495.0, 64.0, 0.0, 25.0),
bodyPart("assets/images/new/body/right_ankle.svg", "rightAnkle", 493.0, 0.0, 68.0, 25.0),
bodyPart("assets/images/new/body/left_foot.svg", "leftFoot", 510.0, 80.0, 0.0, 60.0),
bodyPart("assets/images/new/body/right_foot.svg", "rightFoot", 508.0, 0.0, 83.0, 56.0),
],
),
),
);
}
Widget bodyPart(String svgPath, String svgName, double marginTop, double marginRight, double marginLeft, double height) {
Color _svgColor = _bodyPartList.contains(svgName) ? Colors.redAccent : null;
final Widget bodyPartSvg = new SvgPicture.asset(svgPath, semanticsLabel: svgName, color: _svgColor);
return Container(
margin: EdgeInsets.only(top: marginTop, right: marginRight, left: marginLeft),
height: height,
alignment: Alignment.topCenter,
child: GestureDetector(
onTap: () {
setState(() {
if (_bodyPartList.contains(svgName)) {
_bodyPartList.remove(svgName);
} else {
_bodyPartList.add(svgName);
}
});
},
child: bodyPartSvg),
);
}
void _publishSelection(List _bodyPartList) {
if (widget.onChanged != null) {
widget.onChanged(_bodyPartList);
}
return AppScaffold(isShowDecPage: false, isShowAppBar: true, showNewAppBarTitle: true, showNewAppBar: true, appBarTitle: TranslationBase.of(context).laserClinic, body: Container());
}
}

@ -539,8 +539,8 @@ class _SearchByClinicState extends State<SearchByClinic> {
navigateToDentalComplaints(context, searchInfo);
} else if (dropdownValue.split("-")[0] == "253") {
// navigateToLaserClinic(context);
callDoctorsSearchAPI();
navigateToLaserClinic(context);
// callDoctorsSearchAPI();
} else if (dropdownValue.split("-")[1] == "true"
// && authProvider.isLogin &&
// authUser.patientType == 1

@ -1,10 +1,7 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/hospital_location.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:url_launcher/url_launcher.dart';
class HospitalsPage extends StatefulWidget {

@ -10,7 +10,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../uitl/translations_delegate_base.dart';
import 'widgets/card_position.dart';
class NearestEr extends StatefulWidget {
static const String _url = "assets/images/";

@ -1,61 +0,0 @@
import 'package:flutter/material.dart';
class CardCommonEr extends StatelessWidget {
final image;
final text;
final subText;
final bool locked;
final Function onTap;
const CardCommonEr({
this.locked = false,
@required this.image,
@required this.text,
@required this.subText,
@required this.onTap,
});
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: locked ? null : onTap,
child: Opacity(
opacity: locked ? 0.25 : 1.0,
child: Stack(
children: [
Container(
width: double.infinity,
padding: EdgeInsets.only(left: 20, right: 20, bottom: 15, top: 28),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Image.asset(this.image, width: 42.0, height: 42.0),
Text(
text + "${subText.isEmpty ? "" : "\n$subText"}",
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 20 / 16),
),
],
),
),
if (locked) Align(alignment: Alignment.center, child: lock())
],
),
),
);
}
Widget lock() {
return Container(
child: Icon(Icons.lock_rounded, size: 80),
);
}
}

@ -1,106 +0,0 @@
//import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:url_launcher/url_launcher.dart';
class CardPosition extends StatelessWidget {
final image;
final text;
final subText;
final type;
final telephone;
final networkImage;
final latitude;
final longitude;
final projectname;
final cardSize;
final String waitingTime;
const CardPosition({
@required this.image,
@required this.text,
@required this.subText,
@required this.type,
@required this.telephone,
@required this.networkImage,
@required this.latitude,
@required this.longitude,
@required this.projectname,
@required this.cardSize,
@required this.waitingTime,
});
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
navigateToSearch(context, this.type, this.telephone, this.networkImage, this.latitude, this.longitude, this.projectname);
},
child: Container(
// width:MediaQuery.of(context).size.width * 0.47,//165,
margin: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 8.0),
decoration: BoxDecoration(boxShadow: [BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)], borderRadius: BorderRadius.circular(10), color: Colors.white),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
height: cardSize * 0.2 - 8,
margin: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 0.0),
child: Text(this.text, overflow: TextOverflow.clip, style: TextStyle(color: Colors.black, letterSpacing: 1.0, fontSize: 2 * SizeConfig.textMultiplier)),
),
Container(
height: cardSize * 0.5 - 8,
alignment: Alignment.center,
margin: EdgeInsets.fromLTRB(0.0, 0.0, 8.0, 8.0),
child: Image.asset(this.image, width: 60.0, height: cardSize * 0.4),
),
Container(
margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0),
height: cardSize * 0.2 - 8,
child: Text(this.subText, overflow: TextOverflow.clip, style: TextStyle(color: Color(0xFFc5272d), letterSpacing: 1.0, fontSize: 15.0)),
),
],
),
),
);
}
Future navigateToSearch(context, type, telephone, networkImage, latitude, longitude, projectname) async {
var localize = TranslationBase.of(context);
showDialog(
context: context,
builder: (_) => AssetGiffyDialog(
entryAnimation: EntryAnimation.BOTTOM,
image: Image.network(
networkImage,
fit: BoxFit.cover,
),
title: Text(
projectname,
style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
),
description: Text(
"${localize.averageWaitingTime}\n\n$waitingTime ${localize.minute}",
textAlign: TextAlign.center,
),
buttonOkText: Text(
"LOCATION",
style: TextStyle(color: Colors.white),
),
buttonOkColor: Colors.grey,
buttonCancelText: Text(
'CAll',
style: TextStyle(color: Colors.white),
),
buttonCancelColor: Colors.grey,
onOkButtonPressed: () {
MapsLauncher.launchCoordinates(double.parse(latitude), double.parse(longitude), projectname);
},
onCancelButtonPressed: () {
launch("tel://" + telephone);
}));
}
}

@ -408,6 +408,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
prescriptions.actualDoctorRate = widget.appo.actualDoctorRate;
prescriptions.noOfPatientsRate = widget.appo.noOfPatientsRate;
prescriptions.isInOutPatient = widget.appo.isInOutPatient;
prescriptions.doctorID = widget.appo.doctorID;
navigateToMedicinePrescriptionReport(prescriptions);
}

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/viewModels/feedback/feedback_view_mode
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/feedback/feedback-detail.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@ -28,10 +29,10 @@ class _StatusFeedbackPageState extends State<StatusFeedbackPage> {
TextEditingController complainNumberController = TextEditingController();
StatusType statusType = StatusType.ComplaintNumber;
int selectedStatusIndex = 3;
ProjectViewModel projectViewModel;
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
projectViewModel = Provider.of(context);
return BaseView<FeedbackViewModel>(
allowAny: true,
onModelReady: (model) {
@ -202,38 +203,67 @@ class _StatusFeedbackPageState extends State<StatusFeedbackPage> {
shrinkWrap: isLogin ? false : true,
physics: isLogin ? null : NeverScrollableScrollPhysics(),
itemBuilder: (context, index) => InkWell(
onTap: () {},
onTap: () {
// sss
},
child: Container(
decoration: cardRadius(12),
margin: EdgeInsets.all(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(isArabic ? cOCItemList[index].statusAr : cOCItemList[index].status, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56, fontWeight: FontWeight.bold)),
Container(
margin: EdgeInsets.only(top: 5.0),
child: Text(cOCItemList[index].formType.toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12))),
MyRichText(TranslationBase.of(context).number + ": ", cOCItemList[index].itemID.toString(), isArabic),
Text(cOCItemList[index].cOCTitle,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12)),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(cOCItemList[index].date.split(" ")[0],
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)),
Text(cOCItemList[index].date.split(" ")[1].substring(0, 4),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)),
],
),
],
margin: EdgeInsets.only(top: 12),
decoration: BoxDecoration(
color: (cOCItemList[index].statusId==7||cOCItemList[index].statusId==8)?CustomColors.accentColor:(cOCItemList[index].statusId==10||cOCItemList[index].statusId==6||cOCItemList[index].statusId==9)?CustomColors.green:CustomColors.orange,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
blurRadius: 27,
offset: Offset(0, -3),
),
],
),
child: Container(
margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 6, right: projectViewModel.isArabic ? 6 : 0),
padding: EdgeInsets.symmetric(vertical: 14, horizontal: 12),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.only(
bottomRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
topRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
bottomLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
topLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
),
),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(isArabic ? cOCItemList[index].statusAr : cOCItemList[index].status, style: TextStyle(fontSize: 14.0, letterSpacing: -0.56, fontWeight: FontWeight.bold)),
Container(
margin: EdgeInsets.only(top: 5.0),
child: Text(cOCItemList[index].formType.toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12))),
MyRichText(TranslationBase.of(context).number + ": ", cOCItemList[index].itemID.toString(), isArabic),
Text(cOCItemList[index].cOCTitle,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12)),
],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Text(cOCItemList[index].date.split(" ")[0],
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)),
Text(cOCItemList[index].date.split(" ")[1].substring(0, 4),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48)),
],
),
],
),
),
),
),

@ -23,7 +23,6 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
import 'landing_page_pharmcy.dart';
@ -196,7 +195,7 @@ class _HomePageState extends State<HomePage> {
width: double.infinity,
height: 125,
decoration: BoxDecoration(
color: HexColor('#A59E9E'),
color: Color(0xFFA59E9E),
shape: BoxShape.rectangle,
border: Border.all(color: Colors.transparent, width: 0.5),
borderRadius: BorderRadius.all(Radius.circular(9)),
@ -231,7 +230,7 @@ class _HomePageState extends State<HomePage> {
width: 90,
height: 30,
decoration: BoxDecoration(
color: HexColor('#D81A2E'),
color: Color(0xFFD81A2E),
shape: BoxShape.rectangle,
border: Border.all(color: Colors.transparent, width: 0.5),
borderRadius: BorderRadius.all(Radius.circular(0)),
@ -255,7 +254,7 @@ class _HomePageState extends State<HomePage> {
width: double.infinity,
height: projectViewModel.isArabic ? 160 : 130,
decoration: BoxDecoration(
color: HexColor('#A59E9E'),
color: Color(0xFFA59E9E),
shape: BoxShape.rectangle,
border: Border.all(color: Colors.transparent, width: 0.5),
borderRadius: BorderRadius.all(Radius.circular(9)),
@ -341,7 +340,7 @@ class _HomePageState extends State<HomePage> {
width: 90,
height: 30,
decoration: BoxDecoration(
color: HexColor('#D81A2E'),
color: Color(0xFFD81A2E),
shape: BoxShape.rectangle,
border: Border.all(color: Colors.transparent, width: 0.5),
borderRadius: BorderRadius.all(
@ -593,7 +592,7 @@ class _HomePageState extends State<HomePage> {
)),
),
height: MediaQuery.of(context).size.width * 0.4,
color: HexColor("#747C80"),
color: Color(0xFF747C80),
imageName: 'emergency_service_image.png',
),
],
@ -826,7 +825,6 @@ class _HomePageState extends State<HomePage> {
} else {
GifLoaderDialogUtils.showMyDialog(context);
await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
await pharmacyModuleViewModel.verifyCustomer().then((value) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.push(context, FadePage(page: LandingPagePharmacy()));
@ -868,7 +866,7 @@ class DashboardItem extends StatelessWidget {
color: !hasBorder
? color != null
? color
: HexColor('#050705').withOpacity(opacity)
: Color(0xFF050705).withOpacity(opacity)
: Colors.white,
borderRadius: BorderRadius.circular(6.0),
border: hasBorder ? Border.all(width: 1.0, color: const Color(0xffcccccc)) : Border.all(width: 0.0, color: Colors.transparent),

@ -29,7 +29,6 @@ import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/not_auh_page.dart';
@ -242,15 +241,14 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
pageController = PageController(keepPage: true);
_firebaseMessaging.setAutoInitEnabled(true);
// signalRUtil = new SignalRUtil(hubName: "http://192.168.8.101:5001/chatHub", context: context);
// signalRUtil = new SignalRUtil(hubName: "https://api.cssynapses.com/chatsocket", context: context);
signalRUtil = new SignalRUtil(hubName: "https://VCallApi.hmg.com/WebRTCHub?source=mobile&username=2001273", context: context);
locationUtils = new LocationUtils(isShowConfirmDialog: false, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) {
if (projectViewModel.isLogin && !projectViewModel.isLoginChild) {
familyFileProvider.getSharedRecordByStatus();
}
// signalRUtil.startSignalRConnection();
if (!signalRUtil.getConnectionState()) signalRUtil.startSignalRConnection();
});
// HMG (Guest/Internet) Wifi Access [Zohaib Kambrani]
//for now commented to reduce this call will enable it when needed
@ -507,91 +505,93 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
model = Provider.of<ToDoCountProviderModel>(context);
// currentTab == 0 ? 45 : 0.0
return Scaffold(
appBar: currentTab == 0 ? PreferredSize(
preferredSize: Size.fromHeight(currentTab == 0 ? 45 : 0.0),
child: AppBar(
elevation: 0,
backgroundColor: CustomColors.backgroudGreyColor,
textTheme: TextTheme(
headline6: TextStyle(color: Theme.of(context).textTheme.headline1.color, fontWeight: FontWeight.bold),
),
title: Text(
getText(currentTab).toUpperCase(),
style: TextStyle(
fontWeight: FontWeight.bold,
color: currentTab == 0 ? CustomColors.backgroudGreyColor : Theme.of(context).textTheme.headline1.color,
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
// bold: true,
),
leading: Builder(
builder: (BuildContext context) {
return new Stack(
children: <Widget>[
currentTab == 0
? IconButton(
icon: SvgPicture.asset("assets/images/new/menu.svg"),
color: Theme.of(context).textTheme.headline1.color,
onPressed: () => Scaffold.of(context).openDrawer(),
)
: IconButton(
icon: Icon(Icons.arrow_back),
onPressed: () {
setState(() {
currentTab = 0;
});
pageController.jumpToPage(0);
},
),
projectViewModel.isLogin && model.notificationsCount != null && !projectViewModel.isLoginChild
? new Positioned(
right: projectViewModel.isArabic ? 35 : 0,
top: 5,
child: new Container(
padding: EdgeInsets.all(4),
decoration: new BoxDecoration(
color: CustomColors.accentColor,
borderRadius: BorderRadius.circular(20),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: new Text(
model.notificationsCount.toString(),
style: new TextStyle(
color: Colors.white,
fontSize: projectViewModel.isArabic ? 8 : 9,
appBar: currentTab == 0
? PreferredSize(
preferredSize: Size.fromHeight(currentTab == 0 ? 45 : 0.0),
child: AppBar(
elevation: 0,
backgroundColor: CustomColors.backgroudGreyColor,
textTheme: TextTheme(
headline6: TextStyle(color: Theme.of(context).textTheme.headline1.color, fontWeight: FontWeight.bold),
),
title: Text(
getText(currentTab).toUpperCase(),
style: TextStyle(
fontWeight: FontWeight.bold,
color: currentTab == 0 ? CustomColors.backgroudGreyColor : Theme.of(context).textTheme.headline1.color,
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
// bold: true,
),
leading: Builder(
builder: (BuildContext context) {
return new Stack(
children: <Widget>[
currentTab == 0
? IconButton(
icon: SvgPicture.asset("assets/images/new/menu.svg"),
color: Theme.of(context).textTheme.headline1.color,
onPressed: () => Scaffold.of(context).openDrawer(),
)
: IconButton(
icon: Icon(Icons.arrow_back),
onPressed: () {
setState(() {
currentTab = 0;
});
pageController.jumpToPage(0);
},
),
textAlign: TextAlign.center,
),
),
)
: SizedBox()
projectViewModel.isLogin && model.notificationsCount != null && !projectViewModel.isLoginChild
? new Positioned(
right: projectViewModel.isArabic ? 35 : 0,
top: 5,
child: new Container(
padding: EdgeInsets.all(4),
decoration: new BoxDecoration(
color: CustomColors.accentColor,
borderRadius: BorderRadius.circular(20),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: new Text(
model.notificationsCount.toString(),
style: new TextStyle(
color: Colors.white,
fontSize: projectViewModel.isArabic ? 8 : 9,
),
textAlign: TextAlign.center,
),
),
)
: SizedBox()
],
);
},
),
actions: [
// IconButton(
// //iconSize: 70,
// icon: Icon(
// projectViewModel.isLogin ? Icons.settings : Icons.login,
// color: Theme.of(context).textTheme.headline1.color,
// ),
// onPressed: () {
// if (projectViewModel.isLogin)
// Navigator.of(context).pushNamed(
// SETTINGS,
// );
// else
// login();
// }, //do something,
// )
],
);
},
),
actions: [
// IconButton(
// //iconSize: 70,
// icon: Icon(
// projectViewModel.isLogin ? Icons.settings : Icons.login,
// color: Theme.of(context).textTheme.headline1.color,
// ),
// onPressed: () {
// if (projectViewModel.isLogin)
// Navigator.of(context).pushNamed(
// SETTINGS,
// );
// else
// login();
// }, //do something,
// )
],
centerTitle: true,
),
) : null,
centerTitle: true,
),
)
: null,
drawer: SafeArea(child: AppDrawer()),
extendBody: false,
body: WillPopScope(

@ -20,11 +20,12 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart' as intl;
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:intl/intl.dart' as intl;
class Register extends StatefulWidget {
final Function changePageViewIndex;
const Register({Key key, this.changePageViewIndex}) : super(key: key);
@override
@ -327,8 +328,7 @@ class _Register extends State<Register> {
var nRequest = request.toJson();
nRequest['LogInTokenID'] = response['LogInTokenID'];
if (response['hasFile'] == true) {
// AppToast.showErrorToast(message: response['ErrorEndUserMessage']);
AlertDialogBox(
ConfirmDialog dialog = new ConfirmDialog(
context: context,
confirmMessage: response['ErrorEndUserMessage'],
okText: TranslationBase.of(context).ok,

@ -62,107 +62,135 @@ class PrescriptionItemsPage extends StatelessWidget {
prescriptions.noOfPatientsRate,
model.user.emailAddress,
),
isNeedToShowButton: projectViewModel.havePrivilege(13),
isNeedToShowButton: (model.prescriptionReportListINP.length > 0 || model.prescriptionReportEnhList.length > 0) ? projectViewModel.havePrivilege(13) : false,
showConfirmMessageDialog: false,
onTap: () {
showConfirmMessage(context, model);
},
),
if (!prescriptions.isInOutPatient)
ListView.separated(
itemBuilder: (context, index) {
return InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PrescriptionDetailsPageINP(
prescriptionReport: model.prescriptionReportListINP[index],
),
),
);
},
child: Container(
width: double.infinity,
child: Container(
margin: EdgeInsets.only(left: 16, right: 16, top: index == 0 ? 16 : 4, bottom: 4),
decoration: cardRadius(12),
child: Padding(
padding: EdgeInsets.only(top: 12, bottom: 20, left: projectViewModel.isArabic ? 12 : 20, right: projectViewModel.isArabic ? 20 : 12),
child: Row(
children: [
Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
model.prescriptionReportListINP[index].itemDescription.isNotEmpty
? model.prescriptionReportListINP[index].itemDescription
: model.prescriptionReportListINP[index].itemDescriptionN ?? '',
style: TextStyle(
fontSize: 16,
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
),
),
mHeight(10),
Row(
model.prescriptionReportListINP.length > 0
? ListView.separated(
itemBuilder: (context, index) {
return InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PrescriptionDetailsPageINP(
prescriptionReport: model.prescriptionReportListINP[index],
),
),
);
},
child: Container(
width: double.infinity,
child: Container(
margin: EdgeInsets.only(left: 16, right: 16, top: index == 0 ? 16 : 4, bottom: 4),
decoration: cardRadius(12),
child: Padding(
padding: EdgeInsets.only(top: 12, bottom: 20, left: projectViewModel.isArabic ? 12 : 20, right: projectViewModel.isArabic ? 20 : 12),
child: Row(
children: [
Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
model.prescriptionReportListINP[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 60,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
Container(
child: Icon(Icons.search,size: 18,color: Colors.white,),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
Text(
model.prescriptionReportListINP[index].itemDescription.isNotEmpty
? model.prescriptionReportListINP[index].itemDescription
: model.prescriptionReportListINP[index].itemDescriptionN ?? '',
style: TextStyle(
fontSize: 16,
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
),
onTap: (){
showZoomImageDialog(context, model.prescriptionReportListINP[index].imageSRCUrl,);
},
),
mWidth(12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mHeight(10),
Row(
children: [
Row(
children: [
Text(
TranslationBase.of(context).route + ": ",
style: TextStyle(
color: Colors.grey,
fontSize: 10,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
model.prescriptionReportListINP[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 60,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
),
Text(
model.prescriptionReportListINP[index].route,
style: TextStyle(
fontSize: 12,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
Container(
child: Icon(
Icons.search,
size: 18,
color: Colors.white,
),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
),
onTap: () {
showZoomImageDialog(
context,
model.prescriptionReportListINP[index].imageSRCUrl,
);
},
),
Row(
mWidth(12),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
TranslationBase.of(context).route + ": ",
style: TextStyle(
color: Colors.grey,
fontSize: 10,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
),
Text(
model.prescriptionReportListINP[index].route,
style: TextStyle(
fontSize: 12,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
),
Row(
children: [
Text(
TranslationBase.of(context).dailyDoses + ": ",
style: TextStyle(
color: Colors.grey,
fontSize: 10,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
),
Text(
model.prescriptionReportListINP[index].doseDailyQuantity.toString(),
style: TextStyle(
fontSize: 12,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
),
mHeight(12),
Text(
TranslationBase.of(context).dailyDoses + ": ",
model.prescriptionReportListINP[index].remarks,
style: TextStyle(
color: Colors.grey,
fontSize: 10,
@ -170,184 +198,180 @@ class PrescriptionItemsPage extends StatelessWidget {
fontWeight: FontWeight.w600,
),
),
Text(
model.prescriptionReportListINP[index].doseDailyQuantity.toString(),
style: TextStyle(
fontSize: 12,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
),
],
),
mHeight(12),
Text(
model.prescriptionReportListINP[index].remarks,
style: TextStyle(
color: Colors.grey,
fontSize: 10,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
),
)
],
)
),
],
),
],
),
),
Icon(
Icons.arrow_forward,
size: 16,
),
Icon(
Icons.arrow_forward,
size: 16,
),
],
),
],
),
),
),
),
);
},
separatorBuilder: (context, index) {
return mHeight(8);
},
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: model.prescriptionReportListINP.length)
else
ListView.separated(
padding: EdgeInsets.all(21),
itemBuilder: (context, index) {
return InkWell(
onTap: () {
PrescriptionReport prescriptionReport = PrescriptionReport(
imageSRCUrl: model.prescriptionReportEnhList[index].imageSRCUrl,
itemDescription: model.prescriptionReportEnhList[index].itemDescription,
itemDescriptionN: model.prescriptionReportEnhList[index].itemDescription,
routeN: model.prescriptionReportEnhList[index].route,
frequency: model.prescriptionReportEnhList[index].frequency,
frequencyN: model.prescriptionReportEnhList[index].frequency,
doseDailyQuantity: model.prescriptionReportEnhList[index].doseDailyQuantity,
days: model.prescriptionReportEnhList[index].days,
itemID: model.prescriptionReportEnhList[index].itemID,
remarks: model.prescriptionReportEnhList[index].remarks);
Navigator.push(
context,
FadePage(
page: PrescriptionDetailsPage(
prescriptionReport: prescriptionReport,
prescriptions: prescriptions,
),
),
),
);
},
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
blurRadius: 27,
offset: Offset(0, -3),
separatorBuilder: (context, index) {
return mHeight(8);
},
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: model.prescriptionReportListINP.length)
: Padding(
padding: const EdgeInsets.only(top: 150.0),
child: getNoDataWidget(context),
)
else
model.prescriptionReportEnhList.length > 0
? ListView.separated(
padding: EdgeInsets.all(21),
itemBuilder: (context, index) {
return InkWell(
onTap: () {
PrescriptionReport prescriptionReport = PrescriptionReport(
imageSRCUrl: model.prescriptionReportEnhList[index].imageSRCUrl,
itemDescription: model.prescriptionReportEnhList[index].itemDescription,
itemDescriptionN: model.prescriptionReportEnhList[index].itemDescription,
routeN: model.prescriptionReportEnhList[index].route,
frequency: model.prescriptionReportEnhList[index].frequency,
frequencyN: model.prescriptionReportEnhList[index].frequency,
doseDailyQuantity: model.prescriptionReportEnhList[index].doseDailyQuantity,
days: model.prescriptionReportEnhList[index].days,
itemID: model.prescriptionReportEnhList[index].itemID,
remarks: model.prescriptionReportEnhList[index].remarks);
Navigator.push(
context,
FadePage(
page: PrescriptionDetailsPage(
prescriptionReport: prescriptionReport,
prescriptions: prescriptions,
),
),
);
},
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
blurRadius: 27,
offset: Offset(0, -3),
),
],
),
],
),
child: Padding(
padding: EdgeInsets.only(top: 12, bottom: 20, left: projectViewModel.isArabic ? 12 : 20, right: projectViewModel.isArabic ? 20 : 12),
child: Row(
children: [
Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
(model.prescriptionReportEnhList[index].itemDescription.isNotEmpty
? model.prescriptionReportEnhList[index].itemDescription
: model.prescriptionReportEnhList[index].itemDescriptionN ?? '')
.toLowerCase()
.capitalizeFirstofEach,
style: TextStyle(
fontSize: 16,
color: Color(0xff2E303A),
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
),
),
mHeight(10),
Row(
child: Padding(
padding: EdgeInsets.only(top: 12, bottom: 20, left: projectViewModel.isArabic ? 12 : 20, right: projectViewModel.isArabic ? 20 : 12),
child: Row(
children: [
Flexible(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
model.prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 60,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
Container(
child: Icon(Icons.search,size: 18,color: Colors.white,),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
Text(
(model.prescriptionReportEnhList[index].itemDescription.isNotEmpty
? model.prescriptionReportEnhList[index].itemDescription
: model.prescriptionReportEnhList[index].itemDescriptionN ?? '')
.toLowerCase()
.capitalizeFirstofEach,
style: TextStyle(
fontSize: 16,
color: Color(0xff2E303A),
letterSpacing: -0.64,
fontWeight: FontWeight.w600,
),
onTap: (){
showZoomImageDialog(context, model.prescriptionReportEnhList[index].imageSRCUrl,);
},
),
mWidth(12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
MyRichText(TranslationBase.of(context).route + ": ", model.prescriptionReportEnhList[index].route, projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).dailyDoses + ": ", model.prescriptionReportEnhList[index].doseDailyQuantity.toString(),
projectViewModel.isArabic),
mHeight(9),
Text(
model.prescriptionReportEnhList[index].remarks,
style: TextStyle(
color: Color(0xff575757),
fontSize: 12,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
mHeight(10),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
InkWell(
child: Stack(
alignment: Alignment.center,
children: [
Container(
child: Image.network(
model.prescriptionReportEnhList[index].imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 60,
),
margin: EdgeInsets.zero,
clipBehavior: Clip.antiAlias,
decoration: cardRadius(2000),
),
Container(
child: Icon(
Icons.search,
size: 18,
color: Colors.white,
),
padding: EdgeInsets.all(6),
decoration: containerRadius(Colors.black.withOpacity(0.3), 200),
)
],
),
],
),
)
onTap: () {
showZoomImageDialog(
context,
model.prescriptionReportEnhList[index].imageSRCUrl,
);
},
),
mWidth(12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
MyRichText(TranslationBase.of(context).route + ": ", model.prescriptionReportEnhList[index].route, projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).dailyDoses + ": ", model.prescriptionReportEnhList[index].doseDailyQuantity.toString(),
projectViewModel.isArabic),
mHeight(9),
Text(
model.prescriptionReportEnhList[index].remarks,
style: TextStyle(
color: Color(0xff575757),
fontSize: 12,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
),
],
),
)
],
),
],
),
],
),
),
Icon(
Icons.arrow_forward,
size: 16,
),
Icon(
Icons.arrow_forward,
size: 16,
),
],
),
],
),
),
),
),
);
},
separatorBuilder: (context, index) {
return mHeight(12);
},
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: model.prescriptionReportEnhList.length),
);
},
separatorBuilder: (context, index) {
return mHeight(12);
},
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: model.prescriptionReportEnhList.length)
: Padding(
padding: const EdgeInsets.only(top: 150.0),
child: getNoDataWidget(context),
),
],
),
),

@ -48,18 +48,18 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
return BaseView<LacumRegistrationViewModel>(
builder: (_, model, wi) => AppScaffold(
appBarTitle:
"${TranslationBase.of(context).register} ${TranslationBase.of(context).lakum}",
appBarTitle: "${TranslationBase.of(context).register} ${TranslationBase.of(context).lakum}",
isShowAppBar: true,
isShowDecPage: false,
isPharmacy: true,
showPharmacyCart: false,
backgroundColor: Colors.white,
baseViewModel: model,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: SizedBox(
height:
mediaQuery.size.height - 60 - mediaQuery.padding.top,
height: mediaQuery.size.height - 60 - mediaQuery.padding.top,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -130,35 +130,26 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
height: 10,
),
Texts(
TranslationBase.of(context)
.prefferedLanguage,
TranslationBase.of(context).prefferedLanguage,
fontSize: 13,
fontWeight: FontWeight.normal,
color: Color(0xff8a8a8a),
),
InkWell(
onTap: () {
RadioGroupDialog dialog =
new RadioGroupDialog(
context: context,
title: TranslationBase.of(context)
.prefferedLanguage,
okText:
TranslationBase.of(context)
.confirm,
cancelText:
TranslationBase.of(context)
.cancel_nocaps,
list: languages,
okFunction: (selectedValue) {
setState(() {
selectedLanguage =
selectedValue;
});
print(
"selectedLanguage = ${selectedValue.name}");
},
cancelFunction: () => {});
RadioGroupDialog dialog = new RadioGroupDialog(
context: context,
title: TranslationBase.of(context).prefferedLanguage,
okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps,
list: languages,
okFunction: (selectedValue) {
setState(() {
selectedLanguage = selectedValue;
});
print("selectedLanguage = ${selectedValue.name}");
},
cancelFunction: () => {});
showDialog(
barrierDismissible: false,
context: context,
@ -170,11 +161,8 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
child: TextField(
enabled: false,
decoration: InputDecoration(
suffixIcon:
Icon(Icons.arrow_drop_down),
hintText: selectedLanguage == null
? "${TranslationBase.of(context).prefferedLanguage}"
: "${selectedLanguage.name}",
suffixIcon: Icon(Icons.arrow_drop_down),
hintText: selectedLanguage == null ? "${TranslationBase.of(context).prefferedLanguage}" : "${selectedLanguage.name}",
hintStyle: TextStyle(
fontSize: 16,
color: Colors.black,
@ -192,12 +180,10 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
),
Container(
color: Colors.green,
margin: EdgeInsets.all(8),
margin: EdgeInsets.all(40),
child: BorderedButton(
TranslationBase.of(context).register,
backgroundColor: canSubmit
? Color(0xff339933)
: Color(0xff99cc99),
backgroundColor: canSubmit ? Color(0xff339933) : Color(0xff99cc99),
textColor: Colors.white,
fontSize: 16,
hPadding: 8,
@ -208,18 +194,13 @@ class _LakumRegistrationPageState extends State<LakumRegistrationPage> {
context,
FadePage(
page: LakumTermsConditions(
widget
.patientIdentificationNo,
_firstNameController.text,
_lastNameController.text,
_mobileNumberController
.text,
selectedLanguage.id)))
.then((status) => {
if (status == 200)
{Navigator.pop(context, "")}
// back to previous page
});
widget.patientIdentificationNo, _firstNameController.text, _lastNameController.text, _mobileNumberController.text, selectedLanguage.id)))
.then(
(status) => {
if (status == 200) {Navigator.pop(context, "")}
// back to previous page
},
);
}
: null,
),

@ -1,6 +1,8 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PointsAmountPerYear.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/lacum-viewmodel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-registration-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-setting-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-transfer-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-points-year-page.dart';
@ -10,278 +12,230 @@ 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/material.dart';
import 'package:provider/provider.dart';
import 'lacum-activitaion-vida-page.dart';
class LakumMainPage extends StatelessWidget {
ProjectViewModel projectViewModel;
@override
Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context);
projectViewModel = Provider.of(context);
return BaseView<LacumViewModel>(
onModelReady: (model) => model.getLacumData(),
builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).lakum,
isShowAppBar: true,
isPharmacy: true,
isShowDecPage: false,
backgroundColor: Colors.white,
baseViewModel: model,
appBarIcons: _buildAppBarICons(context, model),
// preferredSize: mediaQuery.size.height * 0.20,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: (model.lacumGroupInformation != null &&
model.lacumGroupInformation
.lakumInquiryInformationObjVersion !=
null)
? Column(
children: [
Stack(
children: [
Container(
height: mediaQuery.size.height * 0.15,
color: Colors.green,
),
Column(
children: [
SizedBox(
height: mediaQuery.size.height * 0.05,
),
Container(
width: mediaQuery.size.width * 1,
child: LakumBannerWidget(
model, mediaQuery, true)),
],
)
],
),
onModelReady: (model) async {
await model.getLacumData();
if (model.lacumInformation.yahalaAccountNo == 0 || model.lacumInformation.yahalaAccountNo == null) {
navigateToLakumRegister(context);
} else {
if (model.lacumInformation.status == "Hold") {
Navigator.pushReplacement(context, FadePage(page: LakumActivationVidaPage()));
}
}
},
builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).lakum,
isShowAppBar: true,
isPharmacy: true,
showPharmacyCart: false,
isShowDecPage: false,
backgroundColor: Colors.white,
baseViewModel: model,
appBarIcons: _buildAppBarICons(context, model),
// preferredSize: mediaQuery.size.height * 0.20,
body: Container(
width: double.infinity,
child: SingleChildScrollView(
child: (model.lacumGroupInformation != null && model.lacumGroupInformation.lakumInquiryInformationObjVersion != null)
? Column(
children: [
Stack(
children: [
Container(
height: mediaQuery.size.height * 0.15,
color: Colors.green,
),
Column(
children: [
Container(width: mediaQuery.size.width * 1, child: LakumBannerWidget(model, mediaQuery, true)),
],
)
],
),
SizedBox(
height: 20,
),
LakumHomeButtons(mediaQuery, model),
SizedBox(
height: 20,
),
Container(
height: 100,
margin: EdgeInsets.symmetric(horizontal: 16),
child: ListView(
scrollDirection: Axis.horizontal,
children: <Widget>[
LacumPointsWidget(mediaQuery, 1, TranslationBase.of(context).balance, model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalance, null),
SizedBox(
height: 20,
width: 8,
),
LakumHomeButtons(mediaQuery, model),
LacumPointsWidget(mediaQuery, 2, TranslationBase.of(context).gained, model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.gainedPoints, model.lacumGroupInformation.lakumInquiryInformationObjVersion.gainedPointsAmountPerYear),
SizedBox(
height: 20,
),
Container(
height: 100,
margin: EdgeInsets.symmetric(horizontal: 16),
child: ListView(
scrollDirection: Axis.horizontal,
children: <Widget>[
LacumPointsWidget(
mediaQuery,
1,
TranslationBase.of(context).balance,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.pointsBalance,
null),
SizedBox(
width: 8,
),
LacumPointsWidget(
mediaQuery,
2,
TranslationBase.of(context).gained,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.pointsBalanceAmount,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.gainedPoints,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.gainedPointsAmountPerYear),
SizedBox(
width: 8,
),
LacumPointsWidget(
mediaQuery,
3,
TranslationBase.of(context).consumed,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPointsAmount !=
null
? int.parse(model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPointsAmount)
: 0,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPoints,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.consumedPointsAmountPerYear),
SizedBox(
width: 8,
),
LacumPointsWidget(
mediaQuery,
4,
TranslationBase.of(context).transferred,
0,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.transferPoints,
model
.lacumGroupInformation
.lakumInquiryInformationObjVersion
.transferPointsAmountPerYear),
],
),
width: 8,
),
LacumPointsWidget(
mediaQuery,
3,
TranslationBase.of(context).consumed,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmount != null
? int.parse(model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmount)
: 0,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPoints,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmountPerYear),
SizedBox(
height: 20,
width: 8,
),
SizedBox(
height: 8,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(
vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Expired",
fontSize: 14,
),
)
],
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints} Points",
fontWeight: FontWeight.bold,
LacumPointsWidget(mediaQuery, 4, TranslationBase.of(context).transferred, 0, model.lacumGroupInformation.lakumInquiryInformationObjVersion.transferPoints,
model.lacumGroupInformation.lakumInquiryInformationObjVersion.transferPointsAmountPerYear),
],
),
),
SizedBox(
height: 20,
),
SizedBox(
height: 8,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Expired",
fontSize: 14,
),
],
),
)
],
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints} Points",
fontWeight: FontWeight.bold,
fontSize: 14,
),
Container(
margin: EdgeInsets.symmetric(
vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/waiting_gained_icon.png",
fit: BoxFit.fill,
width: 20,
height: 25,
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Waiting gained",
fontSize: 14,
),
)
],
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} Points",
fontWeight: FontWeight.bold,
],
),
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/waiting_gained_icon.png",
fit: BoxFit.fill,
width: 20,
height: 25,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Waiting gained",
fontSize: 14,
),
],
),
)
],
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} Points",
fontWeight: FontWeight.bold,
fontSize: 14,
),
Container(
margin: EdgeInsets.symmetric(
vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/will_be_expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Will Be Expired",
fontSize: 14,
),
)
],
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} Points",
fontWeight: FontWeight.bold,
],
),
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
Container(
margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Image.asset(
"assets/images/pharmacy_module/lakum/will_be_expired_icon.png",
fit: BoxFit.fill,
width: 25,
height: 25,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 8),
child: Texts(
"Will Be Expired",
fontSize: 14,
),
],
),
)
],
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
Texts(
"${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} Points",
fontWeight: FontWeight.bold,
fontSize: 14,
),
],
)
: Container(),
),
),
));
),
),
SizedBox(
height: 2,
width: double.infinity,
child: Container(
color: Color(0xffefefef),
),
),
],
)
: Container(),
),
),
),
);
}
navigateToLakumRegister(BuildContext context) {
Navigator.pushReplacement(context, FadePage(page: LakumRegistrationPage(projectViewModel.user.patientIdentificationNo)));
}
}
@ -291,12 +245,7 @@ List<Widget> _buildAppBarICons(BuildContext context, LacumViewModel model) {
icon: Icon(Icons.settings),
color: Colors.white,
onPressed: () {
Navigator.push(
context,
FadePage(
page: LakumSettingPage(
model.lacumInformation, model.lacumGroupInformation)))
.then((result) => {model.getLacumGroupData()});
Navigator.push(context, FadePage(page: LakumSettingPage(model.lacumInformation, model.lacumGroupInformation))).then((result) => {model.getLacumGroupData()});
},
),
];
@ -318,9 +267,7 @@ class LakumHomeButtons extends StatelessWidget {
child: InkWell(
onTap: () {
print("Account activate click");
Navigator.push(
context, FadePage(page: LakumActivationVidaPage()))
.then((result) => {model.getLacumGroupData()});
Navigator.push(context, FadePage(page: LakumActivationVidaPage())).then((result) => {model.getLacumGroupData()});
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 8),
@ -363,12 +310,7 @@ class LakumHomeButtons extends StatelessWidget {
child: InkWell(
onTap: () {
print("Lacum transfer click");
Navigator.push(
context,
FadePage(
page: LacumTransferPage(model.lacumInformation,
model.lacumGroupInformation)))
.then((result) => {model.getLacumGroupData()});
Navigator.push(context, FadePage(page: LacumTransferPage(model.lacumInformation, model.lacumGroupInformation))).then((result) => {model.getLacumGroupData()});
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 8),
@ -419,8 +361,7 @@ class LacumPointsWidget extends StatelessWidget {
Color titleColor;
final List<PointsAmountPerYear> pointsAmountPerYear;
LacumPointsWidget(this.mediaQuery, this.pointType, this.title, this.riyal,
this.point, this.pointsAmountPerYear) {
LacumPointsWidget(this.mediaQuery, this.pointType, this.title, this.riyal, this.point, this.pointsAmountPerYear) {
if (pointType == 1) {
titleColor = Color(0xffefefef);
} else if (pointType == 2) {
@ -438,8 +379,7 @@ class LacumPointsWidget extends StatelessWidget {
onTap: () {
if (pointType != 1) {
if (pointsAmountPerYear != null && pointsAmountPerYear.length > 0) {
Navigator.push(context,
FadePage(page: LakumPointsYearPage(pointsAmountPerYear)));
Navigator.push(context, FadePage(page: LakumPointsYearPage(pointsAmountPerYear)));
} else {
// show snackBar No Details Points are there
}

@ -7,7 +7,6 @@ import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../../../../locator.dart';
import '../../../../../routes.dart';
@ -45,7 +44,7 @@ class _FooterWidgetState extends State<FooterWidget> {
borderRadius: BorderRadius.all(
Radius.circular(0.0),
),
border: Border.all(color: HexColor('#707070'), width: 0),
border: Border.all(color: Color(0xFF707070), width: 0),
),
width: double.infinity,
height: quantityUI,

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/login/welcome.dart';
import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/compare.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/my_reviews.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-activitaion-vida-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-main-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-terms-conditions-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart';
@ -98,7 +99,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
isPharmacy: true,
body: user != null
? Container(
color: Colors.white,
color: Colors.white,
child: SingleChildScrollView(
child: Column(
children: <Widget>[
@ -123,12 +124,8 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Column(children: <Widget>[
Row(children: <Widget>[
Text(
TranslationBase.of(context)
.welcome,
style: TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.bold,
color: Colors.grey),
TranslationBase.of(context).welcome,
style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.bold, color: Colors.grey),
),
]),
SizedBox(
@ -136,16 +133,8 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
Row(children: <Widget>[
Text(
languageID == "ar"
? user.firstNameN.toString() +
" " +
user.lastNameN.toString()
: user.firstName.toString() +
" " +
user.lastName.toString(),
style: TextStyle(
fontSize: 14.0,
fontWeight: FontWeight.bold),
languageID == "ar" ? user.firstNameN.toString() + " " + user.lastNameN.toString() : user.firstName.toString() + " " + user.lastName.toString(),
style: TextStyle(fontSize: 14.0, fontWeight: FontWeight.bold),
),
]),
]),
@ -172,15 +161,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
child: InkWell(
onTap: () {
if (customerId == null) {
AppToast.showErrorToast(
message: "Customer not found");
AppToast.showErrorToast(message: "Customer not found");
return;
}
Navigator.push(
context,
FadePage(
page: OrderPage(
customerID: customerId)));
Navigator.push(context, FadePage(page: OrderPage(customerID: customerId)));
},
child: Column(
children: <Widget>[
@ -207,8 +191,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: LakumMainPage()));
if (customerId == null || customerId == '')
Navigator.push(context, FadePage(page: LakumActivationVidaPage()));
else
Navigator.push(context, FadePage(page: LakumMainPage()));
},
child: Column(
children: <Widget>[
@ -222,9 +208,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
Text(
TranslationBase.of(context).lakum,
style: TextStyle(
fontSize: 13.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 13.0, fontWeight: FontWeight.bold),
),
],
),
@ -233,9 +217,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(
context,
FadePage(page: WishlistPage()));
Navigator.push(context, FadePage(page: WishlistPage()));
},
child: Column(
children: <Widget>[
@ -261,8 +243,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
Expanded(
child: InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: MyReviewsPage()));
Navigator.push(context, FadePage(page: MyReviewsPage()));
},
child: Column(
children: <Widget>[
@ -307,9 +288,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
children: <Widget>[
Text(
TranslationBase.of(context).myAccount,
style: TextStyle(
fontSize: 16.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 10,
@ -320,10 +299,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HomePrescriptionsPage()));
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
@ -336,8 +312,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 15,
),
Text(
TranslationBase.of(context)
.myPrescription,
TranslationBase.of(context).myPrescription,
style: TextStyle(
fontSize: 13.0,
),
@ -354,15 +329,11 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: ComparePage()));
Navigator.push(context, FadePage(page: ComparePage()));
},
child: Row(
children: <Widget>[
Image.asset(
'assets/images/pharmacy/compare.png',
width: 35,
height: 35),
Image.asset('assets/images/pharmacy/compare.png', width: 35, height: 35),
SizedBox(
width: 15,
),
@ -384,10 +355,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HomePrescriptionsPage()));
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
},
child: Row(
children: <Widget>[
@ -400,8 +368,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.medicationsRefill,
TranslationBase.of(context).medicationsRefill,
style: TextStyle(
fontSize: 13.0,
),
@ -418,8 +385,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: MyFamily()));
Navigator.push(context, FadePage(page: MyFamily()));
},
child: Row(
children: <Widget>[
@ -449,10 +415,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PharmacyAddressesPage()));
Navigator.push(context, FadePage(page: PharmacyAddressesPage()));
},
child: Row(
children: <Widget>[
@ -465,8 +428,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.shippingAddresses,
TranslationBase.of(context).shippingAddresses,
style: TextStyle(
fontSize: 13.0,
),
@ -483,10 +445,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: PharmacyTermsConditions()));
Navigator.push(context, FadePage(page: PharmacyTermsConditions()));
},
child: Row(
children: <Widget>[
@ -499,8 +458,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 10,
),
Text(
TranslationBase.of(context)
.conditionsHMG,
TranslationBase.of(context).conditionsHMG,
style: TextStyle(
fontSize: 13.0,
),
@ -517,15 +475,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: LakumTermsConditions(
this.identificationNo,
this.firstName,
this.lastName,
this.mobileNo,
this.languageId)));
Navigator.push(context, FadePage(page: LakumTermsConditions(this.identificationNo, this.firstName, this.lastName, this.mobileNo, this.languageId)));
},
child: Row(
children: <Widget>[
@ -540,8 +490,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 10,
),
Text(
TranslationBase.of(context)
.conditions,
TranslationBase.of(context).conditions,
style: TextStyle(
fontSize: 13.0,
),
@ -572,9 +521,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
children: <Widget>[
Text(
TranslationBase.of(context).reachUs,
style: TextStyle(
fontSize: 16.0,
fontWeight: FontWeight.bold),
style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
),
SizedBox(
height: 5,
@ -585,8 +532,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: LiveChatPage()));
Navigator.push(context, FadePage(page: LiveChatPage()));
},
child: Row(
children: <Widget>[
@ -614,8 +560,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
),
InkWell(
onTap: () {
Navigator.push(context,
FadePage(page: FindUsPage()));
Navigator.push(context, FadePage(page: FindUsPage()));
},
child: Row(
children: <Widget>[
@ -628,8 +573,7 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
width: 20,
),
Text(
TranslationBase.of(context)
.ourLocations,
TranslationBase.of(context).ourLocations,
style: TextStyle(fontSize: 13.0),
),
],

@ -5,7 +5,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_xlider/flutter_xlider.dart';
// import 'package:flutter_xlider/flutter_xlider.dart';
class SelectGender extends StatefulWidget {
@override
@ -82,18 +82,18 @@ class _SelectGender extends State<SelectGender> {
SizedBox(
height: 30,
),
FlutterSlider(
values: [slider],
max: 90,
min: 14,
onDragCompleted: (handlerIndex, lowerValue, upperValue) {
print(lowerValue);
print(upperValue);
setState(() {
slider = upperValue;
});
},
),
// FlutterSlider(
// values: [slider],
// max: 90,
// min: 14,
// onDragCompleted: (handlerIndex, lowerValue, upperValue) {
// print(lowerValue);
// print(upperValue);
// setState(() {
// slider = upperValue;
// });
// },
// ),
],
),
Expanded(

@ -2,7 +2,6 @@ import 'dart:ui';
import 'package:diplomaticquarterapp/Constants.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
/// ---- Default Theme ----
///
@ -40,7 +39,7 @@ defaultTheme({fontName}) {
buttonColor: Colors.black,
toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor,
bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
bottomSheetTheme: BottomSheetThemeData(backgroundColor: Color(0xFFE0E0E0)),
cursorColor: Colors.grey,
primaryTextTheme: TextTheme(bodyText2: TextStyle(color: Colors.white)),
iconTheme: IconThemeData(),
@ -92,7 +91,7 @@ invertThemes({fontName}) {
buttonColor: Colors.black,
toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor,
bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
bottomSheetTheme: BottomSheetThemeData(backgroundColor: Color(0xFFE0E0E0)),
cursorColor: Colors.black,
iconTheme: IconThemeData(),
appBarTheme: AppBarTheme(
@ -147,7 +146,7 @@ bwThemes({fontName}) {
primaryColor: Color(0xfffffff4),
toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor,
bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
bottomSheetTheme: BottomSheetThemeData(backgroundColor: Color(0xFFE0E0E0)),
cursorColor: Colors.black,
iconTheme: IconThemeData(),
appBarTheme: AppBarTheme(

@ -29,6 +29,10 @@ class SignalRUtil {
});
}
void closeSignalRConnection() {
connectionBuilder.stop();
}
void handleIncomingMessage(List<dynamic> message) {
print(message.toString());
}
@ -38,7 +42,7 @@ class SignalRUtil {
}
bool getConnectionState() {
if (connectionBuilder.state == HubConnectionState.connected) return true;
if (connectionBuilder.state == HubConnectionState.connected) return true;
if (connectionBuilder.state == HubConnectionState.connected || connectionBuilder.state == HubConnectionState.connecting) return true;
if (connectionBuilder.state == HubConnectionState.disconnected || connectionBuilder.state == HubConnectionState.disconnecting) return false;
}
}

@ -2582,6 +2582,8 @@ class TranslationBase {
String get cholesTitle => localizedValues["cholesTitle"][locale.languageCode];
String get laserClinic => localizedValues["laserClinic"][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -570,10 +570,6 @@ bool timeCalculator(int startHour, int startMint, int endHour, int endMint) {
DateTime now = DateTime.now();
DateTime startDate = DateTime(now.year, now.month, now.day, startHour, startHour);
DateTime endDate = DateTime(now.year, now.month, now.day, endHour, endMint);
print(startDate.toString());
print(endDate.toString());
print(now);
print("------------");
if (startDate.isBefore(now) && endDate.isAfter(now))
return true;
else

@ -5,7 +5,6 @@ import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -97,8 +96,8 @@ class _BottomNavBarState extends State<BottomNavBar> {
// ),
if (/*widget.index == 0 && */ projectViewModel.havePrivilege(34))
BottomNavigationItem(
icon: EvaIcons.calendar,
activeIcon: EvaIcons.calendar,
icon: Icons.calendar_today_sharp,
activeIcon: Icons.calendar_today_sharp,
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 4,

@ -3,7 +3,7 @@ import 'dart:io';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:feather_icons_flutter/feather_icons_flutter.dart';
// import 'package:feather_icons_flutter/feather_icons_flutter.dart';
import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart';
@ -20,10 +20,10 @@ class ImageOptions {
),
_BottomSheetItem(
title: TranslationBase.of(context).gallery,
icon: FeatherIcons.image,
icon: Icons.image,
onTap: () async {
File _image =
await ImagePicker.pickImage(source: ImageSource.gallery, imageQuality: 50);
await ImagePicker.pickImage(source: ImageSource.gallery, imageQuality: 20);
String fileName = _image.path;
final bytes = File(fileName).readAsBytesSync();
String base64Encode = base64.encode(bytes);
@ -34,10 +34,10 @@ class ImageOptions {
),
_BottomSheetItem(
title: TranslationBase.of(context).camera,
icon: FeatherIcons.camera,
icon: Icons.camera_alt,
onTap: () async {
File _image =
await ImagePicker.pickImage(source: ImageSource.camera, imageQuality: 50);
await ImagePicker.pickImage(source: ImageSource.camera, imageQuality: 20);
String fileName = _image.path;
final bytes = File(fileName).readAsBytesSync();
String base64Encode = base64.encode(bytes);

@ -1,53 +0,0 @@
import 'package:charts_flutter/flutter.dart' as charts;
import 'package:flutter/material.dart';
class AppBarChart extends StatelessWidget {
const AppBarChart({
Key key,
@required this.isArabic,
@required this.seriesList,
}) : super(key: key);
final List<charts.Series> seriesList;
final bool isArabic;
@override
Widget build(BuildContext context) {
return Container(
height: 400,
//margin: EdgeInsets.only(top: 60),
child: charts.BarChart(
seriesList,
// animate: animate,
domainAxis: charts.OrdinalAxisSpec(
renderSpec: charts.GridlineRendererSpec(
labelAnchor: isArabic ? charts.TickLabelAnchor.before : charts.TickLabelAnchor.after,
labelRotation: -30,
labelOffsetFromAxisPx: 30,
labelOffsetFromTickPx: 15,
labelJustification: charts.TickLabelJustification.inside,
),
),
/// Customize the primary measure axis using a small tick renderer.
/// Use String instead of num for ordinal domain axis
/// (typically bar charts).
primaryMeasureAxis: new charts.NumericAxisSpec(
renderSpec: new charts.GridlineRendererSpec(
// Display the measure axis labels below the gridline.
//
// 'Before' & 'after' follow the axis value direction.
// Vertical axes draw 'before' below & 'after' above the tick.
// Horizontal axes draw 'before' left & 'after' right the tick.
labelAnchor: charts.TickLabelAnchor.before,
// Left justify the text in the axis.
//
// Note: outside means that the secondary measure axis would right
// justify.
labelJustification: charts.TickLabelJustification.outside,
)),
),
);
}
}

@ -1,44 +0,0 @@
import 'package:charts_flutter/flutter.dart' as charts;
import 'package:flutter/material.dart';
/// chart line
/// [seriesList] charts series
/// [chartTitle] the charts title
/// [animate] enable and disable animate on create chart
/// [includeArea] chart include Area
/// [stacked] stacked chart over the design
class AppLineChart extends StatelessWidget {
final List<charts.Series> seriesList;
final String chartTitle;
final bool animate;
final bool includeArea;
final bool stacked;
AppLineChart(
{Key key,
@required this.seriesList,
this.chartTitle,
this.animate = true,
this.includeArea = false,
this.stacked = true});
@override
Widget build(BuildContext context) {
return Container(
child: Column(
children: <Widget>[
Text(
chartTitle,
style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold),
),
Expanded(
child: charts.LineChart(seriesList,
defaultRenderer: charts.LineRendererConfig(
includeArea: false, stacked: true),
animate: animate),
),
],
),
);
}
}

@ -1,4 +1,3 @@
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart';
/// Custom Item widget
@ -32,7 +31,7 @@ class CustomItem extends StatelessWidget {
this.disabled: false,
this.onTap,
this.startIconColor,
this.endIcon = EvaIcons.chevronRight,
this.endIcon = Icons.chevron_right_sharp,
this.padding,
this.child,
this.endIconColor,

@ -1,7 +1,6 @@
import 'dart:async';
import 'dart:math' as math;
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/gestures.dart' show DragStartBehavior;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
@ -862,7 +861,7 @@ class _MonthPickerState extends State<MonthPicker>
disabledColor:
Theme.of(context).disabledColor.withOpacity(0.2),
color: Theme.of(context).disabledColor,
icon: const Icon(EvaIcons.chevronLeft),
icon: const Icon(Icons.chevron_left_sharp),
tooltip: _isDisplayingFirstMonth
? null
: '${localizations.previousMonthTooltip} ${localizations.formatMonthYear(_previousMonthDate)}',
@ -886,7 +885,7 @@ class _MonthPickerState extends State<MonthPicker>
disabledColor:
Theme.of(context).disabledColor.withOpacity(0.2),
color: Theme.of(context).disabledColor,
icon: const Icon(EvaIcons.chevronRight),
icon: const Icon(Icons.chevron_right_sharp),
tooltip: _isDisplayingLastMonth
? null
: '${localizations.nextMonthTooltip} ${localizations.formatMonthYear(_nextMonthDate)}',

@ -1,4 +1,3 @@
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -156,7 +155,7 @@ class _TextFieldsState extends State<TextFields> {
);
},
child: Icon(
EvaIcons.eye,
Icons.remove_red_eye_sharp,
size: 24.0,
color: Color.fromRGBO(78, 62, 253, 1.0),
),
@ -167,7 +166,7 @@ class _TextFieldsState extends State<TextFields> {
view = true;
});
},
child: Icon(EvaIcons.eyeOff,
child: Icon(Icons.remove_red_eye_sharp,
size: 24.0, color: Colors.grey[500]),
),
);

@ -10,7 +10,6 @@ import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/loadings/ShimmerLoading.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
class OffersAndPackagesWidget extends StatefulWidget {
final List<OfferPackagesItemModel> models;
@ -168,7 +167,7 @@ class _OfferPackagesItemWidgetState extends State<OfferPackagesItemWidget> {
alignment: Alignment.bottomLeft,
child: MaterialButton(
height: 30,
color: HexColor('#D81A2E'),
color: Color(0xFFD81A2E),
onPressed: () => widget.model.action.onClick(model.item),
child: Texts(
TranslationBase.of(context).view,

@ -1,5 +1,4 @@
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart';
class StarRating extends StatelessWidget {
@ -23,7 +22,7 @@ class StarRating extends StatelessWidget {
Padding(
padding: EdgeInsets.only(right: 1.0),
child: Icon(
(index+1) <= (totalAverage ?? 0) ? EvaIcons.star : EvaIcons.starOutline,
(index+1) <= (totalAverage ?? 0) ? Icons.star : Icons.star_border_outlined,
size: size,
color: (index+1) <= (totalAverage ?? 0) ? Color.fromRGBO(255, 186, 0, 1.0) : Theme.of(context).hintColor
),

@ -1,4 +1,3 @@
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart';
class CloseBack extends StatelessWidget{
@ -16,7 +15,7 @@ class CloseBack extends StatelessWidget{
onTap: Feedback.wrapForTap(() {
onTap!=null ? onTap() : Navigator.pop(context);
}, context),
child: Icon(EvaIcons.close, color: Colors.white),
child: Icon(Icons.close, color: Colors.white),
);
}
}

@ -1,7 +1,5 @@
import 'package:diplomaticquarterapp/d_q_icons_icons.dart';
import 'package:diplomaticquarterapp/pages/landing/home_page.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart';
import 'bottom_nav_pharmacy_home_item.dart';
@ -10,8 +8,8 @@ import 'bottom_nav_pharmacy_item.dart';
class BottomNavPharmacyBar extends StatefulWidget {
final ValueChanged<int> changeIndex;
final int index;
BottomNavPharmacyBar({Key key, this.changeIndex, this.index})
: super(key: key);
BottomNavPharmacyBar({Key key, this.changeIndex, this.index}) : super(key: key);
@override
_BottomNavPharmacyBarState createState() => _BottomNavPharmacyBarState();
@ -35,8 +33,8 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
BottomNavHomeItem(
icon: EvaIcons.image,
activeIcon: EvaIcons.image,
icon: Icons.image,
activeIcon: Icons.image,
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 0,
@ -50,14 +48,7 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
currentIndex: 1,
title: TranslationBase.of(context).categorise,
),
BottomNavPharmacyItem(
icon: EvaIcons.home,
activeIcon: EvaIcons.home,
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 0,
isHome: true,
title: TranslationBase.of(context).home),
BottomNavPharmacyItem(icon: Icons.home, activeIcon: Icons.home, changeIndex: _changeIndex, index: widget.index, currentIndex: 0, isHome: true, title: TranslationBase.of(context).home),
BottomNavPharmacyItem(
icon: DQIcons.user_menu_icon,
activeIcon: DQIcons.user_menu_icon,
@ -67,12 +58,7 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
title: TranslationBase.of(context).myAccount,
),
BottomNavPharmacyItem(
icon: DQIcons.cart_menu_icon,
activeIcon: DQIcons.cart_menu_icon,
changeIndex: _changeIndex,
index: widget.index,
currentIndex: 3,
title: TranslationBase.of(context).cart)
icon: DQIcons.cart_menu_icon, activeIcon: DQIcons.cart_menu_icon, changeIndex: _changeIndex, index: widget.index, currentIndex: 3, title: TranslationBase.of(context).cart)
],
),
),

@ -1,24 +1,24 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:flutter/material.dart';
import 'package:progress_hud_v2/generated/i18n.dart';
showZoomImageDialog(BuildContext context, String url) {
showZoomImageDialog(BuildContext context, String url, {bool isNetworkImage = true}) {
showDialog(
context: context,
builder: (BuildContext context) => Dialog(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12.0),
), //this right here
child: ShowZoomImage(url),
child: ShowZoomImage(url, isNetworkImage),
),
);
}
class ShowZoomImage extends StatelessWidget {
String url;
bool isNetworkImage = true;
ShowZoomImage(this.url);
ShowZoomImage(this.url, this.isNetworkImage);
@override
Widget build(BuildContext context) {
@ -35,11 +35,17 @@ class ShowZoomImage extends StatelessWidget {
Navigator.pop(context);
},
),
CachedNetworkImage(
imageUrl: url,
height: MediaQuery.of(context).size.width / 1.4,
width: double.infinity,
),
isNetworkImage
? CachedNetworkImage(
imageUrl: url,
height: MediaQuery.of(context).size.width / 1.4,
width: double.infinity,
)
: Image.asset(
url,
height: MediaQuery.of(context).size.width / 1.4,
width: double.infinity,
),
mHeight(12),
],
),

@ -11,13 +11,12 @@ dependencies:
flutter:
sdk: flutter
# Localizations
flutter_localizations:
sdk: flutter
intl: ^0.16.0
# web view
webview_flutter: ^0.3.24
webview_flutter: ^1.0.7
# http client
http: ^0.12.1
connectivity: ^0.4.9+3
@ -39,11 +38,9 @@ dependencies:
# Permissions
permission_handler: ^5.0.0+hotfix.3
device_info: ^0.4.2+4
#popub
giffy_dialog: ^1.8.0
# Flutter Html View
flutter_html: 1.0.2
flutter_html: ^1.2.0
# Native
flutter_device_type: ^0.2.0
@ -56,45 +53,38 @@ dependencies:
firebase_messaging: ^7.0.3
firebase_analytics: ^6.3.0
cloud_firestore: ^0.14.3
android_intent: ^0.3.7+7
# Progress bar
progress_hud_v2: ^2.0.0
percent_indicator: ^2.1.5
# Icons
feather_icons_flutter: any
eva_icons_flutter: any
font_awesome_flutter: any
cupertino_icons: ^0.1.3
cupertino_icons: ^1.0.0
# Image Attachments
image_picker: ^0.6.7+1
image_cropper: ^1.2.1
#GIF image
flutter_gifimage: ^1.0.1
photo_view: any
# flutter_webrtc: any
# flutter_webrtc: any
# UI Reqs
dotted_border: 1.0.5
expandable: ^4.1.4
hexcolor: ^1.0.1
# Notification Banner
dropdown_banner: ^1.4.0
flutter_xlider: ^3.4.0
# flutter_local_notifications:
# dropdown_banner: ^1.4.0
# flutter_xlider: ^3.4.0
# flutter_local_notifications:
# charts
charts_flutter: ^0.9.0
google_maps_flutter: ^1.0.3
huawei_map: ^5.0.3+303
# Qr code Scanner TODO fix it
# barcode_scanner: ^1.0.1
# barcode_scanner: ^1.0.1
flutter_polyline_points: ^0.1.0
location: ^2.3.5
# Qr code Scanner
@ -104,15 +94,10 @@ dependencies:
rating_bar: ^0.2.0
# Calendar
# table_calendar: ^2.3.0
syncfusion_flutter_calendar: ^18.4.49
# syncfusion_flutter_charts: any
# SVG Images
flutter_svg: ^0.18.0
# Location Helper
map_launcher: ^0.8.1
flutter_svg: ^0.19.0
#Calendar Events
manage_calendar_events: ^1.0.2
@ -129,15 +114,6 @@ dependencies:
#hijri
hijri: ^2.0.3
#Email Sender
flutter_email_sender: ^3.0.1
#Popup_window
popup_box: ^0.1.0
#Numbers
number_inc_dec: ^0.6.6
#datetime_picker
flutter_datetime_picker: ^1.4.0
# Carousel
@ -161,19 +137,17 @@ dependencies:
flutter_webrtc: ^0.5.9
screen: ^0.0.5
#google maps places
google_maps_place_picker: ^1.0.0
typewriter: ^0.0.3
#countdown timer for Upcoming List
# flutter_countdown_timer: ^1.4.0
#countdown timer for Upcoming List
flutter_countdown_timer: ^1.6.0
#Dependencies for video call implementation
native_device_orientation: ^0.3.0
enum_to_string: ^1.0.9
# recase: ^3.0.0
wakelock: ^0.1.4
wakelock: ^0.2.1+1
after_layout: ^1.0.7
twilio_programmable_video: ^0.6.2
cached_network_image: ^2.4.1
@ -194,7 +168,7 @@ dependencies:
in_app_review: ^1.0.4
badges: ^1.1.4
# open_settings: ^2.0.1
# Dep by Zohaib
shimmer: ^1.1.2
carousel_slider: ^2.3.1
@ -252,7 +226,6 @@ flutter:
- assets/images/new/services/
- assets/images/new/appointment-rating/
- assets/images/new/payment/
- assets/images/new/body/
fonts:
- family: WorkSans

Loading…
Cancel
Save