Merge branch 'prescription_changes' into 'development'

hot fix

See merge request Cloud_Solution/doctor_app_flutter!688
merge-requests/687/merge
Mohammad Aljammal 5 years ago
commit 4248a17ca4

@ -48,8 +48,8 @@ class BaseAppClient {
if (body['EditedBy'] == '') { if (body['EditedBy'] == '') {
body.remove("EditedBy"); body.remove("EditedBy");
} }
body['TokenID'] = "@dm!n";// token ?? ''; body['TokenID'] = token ?? '';
// body['TokenID'] = "@dm!n" ?? ''; // body['TokenID'] = "@dm!n" ?? '';
String lang = await sharedPref.getString(APP_Language); String lang = await sharedPref.getString(APP_Language);
if (lang != null && lang == 'ar') if (lang != null && lang == 'ar')
body['LanguageID'] = 1; body['LanguageID'] = 1;

@ -297,9 +297,11 @@ const GET_PROCEDURE_TEMPLETE =
const GET_PROCEDURE_TEMPLETE_DETAILS = const GET_PROCEDURE_TEMPLETE_DETAILS =
"Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet"; "Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet";
const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP ='Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp'; const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP =
'Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp';
const DOCTOR_CHECK_HAS_LIVE_CARE = "Services/DoctorApplication.svc/REST/CheckDoctorHasLiveCare"; const DOCTOR_CHECK_HAS_LIVE_CARE =
"Services/DoctorApplication.svc/REST/CheckDoctorHasLiveCare";
var selectedPatientType = 1; var selectedPatientType = 1;

@ -53,6 +53,7 @@ class EntityList {
String remarks; String remarks;
String status; String status;
String template; String template;
int doctorID;
EntityList( EntityList(
{this.achiCode, {this.achiCode,
@ -78,10 +79,12 @@ class EntityList {
this.procedureName, this.procedureName,
this.remarks, this.remarks,
this.status, this.status,
this.template}); this.template,
this.doctorID});
EntityList.fromJson(Map<String, dynamic> json) { EntityList.fromJson(Map<String, dynamic> json) {
achiCode = json['achiCode']; achiCode = json['achiCode'];
doctorID = json['doctorID'];
appointmentDate = json['appointmentDate']; appointmentDate = json['appointmentDate'];
appointmentNo = json['appointmentNo']; appointmentNo = json['appointmentNo'];
categoryID = json['categoryID']; categoryID = json['categoryID'];
@ -110,6 +113,7 @@ class EntityList {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['achiCode'] = this.achiCode; data['achiCode'] = this.achiCode;
data['doctorID'] = this.doctorID;
data['appointmentDate'] = this.appointmentDate; data['appointmentDate'] = this.appointmentDate;
data['appointmentNo'] = this.appointmentNo; data['appointmentNo'] = this.appointmentNo;
data['categoryID'] = this.categoryID; data['categoryID'] = this.categoryID;

@ -7,7 +7,7 @@ class DoctorProfileModel {
Null clinicDescriptionN; Null clinicDescriptionN;
Null licenseExpiry; Null licenseExpiry;
int employmentType; int employmentType;
Null setupID; dynamic setupID;
int projectID; int projectID;
String projectName; String projectName;
String nationalityID; String nationalityID;

@ -618,7 +618,11 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
.toString() .toString()
: null, : null,
validationError: validationError:
unitError, model.itemMedicineListUnit
.length !=
1
? unitError
: null,
enabled: false), enabled: false),
), ),
), ),
@ -804,7 +808,12 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
? frequency[ ? frequency[
'description'] 'description']
: null, : null,
validationError: frequencyError, validationError: model
.itemMedicineList
.length !=
1
? frequencyError
: null,
enabled: false, enabled: false,
), ),
), ),

@ -2,6 +2,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@ -16,7 +17,7 @@ class ProcedureCard extends StatelessWidget {
final String categoryName; final String categoryName;
final int categoryID; final int categoryID;
final PatiantInformtion patient; final PatiantInformtion patient;
final String doctorName; final int doctorID;
const ProcedureCard({ const ProcedureCard({
Key key, Key key,
@ -25,7 +26,7 @@ class ProcedureCard extends StatelessWidget {
this.categoryID, this.categoryID,
this.categoryName, this.categoryName,
this.patient, this.patient,
this.doctorName, this.doctorID,
}) : super(key: key); }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -241,22 +242,27 @@ class ProcedureCard extends StatelessWidget {
), ),
), ),
),*/ ),*/
// Row( Padding(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, padding: const EdgeInsets.all(8.0),
// children: [ child: Row(
// AppText( mainAxisAlignment: MainAxisAlignment.spaceBetween,
// entityList.remarks.toString() ?? '', children: [
// fontSize: 12, Expanded(
// ), child: AppText(
// if (entityList.categoryID == 2 || entityList.remarks.toString() ?? '',
// entityList.categoryID == 4 && fontSize: 12,
// doctorName == entityList.doctorName) ),
// InkWell( ),
// child: Icon(DoctorApp.edit), if (entityList.categoryID == 2 ||
// onTap: onTap, entityList.categoryID == 4 &&
// ) doctorID == entityList.doctorID)
// ], InkWell(
// ) child: Icon(DoctorApp.edit),
onTap: onTap,
)
],
),
)
], ],
), ),
//onTap: onTap, //onTap: onTap,

@ -186,7 +186,7 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width * width: MediaQuery.of(context).size.width *
0.81, 0.79,
child: AppTextFieldCustom( child: AppTextFieldCustom(
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context)
.searchProcedureHere, .searchProcedureHere,

@ -125,12 +125,12 @@ class _AddProcedureHomeState extends State<AddProcedureHome>
tabWidget( tabWidget(
screenSize, screenSize,
_activeTab == 0, _activeTab == 0,
'All Procedures', "Favorite Templates",
), ),
tabWidget( tabWidget(
screenSize, screenSize,
_activeTab == 1, _activeTab == 1,
"Favorite Templates", 'All Procedures',
), ),
], ],
), ),
@ -144,14 +144,14 @@ class _AddProcedureHomeState extends State<AddProcedureHome>
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
controller: _tabController, controller: _tabController,
children: [ children: [
AddSelectedProcedure(
model: model,
patient: patient,
),
AddFavouriteProcedure( AddFavouriteProcedure(
patient: patient, patient: patient,
model: model, model: model,
), ),
AddSelectedProcedure(
model: model,
patient: patient,
),
], ],
), ),
), ),

@ -17,12 +17,12 @@ import 'package:flutter/material.dart';
import 'ProcedureCard.dart'; import 'ProcedureCard.dart';
class ProcedureScreen extends StatelessWidget { class ProcedureScreen extends StatelessWidget {
String doctorNameP; int doctorNameP;
void initState() async { void initState() async {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
doctorNameP = doctorProfile.doctorName; doctorNameP = doctorProfile.doctorID;
} }
@override @override
@ -192,7 +192,7 @@ class ProcedureScreen extends StatelessWidget {
// 'You Cant Update This Procedure'); // 'You Cant Update This Procedure');
}, },
patient: patient, patient: patient,
doctorName: doctorNameP, doctorID: doctorNameP,
), ),
), ),
if (model.state == ViewState.ErrorLocal || if (model.state == ViewState.ErrorLocal ||

@ -100,7 +100,7 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.65, height: MediaQuery.of(context).size.height * 0.9,
child: Form( child: Form(
child: Padding( child: Padding(
padding: padding:

Loading…
Cancel
Save