prscription and procedure

merge-requests/195/head
hussam al-habibeh 5 years ago
parent d3bf97fdd8
commit 47a350a811

@ -113,7 +113,6 @@ const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
const GET_PATIENT_ARRIVAL_LIST = const GET_PATIENT_ARRIVAL_LIST =
'Services/DoctorApplication.svc/REST/PatientArrivalList'; 'Services/DoctorApplication.svc/REST/PatientArrivalList';
// SOAP // SOAP
const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies'; const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies';
@ -121,7 +120,8 @@ const GET_MASTER_LOOKUP_LIST =
'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; 'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
const POST_ALLERGY = 'Services/DoctorApplication.svc/REST/PostAllergies'; const POST_ALLERGY = 'Services/DoctorApplication.svc/REST/PostAllergies';
const POST_HISTORY = 'Services/DoctorApplication.svc/REST/PostHistory'; const POST_HISTORY = 'Services/DoctorApplication.svc/REST/PostHistory';
const POST_CHIEF_COMPLAINT = 'Services/DoctorApplication.svc/REST/PostChiefcomplaint'; const POST_CHIEF_COMPLAINT =
'Services/DoctorApplication.svc/REST/PostChiefcomplaint';
var selectedPatientType = 1; var selectedPatientType = 1;

@ -276,7 +276,6 @@ const Map<String, Map<String, String>> localizedValues = {
"clinicname": {"en": "Clinic Name", "ar": "اسم العيادة"}, "clinicname": {"en": "Clinic Name", "ar": "اسم العيادة"},
"sick-leave-date": {"en": "Sick leave date ", "ar": "تاريخ الاجازة."}, "sick-leave-date": {"en": "Sick leave date ", "ar": "تاريخ الاجازة."},
"sick-leave-days": {"en": "Sick leave days", "ar": "عدد ايام الاجازة."}, "sick-leave-days": {"en": "Sick leave days", "ar": "عدد ايام الاجازة."},
'replySuccessfully': {'en': 'Reply Successfully', 'ar': 'تم الرد بنجاح'},
'admissionDetail': {'en': 'ADMISSION DETAIL: ', 'ar': 'تفاصيل القبول: '}, 'admissionDetail': {'en': 'ADMISSION DETAIL: ', 'ar': 'تفاصيل القبول: '},
'dateTime': {'en': 'DATE / TIME:', 'ar': 'التاريخ / الوقت:'}, 'dateTime': {'en': 'DATE / TIME:', 'ar': 'التاريخ / الوقت:'},
'admissionNo': {'en': 'ADMISSION #: ', 'ar': 'قبول #:'}, 'admissionNo': {'en': 'ADMISSION #: ', 'ar': 'قبول #:'},
@ -313,7 +312,6 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "EXTEND SICK LEAVE", 'en': "EXTEND SICK LEAVE",
'ar': 'قم بتمديد الإجازة المرضية' 'ar': 'قم بتمديد الإجازة المرضية'
}, },
"empty-message": {"en": "Please enter Value", "ar": "يرجى ادخال القيمه"},
"chiefComplaintLength": { "chiefComplaintLength": {
"en": "Chief Complaint length should be greater than 25", "en": "Chief Complaint length should be greater than 25",
"ar": "يجب أن يكون طول شكوى الرئيس أكبر من 25" "ar": "يجب أن يكون طول شكوى الرئيس أكبر من 25"
@ -323,11 +321,6 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'No Prescription Listed', 'en': 'No Prescription Listed',
'ar': 'لا وصفة طبية مدرجة' 'ar': 'لا وصفة طبية مدرجة'
}, },
'next': {'en': 'Next', 'ar': 'التالي'},
'healthRecordInformation': {
'en': 'HEALTH RECORD INFORMATION',
'ar': 'معلومات السجل الصحي'
},
'referTo': {'en': "Refer To", 'ar': 'محال إلى'}, 'referTo': {'en': "Refer To", 'ar': 'محال إلى'},
'referredFrom': {'en': "Referred From", 'ar': 'محال من'}, 'referredFrom': {'en': "Referred From", 'ar': 'محال من'},
'branch': {'en': "Branch", 'ar': 'الفرع'}, 'branch': {'en': "Branch", 'ar': 'الفرع'},
@ -360,8 +353,4 @@ const Map<String, Map<String, String>> localizedValues = {
'instruction': {'en': 'Instructions', 'ar': 'إرشادات'}, 'instruction': {'en': 'Instructions', 'ar': 'إرشادات'},
'addMedication': {'en': 'ADD MEDICATION', 'ar': 'اضف الدواء'}, 'addMedication': {'en': 'ADD MEDICATION', 'ar': 'اضف الدواء'},
'route': {'en': 'Route', 'ar': 'المسار'}, 'route': {'en': 'Route', 'ar': 'المسار'},
'noAppointmentsErrorMsg': {
'en': "There is no appointments for at this date",
'ar': 'لا توجد مواعيد في هذا التاريخ'
},
}; };

