Merge branch 'fix-issues' into 'development'

Fix issues

See merge request Cloud_Solution/doctor_app_flutter!305
merge-requests/306/head
Mohammad Aljammal 5 years ago
commit ad1178c1b8

@ -4,7 +4,7 @@ class GetProcedureReqModel {
int pageSize; int pageSize;
int pageIndex; int pageIndex;
List<String> search; List<String> search;
dynamic categoryId; dynamic category;
String vidaAuthTokenID; String vidaAuthTokenID;
GetProcedureReqModel( GetProcedureReqModel(
@ -13,7 +13,7 @@ class GetProcedureReqModel {
this.pageSize, this.pageSize,
this.pageIndex, this.pageIndex,
this.search, this.search,
this.categoryId, this.category,
this.vidaAuthTokenID}); this.vidaAuthTokenID});
GetProcedureReqModel.fromJson(Map<String, dynamic> json) { GetProcedureReqModel.fromJson(Map<String, dynamic> json) {
@ -22,7 +22,7 @@ class GetProcedureReqModel {
pageSize = json['PageSize']; pageSize = json['PageSize'];
pageIndex = json['PageIndex']; pageIndex = json['PageIndex'];
search = json['Search'].cast<String>(); search = json['Search'].cast<String>();
categoryId = json['CategoryId']; category = json['Category'];
vidaAuthTokenID = json['VidaAuthTokenID']; vidaAuthTokenID = json['VidaAuthTokenID'];
} }
@ -33,7 +33,7 @@ class GetProcedureReqModel {
data['PageSize'] = this.pageSize; data['PageSize'] = this.pageSize;
data['PageIndex'] = this.pageIndex; data['PageIndex'] = this.pageIndex;
data['Search'] = this.search; data['Search'] = this.search;
data['CategoryId'] = this.categoryId; data['Category'] = this.category;
data['VidaAuthTokenID'] = this.vidaAuthTokenID; data['VidaAuthTokenID'] = this.vidaAuthTokenID;
return data; return data;
} }

@ -73,13 +73,14 @@ class ProcedureService extends BaseService {
}, body: Map()); }, body: Map());
} }
Future getProcedureCategory({String categoryName}) async { Future getProcedureCategory({String categoryName, String categoryID}) async {
_getProcedureCategoriseReqModel = GetProcedureReqModel( _getProcedureCategoriseReqModel = GetProcedureReqModel(
search: [categoryName], search: [""],
patientMRN: 0, patientMRN: 0,
pageIndex: 1, pageIndex: 0,
clinicId: 0, clinicId: 0,
pageSize: 300, pageSize: 0,
category: categoryID,
); );
hasError = false; hasError = false;
_categoriesList.clear(); _categoriesList.clear();

@ -29,11 +29,12 @@ class ProcedureViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
Future getProcedureCategory({String categoryName}) async { Future getProcedureCategory({String categoryName, String categoryID}) async {
hasError = false; hasError = false;
//_insuranceCardService.clearInsuranceCard(); //_insuranceCardService.clearInsuranceCard();
setState(ViewState.BusyLocal); setState(ViewState.Busy);
await _procedureService.getProcedureCategory(categoryName: categoryName); await _procedureService.getProcedureCategory(
categoryName: categoryName, categoryID: categoryID);
if (_procedureService.hasError) { if (_procedureService.hasError) {
error = _procedureService.error; error = _procedureService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

@ -338,7 +338,9 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
0.550, 0.550,
child: TextFields( child: TextFields(
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(4) LengthLimitingTextInputFormatter(4),
WhitelistingTextInputFormatter
.digitsOnly
], ],
hintText: TranslationBase.of(context) hintText: TranslationBase.of(context)
.strength, .strength,

@ -375,7 +375,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
FontWeight FontWeight
.w700, .w700,
fontSize: fontSize:
17.0, 15.0,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
@ -417,6 +417,14 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
), ),
Row( Row(
children: [ children: [
AppText(
'Doctor Remarks : ',
fontWeight:
FontWeight
.w700,
fontSize:
13.0,
),
Expanded( Expanded(
child: child:
Container( Container(

@ -214,7 +214,9 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
0.55, 0.55,
child: TextFields( child: TextFields(
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(4) LengthLimitingTextInputFormatter(4),
WhitelistingTextInputFormatter
.digitsOnly
], ],
hintText: widget.doseStreangth, hintText: widget.doseStreangth,
fontSize: 15.0, fontSize: 15.0,

@ -147,7 +147,17 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
selectedCategory = selectedValue; selectedCategory = selectedValue;
model.getProcedureCategory( model.getProcedureCategory(
categoryName: selectedCategory[ categoryName: selectedCategory[
'categoryName']); 'categoryName'],
categoryID: selectedCategory[
'categoryId'] <=
9
? "0" +
selectedCategory[
'categoryId']
.toString()
: selectedCategory[
'categoryId']
.toString());
}); });
}, },
); );

@ -37,6 +37,13 @@ class EntityListCheckboxSearchWidget extends StatefulWidget {
class _EntityListCheckboxSearchWidgetState class _EntityListCheckboxSearchWidgetState
extends State<EntityListCheckboxSearchWidget> { extends State<EntityListCheckboxSearchWidget> {
int selectedType;
setSelectedType(int val) {
setState(() {
selectedType = val;
});
}
List<EntityList> items = List(); List<EntityList> items = List();
@override @override

@ -281,7 +281,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
FontWeight FontWeight
.w700, .w700,
fontSize: fontSize:
15.0, 13.0,
), ),
AppText( AppText(
model model
@ -292,7 +292,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
.procedureId .procedureId
.toString(), .toString(),
fontSize: fontSize:
13.0, 12.0,
), ),
SizedBox( SizedBox(
width: 12.0, width: 12.0,
@ -305,7 +305,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
FontWeight FontWeight
.w700, .w700,
fontSize: fontSize:
14.0, 13.0,
), ),
Expanded( Expanded(
child: child:
@ -315,7 +315,7 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
? 'Routine' ? 'Routine'
: 'Urgent', : 'Urgent',
fontSize: fontSize:
13.0, 11.5,
color: Color( color: Color(
0xFFB9382C), 0xFFB9382C),
), ),

@ -135,7 +135,17 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
model.getProcedureCategory( model.getProcedureCategory(
categoryName: categoryName:
selectedCategory[ selectedCategory[
'categoryName']); 'categoryName'],
categoryID: selectedCategory[
'categoryId'] <=
9
? "0" +
selectedCategory[
'categoryId']
.toString()
: selectedCategory[
'categoryId']
.toString());
}); });
}, },
); );

Loading…
Cancel
Save