merge-update-with-lab-changes
haroon amjad 4 years ago
parent e1f5eb8b83
commit 40cbca565a

@ -117,8 +117,6 @@ class EReferralService extends BaseService {
_allReferral.clear(); _allReferral.clear();
hasError = false; hasError = false;
searchEReferralRequestModel.patientMobileNumber = "966545156035";
// TODO return this code when the fix the server // TODO return this code when the fix the server
await baseAppClient.post(GET_E_REFERRALS, await baseAppClient.post(GET_E_REFERRALS,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {

@ -39,7 +39,7 @@ class AppoitmentAllHistoryResultList {
String doctorImageURL; String doctorImageURL;
String doctorNameObj; String doctorNameObj;
int doctorRate; int doctorRate;
double decimalDoctorRate; dynamic decimalDoctorRate;
List<String> doctorSpeciality; List<String> doctorSpeciality;
String doctorTitle; String doctorTitle;
int gender; int gender;

@ -1,5 +1,6 @@
import 'dart:ui'; import 'dart:ui';
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/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
@ -34,7 +35,6 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/config/config.dart';
class MyFamily extends StatefulWidget { class MyFamily extends StatefulWidget {
final bool isAppbarVisible; final bool isAppbarVisible;
@ -192,24 +192,40 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Container(
children: [ margin: EdgeInsets.only(top: 5.0),
CupertinoSwitch( width: 100.0,
value: isSwitchUser, child: DefaultButton(
onChanged: (value) { TranslationBase.of(context).switchUser,
setState(() { () {
isSwitchUser = value; // setState(() {
}); // isSwitchUser = value;
if (isSwitchUser == true) switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context); // });
}, switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], AppGlobal.context);
), },
Texts( fontSize: 12.0,
TranslationBase.of(context).switchUser, color: Colors.white,
color: Colors.white, textColor: Colors.black,
fontSize: 12, ),
)
],
), ),
// Row(
// children: [
// CupertinoSwitch(
// value: isSwitchUser,
// onChanged: (value) {
// setState(() {
// isSwitchUser = value;
// });
// if (isSwitchUser == true) switchUser(snapshot.data.getAllSharedRecordsByStatusList[index], context);
// },
// ),
// Texts(
// TranslationBase.of(context).switchUser,
// color: Colors.white,
// fontSize: 12,
// )
// ],
// ),
InkWell( InkWell(
onTap: () { onTap: () {
deleteFamily(snapshot.data.getAllSharedRecordsByStatusList[index], context); deleteFamily(snapshot.data.getAllSharedRecordsByStatusList[index], context);

@ -167,7 +167,6 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(err); print(err);
AppToast.showErrorToast(message: err); AppToast.showErrorToast(message: err);
Navigator.of(context).pop();
}); });
} }

@ -7,7 +7,8 @@ class DefaultButton extends StatelessWidget {
final Color color; final Color color;
final Color disabledColor; final Color disabledColor;
final IconData iconData; final IconData iconData;
DefaultButton(this.text, this.onPress, {this.color, this.disabledColor, this.textColor = Colors.white, this.iconData}); final double fontSize;
DefaultButton(this.text, this.onPress, {this.color, this.disabledColor, this.textColor = Colors.white, this.iconData, this.fontSize});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -23,7 +24,7 @@ class DefaultButton extends StatelessWidget {
child: Text( child: Text(
text, text,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: textColor, letterSpacing: -0.48), style: TextStyle(fontSize: fontSize ?? 16, fontWeight: FontWeight.w600, color: textColor, letterSpacing: -0.48),
), ),
), ),
], ],

Loading…
Cancel
Save