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

flutter_vervion_2
Elham Rababah 5 years ago
commit 46d09ee55d

@ -40,8 +40,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
late List<NoteModel> notesList;
var filteredNotesList;
bool isDischargedPatient = false;
late AuthenticationViewModel authenticationViewModel;
late ProjectViewModel projectViewModel;
AuthenticationViewModel? authenticationViewModel;
ProjectViewModel? projectViewModel;
getProgressNoteList(BuildContext context, PatientViewModel model, {bool isLocalBusy = false}) async {
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
@ -65,8 +65,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
@override
Widget build(BuildContext context) {
authenticationViewModel = Provider.of(context);
projectViewModel = Provider.of(context);
// authenticationViewModel = Provider.of(context);
// projectViewModel = Provider.of(context);
final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient'];
String arrivalType = routeArgs['arrivalType'];
@ -117,7 +117,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: CardWithBgWidget(
hasBorder: false,
bgColor: model.patientProgressNoteList[index].status == 1 &&
authenticationViewModel.doctorProfile!.doctorID !=
authenticationViewModel!.doctorProfile!.doctorID !=
model.patientProgressNoteList[index].createdBy
? Color(0xFFCC9B14)
: model.patientProgressNoteList[index].status == 4
@ -131,7 +131,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (model.patientProgressNoteList[index].status == 1 &&
authenticationViewModel.doctorProfile!.doctorID !=
authenticationViewModel!.doctorProfile!.doctorID !=
model.patientProgressNoteList[index].createdBy)
AppText(
TranslationBase.of(context).notePending,
@ -155,7 +155,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
),
if (model.patientProgressNoteList[index].status != 2 &&
model.patientProgressNoteList[index].status != 4 &&
authenticationViewModel.doctorProfile!.doctorID ==
authenticationViewModel!.doctorProfile!.doctorID ==
model.patientProgressNoteList[index].createdBy)
Row(
crossAxisAlignment: CrossAxisAlignment.start,
@ -350,9 +350,9 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
? AppDateUtils.getDayMonthYearDateFormatted(
AppDateUtils.getDateTimeFromServerFormat(
model.patientProgressNoteList[index].createdOn ?? ""),
isArabic: projectViewModel.isArabic)
isArabic: projectViewModel!.isArabic)
: AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(),
isArabic: projectViewModel.isArabic),
isArabic: projectViewModel!.isArabic),
fontWeight: FontWeight.w600,
fontSize: 14,
),
@ -442,7 +442,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
padding: EdgeInsets.all(20),
color: Colors.white,
child: AppText(
projectViewModel.isArabic
projectViewModel!.isArabic
? "هل أنت متأكد أنك تريد تنفيذ $actionName هذا الأمر؟"
: 'Are you sure you want $actionName this order?',
fontSize: 15,

@ -41,11 +41,11 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
int _activePriority = 1;
late String appointmentDate;
late String branchError;
late String hospitalError;
late String clinicError;
late String doctorError;
late String frequencyError;
String? branchError;
String? hospitalError;
String? clinicError;
String? doctorError;
String? frequencyError;
stt.SpeechToText speech = stt.SpeechToText();
var reconizedWord;
var event = RobotProvider();
@ -177,7 +177,7 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
children: [
AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText: TranslationBase.of(context).branch,
hintText: TranslationBase.of(context).branch ?? "ssss",
dropDownText: _referTo != null ? _referTo['name'] : null,
enabled: false,
isTextFieldHasSuffix: true,

@ -8,13 +8,13 @@ class AddNewOrder extends StatelessWidget {
required this.label,
}) : super(key: key);
final Function onTap;
final GestureTapCallback onTap;
final String label;
@override
Widget build(BuildContext context) {
return InkWell(
onTap: onTap(),
onTap: onTap,
child: Container(
width: double.maxFinite,
height: 140,

@ -51,11 +51,11 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
int gender = 1;
if (patient!.patientDetails! != null) {
gender = patient!.patientDetails!.gender!;
} else {
gender = patient!.gender!;
}
// if (patient!.patientDetails! != null) {
// gender = patient!.patientDetails!.gender!;
// } else {
// gender = patient!.gender!;
// }
return Container(
padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5),

@ -43,7 +43,7 @@ class TextFieldsUtils {
borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
borderRadius: BorderRadius.circular(8),
),*/
hintText: selectedText != null ? selectedText : hintText,
hintText: selectedText != "" ? selectedText : hintText,
suffixIcon: Icon(
suffixIcon ?? null,
color: Colors.grey.shade600,

Loading…
Cancel
Save