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

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

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

@ -51,11 +51,11 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
int gender = 1; int gender = 1;
if (patient!.patientDetails! != null) { // if (patient!.patientDetails! != null) {
gender = patient!.patientDetails!.gender!; // gender = patient!.patientDetails!.gender!;
} else { // } else {
gender = patient!.gender!; // gender = patient!.gender!;
} // }
return Container( return Container(
padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5), 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), borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
),*/ ),*/
hintText: selectedText != null ? selectedText : hintText, hintText: selectedText != "" ? selectedText : hintText,
suffixIcon: Icon( suffixIcon: Icon(
suffixIcon ?? null, suffixIcon ?? null,
color: Colors.grey.shade600, color: Colors.grey.shade600,

Loading…
Cancel
Save