child Vaccines add new child modified

merge-update-with-lab-changes
Amjad amireh 6 years ago
parent cb2a78e2ee
commit 67e3a13a95

@ -69,14 +69,16 @@ const GET_FINDUS_REQUEST=
const GET_LIVECHAT_REQUEST= const GET_LIVECHAT_REQUEST=
'Services/Patients.svc/REST/GetPatientICProjects'; 'Services/Patients.svc/REST/GetPatientICProjects';
///babyInformation ///Get Baby By User ID
const GET_BABYINFORMATION_REQUEST= const GET_BABY_BY_USER_ID= 'Services/Community.svc/REST/GetBabyByUserID';
'Services/Community.svc/REST/GetBabyByUserID';
///userInformation ///userInformation
const GET_USERINFORMATION_REQUEST= const GET_USERINFORMATION_REQUEST=
'Services/Community.svc/REST/GetUserInformation_New'; 'Services/Community.svc/REST/GetUserInformation_New';
///newUserId
const GET_NEW_USER_REQUEST=
'Services/Community.svc/REST/CreateNewUser_New';
///addNewChild ///addNewChild
const GET_NEWCHILD_REQUEST= const GET_NEWCHILD_REQUEST=

@ -0,0 +1,165 @@
class CreateNewUser_New {
Null date;
int languageID;
int serviceName;
Null time;
Null androidLink;
Null authenticationTokenID;
Null data;
bool dataw;
int dietType;
Null errorCode;
Null errorEndUserMessage;
Null errorEndUserMessageN;
Null errorMessage;
int errorType;
int foodCategory;
Null iOSLink;
bool isAuthenticated;
int mealOrderStatus;
int mealType;
int messageStatus;
int numberOfResultRecords;
Null patientBlodType;
Null successMsg;
Null successMsgN;
Null htmlResult;
bool isHMGPatient;
bool isRegister;
bool isSendSMS;
Null listBabyInformationModel;
Null listBabyNeedReminderModel;
Null listCreateVaccinationTableModel;
Null listHisPatientModel;
Null listUserInformationModel;
Null listUserInformationModelNew;
Null listVaccinationTableModel;
Null tokinID;
int userID;
Null verificationCode;
CreateNewUser_New(
{this.date,
this.languageID,
this.serviceName,
this.time,
this.androidLink,
this.authenticationTokenID,
this.data,
this.dataw,
this.dietType,
this.errorCode,
this.errorEndUserMessage,
this.errorEndUserMessageN,
this.errorMessage,
this.errorType,
this.foodCategory,
this.iOSLink,
this.isAuthenticated,
this.mealOrderStatus,
this.mealType,
this.messageStatus,
this.numberOfResultRecords,
this.patientBlodType,
this.successMsg,
this.successMsgN,
this.htmlResult,
this.isHMGPatient,
this.isRegister,
this.isSendSMS,
this.listBabyInformationModel,
this.listBabyNeedReminderModel,
this.listCreateVaccinationTableModel,
this.listHisPatientModel,
this.listUserInformationModel,
this.listUserInformationModelNew,
this.listVaccinationTableModel,
this.tokinID,
this.userID,
this.verificationCode});
CreateNewUser_New.fromJson(Map<String, dynamic> json) {
date = json['Date'];
languageID = json['LanguageID'];
serviceName = json['ServiceName'];
time = json['Time'];
androidLink = json['AndroidLink'];
authenticationTokenID = json['AuthenticationTokenID'];
data = json['Data'];
dataw = json['Dataw'];
dietType = json['DietType'];
errorCode = json['ErrorCode'];
errorEndUserMessage = json['ErrorEndUserMessage'];
errorEndUserMessageN = json['ErrorEndUserMessageN'];
errorMessage = json['ErrorMessage'];
errorType = json['ErrorType'];
foodCategory = json['FoodCategory'];
iOSLink = json['IOSLink'];
isAuthenticated = json['IsAuthenticated'];
mealOrderStatus = json['MealOrderStatus'];
mealType = json['MealType'];
messageStatus = json['MessageStatus'];
numberOfResultRecords = json['NumberOfResultRecords'];
patientBlodType = json['PatientBlodType'];
successMsg = json['SuccessMsg'];
successMsgN = json['SuccessMsgN'];
htmlResult = json['HtmlResult'];
isHMGPatient = json['IsHMGPatient'];
isRegister = json['IsRegister'];
isSendSMS = json['IsSendSMS'];
listBabyInformationModel = json['List_BabyInformationModel'];
listBabyNeedReminderModel = json['List_BabyNeedReminderModel'];
listCreateVaccinationTableModel = json['List_CreateVaccinationTableModel'];
listHisPatientModel = json['List_His_PatientModel'];
listUserInformationModel = json['List_UserInformationModel'];
listUserInformationModelNew = json['List_UserInformationModel_New'];
listVaccinationTableModel = json['List_VaccinationTableModel'];
tokinID = json['TokinID'];
userID = json['UserID'];
verificationCode = json['VerificationCode'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['Date'] = this.date;
data['LanguageID'] = this.languageID;
data['ServiceName'] = this.serviceName;
data['Time'] = this.time;
data['AndroidLink'] = this.androidLink;
data['AuthenticationTokenID'] = this.authenticationTokenID;
data['Data'] = this.data;
data['Dataw'] = this.dataw;
data['DietType'] = this.dietType;
data['ErrorCode'] = this.errorCode;
data['ErrorEndUserMessage'] = this.errorEndUserMessage;
data['ErrorEndUserMessageN'] = this.errorEndUserMessageN;
data['ErrorMessage'] = this.errorMessage;
data['ErrorType'] = this.errorType;
data['FoodCategory'] = this.foodCategory;
data['IOSLink'] = this.iOSLink;
data['IsAuthenticated'] = this.isAuthenticated;
data['MealOrderStatus'] = this.mealOrderStatus;
data['MealType'] = this.mealType;
data['MessageStatus'] = this.messageStatus;
data['NumberOfResultRecords'] = this.numberOfResultRecords;
data['PatientBlodType'] = this.patientBlodType;
data['SuccessMsg'] = this.successMsg;
data['SuccessMsgN'] = this.successMsgN;
data['HtmlResult'] = this.htmlResult;
data['IsHMGPatient'] = this.isHMGPatient;
data['IsRegister'] = this.isRegister;
data['IsSendSMS'] = this.isSendSMS;
data['List_BabyInformationModel'] = this.listBabyInformationModel;
data['List_BabyNeedReminderModel'] = this.listBabyNeedReminderModel;
data['List_CreateVaccinationTableModel'] =
this.listCreateVaccinationTableModel;
data['List_His_PatientModel'] = this.listHisPatientModel;
data['List_UserInformationModel'] = this.listUserInformationModel;
data['List_UserInformationModel_New'] = this.listUserInformationModelNew;
data['List_VaccinationTableModel'] = this.listVaccinationTableModel;
data['TokinID'] = this.tokinID;
data['UserID'] = this.userID;
data['VerificationCode'] = this.verificationCode;
return data;
}
}

@ -1,26 +1,41 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart';
import '../base_service.dart'; import '../base_service.dart';
class CreteNewBabyService extends BaseService { class CreteNewBabyService extends BaseService {
List<CreateNewBaby> createNewBabyModelList = List(); List<CreateNewBaby> createNewBabyModelList = List();
List<List_UserInformationModel> userModelList = List();
List<CreateNewUser_New> newUserModelList = List();
Future getCreateNewBabyOrders({ CreateNewBaby newChild}) async {
Future getCreateNewBabyOrders({CreateNewBaby newChild,int userID}) async {
hasError = false; hasError = false;
await getUser();
Map<String, dynamic> body = Map.from(newChild.toJson());
body['CreatedBy'] = 102;
body['EditedBy'] = 102;
body['UserID'] = userID;
body['AlertBy'] = 2;
body['EmailAddress'] = user.emailAddress;
body['IsLogin'] = true;
body['LogInTokenID'] = await sharedPref.getString(TOKEN);
body['MobileNumber'] = user.mobileNumber;
body['NationalID'] = user.nationalityID;
body['ZipCode'] = user.zipCode;
body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_NEWCHILD_REQUEST, await baseAppClient.post(GET_NEWCHILD_REQUEST,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
createNewBabyModelList.clear(); var asd ="";
},
response['List_UserInformationModel_New'].forEach((vital) { onFailure: (String error, int statusCode) {
createNewBabyModelList.add(
CreateNewBaby.fromJson(vital));
});
}, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: newChild.toJson()); }, body: body);
} }
} }

