Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into done_button_keyboard

merge-requests/311/head
Mohammad Aljammal 5 years ago
commit f3343f0a33

@ -379,10 +379,12 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model.prescriptionList[0].entityList[index].pharmacistRemarks == null "", // 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), // : model.prescriptionList[0].entityList[index].pharmacistRemarks,
fontSize:
15.0),
) )
], ],
), ),

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

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

Loading…
Cancel
Save