Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan

merge-update-with-lab-changes
Sultan Khan 5 years ago
commit 18a2393d92

@ -996,4 +996,7 @@ const Map localizedValues = {
},
"selectClinic": {"en": "Select Clinic", "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/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/utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http;
import 'package:provider/provider.dart';
import '../../../locator.dart';
import '../../../routes.dart';
@ -162,6 +164,7 @@ class BaseAppClient {
logout() async {
await sharedPref.remove(LOGIN_TOKEN_ID);
await authenticatedUserObject.getUser();
Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin = false;
Navigator.of(AppGlobal.context).pushReplacementNamed(HOME);
}

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

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

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

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

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

@ -852,6 +852,9 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
String get selectPart => localizedValues['select-part'][locale.languageCode];
String get number => localizedValues['number'][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];
}

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

Loading…
Cancel
Save