Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!307

lib/screens/prescription/prescription_screen.dart

@@ -379,10 +379,12 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
                                                                     ),
                                                                     Expanded(
                                                                       child: AppText(
-                                                                          model.prescriptionList[0].entityList[index].pharmacistRemarks == null
-                                                                              ? ""
-                                                                              : model.prescriptionList[0].entityList[index].pharmacistRemarks,
-                                                                          fontSize: 15.0),
+                                                                          "", // commening below code because there is an error coming in the model please fix it before pushing it
+                                                                          // model.prescriptionList[0].entityList[index].pharmacistRemarks == null
+                                                                          // ? ""
+                                                                          // : model.prescriptionList[0].entityList[index].pharmacistRemarks,
+                                                                          fontSize:
+                                                                              15.0),
                                                                     )
                                                                   ],
                                                                 ),

lib/screens/sick-leave/add-sickleave.dart

@@ -116,11 +116,17 @@ class AddSickLeavScreen extends StatelessWidget {
                                               icon: Icon(
                                                 Icons.open_in_full,
                                                 size: 25,
+                                                color: item.status == 1
+                                                    ? Colors.grey[400]
+                                                    : Colors.black,
                                               ),
                                               // color: Colors.green, //Colors.black,
                                               onPressed: () => {
-                                                openSickLeave(context, true,
-                                                    extendedData: item)
+                                                if (item.status != 1)
+                                                  {
+                                                    openSickLeave(context, true,
+                                                        extendedData: item)
+                                                  }
                                               },
                                             ))
                                         : SizedBox(),

lib/util/helpers.dart

@@ -109,7 +109,7 @@ class Helpers {
 
       itemExtent: 25,
       //height of each item
-      looping: true,
+      looping: false,
       onSelectedItemChanged: (int index) {
         // selectitem =index;
         cupertinoPickerIndex = index;