@ -1,5 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart';
@ -8,22 +9,17 @@ import '../base_service.dart';
class ChildVaccinesService extends BaseService { class ChildVaccinesService extends BaseService {
List<List_BabyInformationModel> babyInformationModelList = List(); List<List_BabyInformationModel> babyInformationModelList = List();
List<List_UserInformationModel> userInformationModelList = List(); List<List_UserInformationModel> userInformationModelList = List();
int userID = 0;
Map<String, dynamic> body = Map();
Future getAllBabyInformationOrders() async { Future getAllBabyInformationOrders() async {
Map<String, dynamic> body = Map();
hasError = false; hasError = false;
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
body['IsLogin'] = true; body['IsLogin'] = true;
body['UserID'] = userID;
//body['UserID'] = userInformationModelList[0].userID;//AuthenticatedUser.fromJson(json['List'][0] //babyInformationModelList[0].userID; await baseAppClient.post(GET_BABY_BY_USER_ID,
body['UserID'] = 46013;//42843;
await baseAppClient.post(GET_BABYINFORMATION_REQUEST,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
babyInformationModelList.clear(); babyInformationModelList.clear();
response['List_BabyInformationModel'].forEach((vital) { response['List_BabyInformationModel'].forEach((vital) {
babyInformationModelList.add(List_BabyInformationModel.fromJson(vital)); babyInformationModelList.add(List_BabyInformationModel.fromJson(vital));
}); });
@ -32,4 +28,29 @@ class ChildVaccinesService extends BaseService {
super.error = error; super.error = error;
}, body: body); }, body: body);
} }
Future getNewUserOrders() async {
Map<String, dynamic> body = Map();
hasError = false;
await getUser();
body['CreatedBy'] = 102;
body['EditedBy'] = 102;
body['UserID'] = userID;
body['AlertBy'] = 2;
body['EmailAddress'] = user.emailAddress;
body['IsLogin'] = true;
body['LogInTokenID'] = await sharedPref.getString(TOKEN);
body['MobileNumber'] = user.mobileNumber;
body['NationalID'] = user.nationalityID;
body['ZipCode'] = user.zipCode;
body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_NEW_USER_REQUEST,
onSuccess: (dynamic response, int statusCode) {
userID = response['UserID'];
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
} }

