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'] == '') {
body.remove("EditedBy");
}
body['TokenID'] = "@dm!n";// token ?? '';
// body['TokenID'] = "@dm!n" ?? '';
body['TokenID'] = token ?? '';
// body['TokenID'] = "@dm!n" ?? '';
String lang = await sharedPref.getString(APP_Language);
if (lang != null && lang == 'ar')
body['LanguageID'] = 1;

@ -297,9 +297,11 @@ const GET_PROCEDURE_TEMPLETE =
const GET_PROCEDURE_TEMPLETE_DETAILS =
"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;

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

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

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

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

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

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

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

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

Loading…
Cancel
Save