Merge branch 'fix_medicine_search' into 'diplomatic-quarter-live'

Fix medicine search

See merge request Cloud_Solution/diplomatic-quarter!113
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 748d98610f

@ -950,4 +950,7 @@ const Map localizedValues = {
}, },
"selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"}, "selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"},
"reviews": {"en": "Reviews", "ar": "تقييمات"}, "reviews": {"en": "Reviews", "ar": "تقييمات"},
"searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"},
"YouCanFind": {"en": "YouCanFind", "ar": "باستطاعتك العثور على "},
"ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "},
}; };

@ -2,10 +2,12 @@ import 'dart:convert';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:provider/provider.dart';
import '../../../locator.dart'; import '../../../locator.dart';
import '../../../routes.dart'; import '../../../routes.dart';
@ -159,6 +161,7 @@ class BaseAppClient {
logout() async { logout() async {
await sharedPref.remove(LOGIN_TOKEN_ID); await sharedPref.remove(LOGIN_TOKEN_ID);
await authenticatedUserObject.getUser(); await authenticatedUserObject.getUser();
Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin = false;
Navigator.of(AppGlobal.context).pushReplacementNamed(HOME); Navigator.of(AppGlobal.context).pushReplacementNamed(HOME);
} }

@ -55,7 +55,7 @@ class InsuranceCardService extends BaseService {
Future getInsuranceUpdate() async { Future getInsuranceUpdate() async {
hasError = false; hasError = false;
// _cardList.clear(); _cardList.clear();
await baseAppClient.post(GET_PAtIENTS_INSURANCE_UPDATED, await baseAppClient.post(GET_PAtIENTS_INSURANCE_UPDATED,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_cardUpdated.clear(); _cardUpdated.clear();

@ -148,7 +148,7 @@ class MyBalanceService extends BaseService {
await sharedPref.getObject(FAMILY_FILE)); await sharedPref.getObject(FAMILY_FILE));
return getAllSharedRecordsByStatusResponse; return getAllSharedRecordsByStatusResponse;
} else { } else {
return getSharedRecordByStatus(); return await getSharedRecordByStatus();
} }
} }
} }

@ -65,7 +65,7 @@ class InsuranceViewModel extends BaseViewModel {
} }
Future getFamilyFiles() async { Future getFamilyFiles() async {
await _insuranceCardService.getFamilyFiles(); await _insuranceCardService.getSharedRecordByStatus();
if (_insuranceCardService.hasError) { if (_insuranceCardService.hasError) {
error = _insuranceCardService.error; error = _insuranceCardService.error;
setState(ViewState.Error); setState(ViewState.Error);

@ -331,6 +331,7 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
void confirmSelectFamilyDialog( void confirmSelectFamilyDialog(
List<GetAllSharedRecordsByStatusList> getAllSharedRecordsByStatusList) { List<GetAllSharedRecordsByStatusList> getAllSharedRecordsByStatusList) {
if(getAllSharedRecordsByStatusList.isNotEmpty)
showDialog( showDialog(
context: context, context: context,
child: SelectPatientFamilyDialog( child: SelectPatientFamilyDialog(

@ -51,9 +51,10 @@ class MedicineSearch extends StatelessWidget {
controller: textController, controller: textController,
validator: (value) { validator: (value) {
if (value.isEmpty) { if (value.isEmpty) {
return TranslationBase.of(context) return TranslationBase.of(context).pleaseEnterMedicineName;
.pleaseEnterMedicineName; }else if( value.length <4){
} return TranslationBase.of(context).searchItemError;
}else
return null; return null;
}, },
), ),
@ -80,6 +81,7 @@ class MedicineSearch extends StatelessWidget {
], ],
), ),
), ),
if(model.pharmacy.isNotEmpty)
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: SizeConfig.heightMultiplier * 2), left: SizeConfig.heightMultiplier * 2),
@ -87,9 +89,9 @@ class MedicineSearch extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Texts( Texts(
'You Can Find ' + TranslationBase.of(context).youCanFind+
'${model.pharmacy == null ? '0' : model.pharmacy.length.toString()}' '${model.pharmacy == null ? '0' : model.pharmacy.length.toString()}'+
' Item In Search ', TranslationBase.of(context).itemInSearch,
), ),
], ],
), ),

@ -825,6 +825,9 @@ class TranslationBase {
String get selectPart => localizedValues['select-part'][locale.languageCode]; String get selectPart => localizedValues['select-part'][locale.languageCode];
String get number => localizedValues['number'][locale.languageCode]; String get number => localizedValues['number'][locale.languageCode];
String get notClassified => localizedValues['not-classified'][locale.languageCode]; String get notClassified => localizedValues['not-classified'][locale.languageCode];
String get searchItemError => localizedValues['searchItemError'][locale.languageCode];
String get youCanFind => localizedValues['YouCanFind'][locale.languageCode];
String get itemInSearch => localizedValues['ItemInSearch'][locale.languageCode];
} }

@ -66,7 +66,7 @@ class _AppDrawerState extends State<AppDrawer> {
margin: EdgeInsets.all( margin: EdgeInsets.all(
SizeConfig.imageSizeMultiplier * 4), SizeConfig.imageSizeMultiplier * 4),
), ),
user != null (user != null && projectProvider.isLogin)
? Padding( ? Padding(
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
child: Column( child: Column(
@ -143,7 +143,7 @@ class _AppDrawerState extends State<AppDrawer> {
} }
}, },
), ),
user != null (user != null && projectProvider.isLogin)
? Column( ? Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[

Loading…
Cancel
Save