@ -11,17 +11,6 @@ class GetVccinationsItemsService extends BaseService {
Future getaccinationsitemOrders() async { Future getaccinationsitemOrders() async {
hasError = false; hasError = false;
// await getUser();
// body['BabyName']="fffffffffff eeeeeeeeeeeeee";
// body['DOB'] = "/Date(1585774800000+0300)/";
// body['EmailAddress'] = user.emailAddress;
// body['isDentalAllowedBackend'] = false;
// body['SendEmail'] = false;
// body['IsLogin'] =true;
await baseAppClient.post(GET_TABLE_REQUEST, await baseAppClient.post(GET_TABLE_REQUEST,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
getVaccinationsItemModelList.clear(); getVaccinationsItemModelList.clear();

@ -1,29 +1,25 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart';
import '../base_service.dart'; import '../base_service.dart';
class UserInformationService extends BaseService{ class UserInformationService extends BaseService {
List<List_UserInformationModel> userInformationModelList = List(); List<List_UserInformationModel> userInformationModelList = List();
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
Future getUserInformationOrders() async { Future getUserInformationOrders() async {
hasError = false; hasError = false;
await getUser(); await getUser();
body['CreatedBy'] = 102; body['CreatedBy'] = 102;
body['EditedBy'] = 102; body['EditedBy'] = 102;
body['EmailAddress'] = user.emailAddress; body['EmailAddress'] = user.emailAddress;
body['IsLogin'] =true; body['IsLogin'] = true;
body['LogInTokenID'] = 'ZBGoQFUG50eQJd6Y7u1ykA=='; body['LogInTokenID'] = await sharedPref.getString(TOKEN);
body['MobileNumber'] = user.mobileNumber; body['MobileNumber'] = user.mobileNumber;
body['NationalID'] = user.nationalityID; body['NationalID'] = user.nationalityID;
body['ZipCode'] = user.zipCode; body['ZipCode'] = user.zipCode;
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
await baseAppClient.post(GET_USERINFORMATION_REQUEST, await baseAppClient.post(GET_USERINFORMATION_REQUEST,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
userInformationModelList.clear(); userInformationModelList.clear();
@ -36,6 +32,4 @@ class UserInformationService extends BaseService{
super.error = error; super.error = error;
}, body: body); }, body: body);
} }
} }

@ -1,28 +1,36 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart';
import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart'; import 'package:diplomaticquarterapp/core/service/childvaccines/add_new_child_service.dart';
import 'package:diplomaticquarterapp/core/service/childvaccines/child_vaccines_service.dart';
import '../../../locator.dart'; import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
class AddNewChildViewModel extends BaseViewModel{ class AddNewChildViewModel extends BaseViewModel {
CreteNewBabyService _creteNewBabyService = locator<CreteNewBabyService>(); CreteNewBabyService _creteNewBabyService = locator<CreteNewBabyService>();
ChildVaccinesService _childVaccinesService = locator<ChildVaccinesService>();
bool isAdded = false;
///create new baby
List<CreateNewBaby> get creteNewBabyModelList=> _creteNewBabyService.createNewBabyModelList; createNewBabyOrders({ CreateNewBaby newChild}) async {
getNewBabyOrders({ CreateNewBaby newChild}) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild, userID: _childVaccinesService.userID);
await _creteNewBabyService.getCreateNewBabyOrders(newChild: newChild); if (_creteNewBabyService.hasError) {
if ( _creteNewBabyService.hasError) {
error = _creteNewBabyService.error; error = _creteNewBabyService.error;
setState(ViewState.Error); setState(ViewState.Error);
} else } else {
isAdded = true;
setState(ViewState.Idle); setState(ViewState.Idle);
// await _childVaccinesService.getAllBabyInformationOrders();
// if (_childVaccinesService.hasError) {
// error = _childVaccinesService.error;
// setState(ViewState.Error);
// } else{
//
// }
}
} }
} }

@ -7,18 +7,22 @@ import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
class ChildVaccinesViewModel extends BaseViewModel{ class ChildVaccinesViewModel extends BaseViewModel{
ChildVaccinesService _childVaccinesService = locator<ChildVaccinesService>(); ChildVaccinesService _childVaccinesService = locator<ChildVaccinesService>();
List<List_BabyInformationModel> get babyInformationModelList=> _childVaccinesService.babyInformationModelList;
getNewUserOrders() async {
List<List_BabyInformationModel> get babyInformationModelList=> _childVaccinesService.babyInformationModelList;//BabyInformationModelList;
getBabyInformatioRequestOrders() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _childVaccinesService.getNewUserOrders();
if (_childVaccinesService.hasError) {
error = _childVaccinesService.error;
setState(ViewState.Error);
} else
getBabyInformatioRequestOrders();
}
getBabyInformatioRequestOrders() async {
await _childVaccinesService.getAllBabyInformationOrders(); await _childVaccinesService.getAllBabyInformationOrders();
if (_childVaccinesService.hasError) { if (_childVaccinesService.hasError) {
error = _childVaccinesService.error; error = _childVaccinesService.error;
setState(ViewState.Error); setState(ViewState.Error);

@ -11,11 +11,9 @@ class UserInformationViewModel extends BaseViewModel {
List<List_UserInformationModel> get userInformationModelList => List<List_UserInformationModel> get userInformationModelList =>
_userInformationService.userInformationModelList; _userInformationService.userInformationModelList;
getUserInformatioRequestOrders() async { getUserInformationRequestOrders() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _userInformationService.getUserInformationOrders(); await _userInformationService.getUserInformationOrders();
if (_userInformationService.hasError) { if (_userInformationService.hasError) {
error = _userInformationService.error; error = _userInformationService.error;
setState(ViewState.Error); setState(ViewState.Error);

@ -123,6 +123,7 @@ void setupLocator() {
locator.registerLazySingleton(() => ChildVaccinesService()); locator.registerLazySingleton(() => ChildVaccinesService());
locator.registerLazySingleton(() => UserInformationService()); locator.registerLazySingleton(() => UserInformationService());
locator.registerLazySingleton(() => CreteNewBabyService()); locator.registerLazySingleton(() => CreteNewBabyService());
locator.registerLazySingleton(() => VaccinationTableService()); locator.registerLazySingleton(() => VaccinationTableService());

@ -1,6 +1,7 @@
import 'package:device_calendar/device_calendar.dart'; import 'package:device_calendar/device_calendar.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/List_BabyInformationModel.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/add_newchild_model.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/create_new_user_model.dart';
import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart'; import 'package:diplomaticquarterapp/core/model/childvaccines/user_information_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/add_new_child_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/add_new_child_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/child_vaccines/child_vaccines_view_model.dart';
@ -19,8 +20,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
enum Gender { Male, Female, NON } enum Gender { Male, Female, NON }
enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON } enum BeneficiaryType { MyAccount, MyFamilyFiles, OtherAccount, NON }
@ -56,6 +55,7 @@ class AddNewChildPage extends StatefulWidget {
DateTime.now().day, (hour * count))); DateTime.now().day, (hour * count)));
} }
} }
@override @override
_AddNewChildPageState createState() => _AddNewChildPageState(); _AddNewChildPageState createState() => _AddNewChildPageState();
} }
@ -75,15 +75,17 @@ class _AddNewChildPageState extends State<AddNewChildPage> {
TextEditingController _notesTextController = TextEditingController(); TextEditingController _notesTextController = TextEditingController();
BeneficiaryType beneficiaryType = BeneficiaryType.NON; BeneficiaryType beneficiaryType = BeneficiaryType.NON;
Gender gender = Gender.Male; Gender gender = Gender.Male;
CreateNewUser_New newUserChild = CreateNewUser_New();
//ChildVaccinesViewModel addvancedModel = ChildVaccinesViewModel(); //ChildVaccinesViewModel addvancedModel = ChildVaccinesViewModel();
List_BabyInformationModel addvancedModel = List_BabyInformationModel(); List_BabyInformationModel addvancedModel = List_BabyInformationModel();
CreateNewBaby newChild=CreateNewBaby(); CreateNewBaby newChild = CreateNewBaby();
List_UserInformationModel informationModel =List_UserInformationModel(); List_UserInformationModel informationModel = List_UserInformationModel();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<AddNewChildViewModel>( return BaseView<AddNewChildViewModel>(
builder: (_,model,w)=> AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: "Vaccintion", appBarTitle: "Vaccintion",
body: SingleChildScrollView( body: SingleChildScrollView(
@ -97,7 +99,8 @@ class _AddNewChildPageState extends State<AddNewChildPage> {
height: 50, height: 50,
), ),
Texts( Texts(
"Add the child's information below to recieve the schedule of vaccinations.", //+model.user.firstName, "Add the child's information below to recieve the schedule of vaccinations.",
//+model.user.firstName,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
SizedBox( SizedBox(
@ -145,7 +148,7 @@ class _AddNewChildPageState extends State<AddNewChildPage> {
label: "Male", label: "Male",
// //
onTap: () { onTap: () {
// bloodDetails.city=_selectedHospital.toString();
setState(() { setState(() {
checkedValue = 1; checkedValue = 1;
print("checkedValue=" + checkedValue.toString()); print("checkedValue=" + checkedValue.toString());
@ -221,8 +224,7 @@ class _AddNewChildPageState extends State<AddNewChildPage> {
children: [ children: [
Texts(//getStartDay() Texts(//getStartDay()
// DateUtil.yearMonthDay(DateTime.now()) // DateUtil.yearMonthDay(DateTime.now())
getStartDay() getStartDay()),
),
Icon( Icon(
Icons.calendar_today, Icons.calendar_today,
color: Colors.black, color: Colors.black,
@ -255,38 +257,22 @@ class _AddNewChildPageState extends State<AddNewChildPage> {
), ),
label: "Add", label: "Add",
// //
onTap: () { onTap: () async{
newChild.babyName = _firstTextController.text + " " + _secondTextController.text;
newChild.babyName =
_firstTextController.text + " " + _secondTextController.text;
newChild.gender = checkedValue.toString(); newChild.gender = checkedValue.toString();
newChild.strDOB=getStartDay() ; newChild.strDOB = getStartDay();
newChild.alertBy=addvancedModel.alertBy; newChild.tempValue = true;
newChild.createdBy=informationModel.createdBy ; newChild.isLogin = true;
newChild.editedBy=informationModel.createdBy;
newChild.tempValue=true;
// newChild.userID=46013;//informationModel.userID;
newChild.isLogin=true;
//newChild.tokenID='qMgbP94U23RkXtWWT0Sw==';
//'ZBGoQFUG50eQJd6Y7u1ykA==';
model.getNewBabyOrders(newChild: newChild);
await model.createNewBabyOrders(newChild: newChild);
if(model.isAdded){
AppToast.showSuccessToast(message: "Record Added"); AppToast.showSuccessToast(message: "Record Added");
//============ Navigator.pop(context,model.isAdded);
Navigator.push( }else{
context,
FadePage(
page: ChildPage(),
), //TODO handling error
); }
//==============
// bloodDetails.
}, },
), ),
), ),

@ -12,47 +12,62 @@ import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
class ChildPage extends StatefulWidget { class ChildPage extends StatefulWidget {
@override @override
_ChildPageState createState() => _ChildPageState(); _ChildPageState createState() => _ChildPageState();
} }
class _ChildPageState extends State<ChildPage> with SingleTickerProviderStateMixin { class _ChildPageState extends State<ChildPage>
with SingleTickerProviderStateMixin {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var checkedValue= true; var checkedValue = true;
return BaseView<ChildVaccinesViewModel>( return BaseView<ChildVaccinesViewModel>(
onModelReady: (model) => model.getBabyInformatioRequestOrders(),//model.getCOC(),getFindUsRequestOrders() onModelReady: (model) => model.getNewUserOrders(),
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: " Vaccination", appBarTitle: " Vaccination",
baseViewModel: model, baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
margin: EdgeInsets.only(left: 15,right: 15,top: 70), margin: EdgeInsets.only(left: 15, right: 15, top: 70),
child: Column( child: Column(
children: [ children: [
...List.generate(model.babyInformationModelList.length, (index) => ...List.generate(
Container( model.babyInformationModelList.length,
(index) => Container(
margin: EdgeInsets.only(
left: 0, right: 0, bottom: 20),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
border: Border.all(color: Colors.white, width: 0.5), border: Border.all(
borderRadius: BorderRadius.all(Radius.circular(5)), color: Colors.white, width: 0.5),
borderRadius:
BorderRadius.all(Radius.circular(5)),
color: Colors.white, color: Colors.white,
), ),
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
width: double.infinity, width: double.infinity,
child: Column( child: Column(
children: [ children: [
Row(children:[Texts("CHILD NAME"),]), Row(children: [
Row(children:[Texts(model.babyInformationModelList[index].babyName.trim()),]), Texts("CHILD NAME"),
]),
Row( Row(children: [
children: [IconButton( Texts(model
icon: Image.asset(model.babyInformationModelList[index].gender==1? 'assets/images/new-design/male.png':'assets/images/new-design/female.png'), .babyInformationModelList[index]
.babyName
.trim()),
]),
Row(children: [
IconButton(
icon: Image.asset(model
.babyInformationModelList[
index]
.gender ==
1
? 'assets/images/new-design/male.png'
: 'assets/images/new-design/female.png'),
tooltip: '', tooltip: '',
onPressed: () { onPressed: () {
setState(() { setState(() {
@ -61,9 +76,14 @@ class _ChildPageState extends State<ChildPage> with SingleTickerProviderStateMix
}); });
}, },
), ),
Texts(model.babyInformationModelList[index].genderDescription), Texts(model
.babyInformationModelList[index]
.genderDescription),
IconButton( IconButton(
icon: Icon(Icons.remove_red_eye,color: Colors.red,), icon: Icon(
Icons.remove_red_eye,
color: Colors.red,
),
tooltip: 'Increase volume by 10', tooltip: 'Increase volume by 10',
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
@ -75,7 +95,6 @@ class _ChildPageState extends State<ChildPage> with SingleTickerProviderStateMix
// HospitalsPage( // HospitalsPage(
// findusHospitalModelList: model.FindusHospitalModelList, // findusHospitalModelList: model.FindusHospitalModelList,
// ) // )
), ),
); );
// setState(() { // setState(() {
@ -83,11 +102,15 @@ class _ChildPageState extends State<ChildPage> with SingleTickerProviderStateMix
// // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber); // // launch("tel://" +model.FindusHospitalModelList[index].phoneNumber);
// }); // });
}, },
)] )
), ]),
Row(children:[Texts("Birthday"),]), Row(children: [
Row(children:[IconButton( Texts("Birthday"),
icon: new Image.asset('assets/images/new-design/calender-secondary.png'), ]),
Row(children: [
IconButton(
icon: new Image.asset(
'assets/images/new-design/calender-secondary.png'),
tooltip: 'Increase volume by 10', tooltip: 'Increase volume by 10',
onPressed: () { onPressed: () {
setState(() { setState(() {
@ -96,9 +119,14 @@ class _ChildPageState extends State<ChildPage> with SingleTickerProviderStateMix
}); });
}, },
), ),
Texts(DateUtil.yearMonthDay(model.babyInformationModelList[index].dOB)),]), Texts(DateUtil.yearMonthDay(model
Row(children:[IconButton( .babyInformationModelList[index]
icon: new Image.asset('assets/images/new-design/garbage.png'), .dOB)),
]),
Row(children: [
IconButton(
icon: new Image.asset(
'assets/images/new-design/garbage.png'),
tooltip: '', tooltip: '',
onPressed: () { onPressed: () {
setState(() { setState(() {
@ -107,44 +135,49 @@ class _ChildPageState extends State<ChildPage> with SingleTickerProviderStateMix
}); });
}, },
), ),
Texts("Birthday"),]), Texts("Birthday"),
]),
SizedBox(
height: 12,
),
], ],
) ),
),
)
) )
], ],
))
)
)
), ),
bottomSheet: Container( bottomSheet: Container(
height: MediaQuery.of(context).size.height * 0.12, height: MediaQuery.of(context).size.height * 0.12,
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
child: SecondaryButton( child: SecondaryButton(
textColor: Colors.white, textColor: Colors.white,
color: checkedValue== false ?Colors.white24:Color.fromRGBO(63, 72, 74, 1,), color: checkedValue == false
? Colors.white24
: Color.fromRGBO(
63,
72,
74,
1,
),
label: "ADD NEW CHILD ", label: "ADD NEW CHILD ",
// //
onTap: () => Navigator.push( onTap: () {
Navigator.push(
context, context,
FadePage( MaterialPageRoute(
page: AddNewChildPage(), builder: (context) => AddNewChildPage(),
),
), ),
).then((value) {
if (value) model.getNewUserOrders();
});
},
), ),
), ),
) ));
);
} }
} }

@ -29,7 +29,7 @@ class _ChildVaccinesPageState extends State<ChildVaccinesPage>
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<UserInformationViewModel>( return BaseView<UserInformationViewModel>(
onModelReady: (model) => model.getUserInformatioRequestOrders(), onModelReady: (model) => model.getUserInformationRequestOrders(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
baseViewModel: model, baseViewModel: model,
@ -132,10 +132,7 @@ class _ChildVaccinesPageState extends State<ChildVaccinesPage>
FadePage( FadePage(
page: ChildPage(), page: ChildPage(),
//ChildPage(babyInformationModelList:model.BabyInformationModelList)
// HospitalsPage(
// findusHospitalModelList: model.FindusHospitalModelList,
// )
), ),
), ),

Loading…
Cancel
Save