@ -344,14 +344,11 @@ class TranslationBase {
String get noPrescription => String get noPrescription =>
localizedValues['no-priscription-listed'][locale.languageCode]; localizedValues['no-priscription-listed'][locale.languageCode];
String get next => localizedValues['next'][locale.languageCode]; String get next => localizedValues['next'][locale.languageCode];
String get healthRecordInformation =>
localizedValues['healthRecordInformation'][locale.languageCode];
String get emptyMessage => String get emptyMessage =>
localizedValues['empty-message'][locale.languageCode]; localizedValues['empty-message'][locale.languageCode];
String get healthRecordInformation => String get healthRecordInformation =>
localizedValues['healthRecordInformation'][locale.languageCode]; localizedValues['healthRecordInformation'][locale.languageCode];
String get emptyMessage =>
localizedValues['empty-message'][locale.languageCode];
String get chiefComplaintLength => String get chiefComplaintLength =>
localizedValues['chiefComplaintLength'][locale.languageCode]; localizedValues['chiefComplaintLength'][locale.languageCode];
@ -378,8 +375,7 @@ class TranslationBase {
String get reject => localizedValues['reject'][locale.languageCode]; String get reject => localizedValues['reject'][locale.languageCode];
String get noAppointmentsErrorMsg => String get noAppointmentsErrorMsg =>
localizedValues['noAppointmentsErrorMsg'][locale.languageCode]; localizedValues['noAppointmentsErrorMsg'][locale.languageCode];
String get noAppointmentsErrorMsg =>
localizedValues['noAppointmentsErrorMsg'][locale.languageCode];
String get referralPatient => String get referralPatient =>
localizedValues['referralPatient'][locale.languageCode]; localizedValues['referralPatient'][locale.languageCode];
String get noPrescriptionListed => String get noPrescriptionListed =>

@ -146,15 +146,29 @@ class _TextFieldsState extends State<TextFields> {
Widget _buildSuffixIcon() { Widget _buildSuffixIcon() {
switch (widget.type) { switch (widget.type) {
case "password": case "password":
{ return Padding( {
padding: const EdgeInsets.only(right: 8.0), return Padding(
child: view ? padding: const EdgeInsets.only(right: 8.0),
InkWell(onTap: () {this.setState(() { view= false; });}, child: Icon(EvaIcons.eye, size: 24.0, color: Color.fromRGBO(78, 62, 253, 1.0))) child: view
: ? InkWell(
InkWell(onTap: () {this.setState(() { view= true; });}, child: Icon(EvaIcons.eyeOff, size: 24.0, color: Colors.grey[500])) onTap: () {
);} this.setState(() {
view = false;
});
},
child: Icon(EvaIcons.eye,
size: 24.0, color: Color.fromRGBO(78, 62, 253, 1.0)))
: InkWell(
onTap: () {
this.setState(() {
view = true;
});
},
child: Icon(EvaIcons.eyeOff,
size: 24.0, color: Colors.grey[500])));
}
break; break;
default: default:
if (widget.suffixIcon != null) if (widget.suffixIcon != null)
return InkWell( return InkWell(

@ -6,8 +6,6 @@ import 'package:hexcolor/hexcolor.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
class AppButton extends StatefulWidget { class AppButton extends StatefulWidget {
final GestureTapCallback onPressed; final GestureTapCallback onPressed;
final String title; final String title;
final IconData icon; final IconData icon;
@ -26,14 +24,7 @@ class AppButton extends StatefulWidget {
this.fontSize = 2, this.fontSize = 2,
this.padding = 13, this.padding = 13,
this.loading = false, this.loading = false,
this.disabled = false}); this.disabled = false,
AppButton(
{@required this.onPressed,
this.title,
this.icon,
this.color,
this.fontSize = 2,
this.padding = 13,
this.fontColor = Colors.white}); this.fontColor = Colors.white});
_AppButtonState createState() => _AppButtonState(); _AppButtonState createState() => _AppButtonState();
@ -42,58 +33,57 @@ class AppButton extends StatefulWidget {
class _AppButtonState extends State<AppButton> { class _AppButtonState extends State<AppButton> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
returnIgnorePointer( return IgnorePointer(
ignoring: widget.loading, ignoring: widget.loading,
child: RawMaterialButton( child: RawMaterialButton(
fillColor: widget.color != null ? widget.color : HexColor("#B8382C"), fillColor: widget.color != null ? widget.color : HexColor("#B8382C"),
splashColor: widget.color, splashColor: widget.color,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: widget.padding, top: widget.padding,
bottom: widget.padding, bottom: widget.padding,
//right: SizeConfig.widthMultiplier * widget.padding, //right: SizeConfig.widthMultiplier * widget.padding,
//left: SizeConfig.widthMultiplier * widget.padding //left: SizeConfig.widthMultiplier * widget.padding
), ),
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
if (widget.icon != null) if (widget.icon != null)
Icon( Icon(
widget.icon, widget.icon,
color: Colors.white, color: Colors.white,
), ),
if (widget.icon != null) if (widget.icon != null)
SizedBox( SizedBox(
width: 5.0, width: 5.0,
), ),
widget.loading widget.loading
? Padding( ? Padding(
padding: EdgeInsets.all(2.6), padding: EdgeInsets.all(2.6),
child: SizedBox( child: SizedBox(
height: 19.0, height: 19.0,
width: 19.0, width: 19.0,
child: CircularProgressIndicator( child: CircularProgressIndicator(
backgroundColor: Colors.white, backgroundColor: Colors.white,
valueColor: valueColor: AlwaysStoppedAnimation<Color>(
AlwaysStoppedAnimation<Color>( Colors.grey[300],
Colors.grey[300], ),
),
), ),
)
: AppText(
widget.title.toUpperCase(),
color: widget.fontColor,
fontSize: SizeConfig.textMultiplier * widget.fontSize,
), ),
), ],
) ),
: AppText(
widget.title.toUpperCase(),
color: widget.fontColor,
fontSize: SizeConfig.textMultiplier * widget.fontSize,
),
],
), ),
onPressed: widget.onPressed,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6))),
), ),
onPressed: widget.onPressed, );
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(6))),
),
);
} }
} }

@ -43,8 +43,8 @@ class AppTextFormField extends FormField<String> {
keyboardType: textInputType, keyboardType: textInputType,
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.allow( FilteringTextInputFormatter.allow(
RegExp(inputFormatter)),], RegExp(inputFormatter)),
],
onChanged: onChanged ?? onChanged: onChanged ??
(value) { (value) {
state.didChange(value); state.didChange(value);
@ -62,8 +62,8 @@ class AppTextFormField extends FormField<String> {
labelText: labelText, labelText: labelText,
labelStyle: TextStyle( labelStyle: TextStyle(
fontSize: SizeConfig.textMultiplier * 1.7, fontSize: SizeConfig.textMultiplier * 1.7,
),
),enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(6)), borderRadius: BorderRadius.all(Radius.circular(6)),
borderSide: BorderSide( borderSide: BorderSide(
color: borderColor != null color: borderColor != null

Loading…
Cancel
Save