Migration dev to Zohaib branch

merge-requests/658/head
Mohammad Aljammal 5 years ago
parent b3ae86db31
commit 8e4321b3da

@ -98,24 +98,24 @@ class PatientSearchViewModel extends BaseViewModel {
DateTime.now().year, DateTime.now().month - 1, DateTime.now().day); DateTime.now().year, DateTime.now().month - 1, DateTime.now().day);
selectedToDate = DateTime( selectedToDate = DateTime(
DateTime.now().year, DateTime.now().month, DateTime.now().day - 1); DateTime.now().year, DateTime.now().month, DateTime.now().day - 1);
dateTo = DateUtils.convertDateToFormat(selectedToDate, 'yyyy-MM-dd'); dateTo = AppDateUtils.convertDateToFormat(selectedToDate, 'yyyy-MM-dd');
dateFrom = DateUtils.convertDateToFormat(selectedFromDate, 'yyyy-MM-dd'); dateFrom = AppDateUtils.convertDateToFormat(selectedFromDate, 'yyyy-MM-dd');
} else if (OutPatientFilterType.NextWeek == outPatientFilterType) { } else if (OutPatientFilterType.NextWeek == outPatientFilterType) {
dateTo = DateUtils.convertDateToFormat( dateTo = AppDateUtils.convertDateToFormat(
DateTime(DateTime.now().year, DateTime.now().month, DateTime(DateTime.now().year, DateTime.now().month,
DateTime.now().day + 6), DateTime.now().day + 6),
'yyyy-MM-dd'); 'yyyy-MM-dd');
dateFrom = DateUtils.convertDateToFormat( dateFrom = AppDateUtils.convertDateToFormat(
DateTime(DateTime.now().year, DateTime.now().month, DateTime(DateTime.now().year, DateTime.now().month,
DateTime.now().day + 1), DateTime.now().day + 1),
'yyyy-MM-dd'); 'yyyy-MM-dd');
} else { } else {
dateFrom = DateUtils.convertDateToFormat( dateFrom = AppDateUtils.convertDateToFormat(
DateTime( DateTime(
DateTime.now().year, DateTime.now().month, DateTime.now().day), DateTime.now().year, DateTime.now().month, DateTime.now().day),
'yyyy-MM-dd'); 'yyyy-MM-dd');
dateTo = DateUtils.convertDateToFormat( dateTo = AppDateUtils.convertDateToFormat(
DateTime( DateTime(
DateTime.now().year, DateTime.now().month, DateTime.now().day), DateTime.now().year, DateTime.now().month, DateTime.now().day),
'yyyy-MM-dd'); 'yyyy-MM-dd');

@ -570,7 +570,7 @@ class _HomeScreenState extends State<HomeScreen> {
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
String date = String date =
DateUtils.convertDateToFormat( AppDateUtils.convertDateToFormat(
DateTime( DateTime(
DateTime.now().year, DateTime.now().year,
DateTime.now().month, DateTime.now().month,

@ -335,8 +335,9 @@ class _DischargedPatientState extends State<DischargedPatient> {
), ),
),],
), ),
), ),)
); );
} }

@ -199,7 +199,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget {
), ),
Expanded( Expanded(
child: AppText( child: AppText(
"${AppDateUtils.convertStringToDate(referredPatient.dischargeDate).difference(DateUtils.convertStringToDate(referredPatient.admissionDate)).inDays + 1}", "${AppDateUtils.convertStringToDate(referredPatient.dischargeDate).difference(AppDateUtils.convertStringToDate(referredPatient.admissionDate)).inDays + 1}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: fontSize:

@ -73,7 +73,7 @@ class _FilterDatePageState extends State<FilterDatePage> {
widget.patientSearchViewModel widget.patientSearchViewModel
.selectedFromDate != .selectedFromDate !=
null null
? "${DateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedFromDate.toString(), "yyyy-MM-dd")}" ? "${AppDateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedFromDate.toString(), "yyyy-MM-dd")}"
: null, : null,
true, true,
suffixIcon: Icon( suffixIcon: Icon(
@ -102,7 +102,7 @@ class _FilterDatePageState extends State<FilterDatePage> {
widget.patientSearchViewModel widget.patientSearchViewModel
.selectedToDate != .selectedToDate !=
null null
? "${DateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedToDate.toString(), "yyyy-MM-dd")}" ? "${AppDateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedToDate.toString(), "yyyy-MM-dd")}"
: null, : null,
true, true,
suffixIcon: Icon( suffixIcon: Icon(
@ -161,10 +161,10 @@ class _FilterDatePageState extends State<FilterDatePage> {
Helpers.showErrorToast( Helpers.showErrorToast(
"The difference between from date and end date must be less than 3 months"); "The difference between from date and end date must be less than 3 months");
} else { } else {
String dateTo = DateUtils.convertDateToFormat( String dateTo = AppDateUtils.convertDateToFormat(
widget.patientSearchViewModel.selectedToDate, widget.patientSearchViewModel.selectedToDate,
'yyyy-MM-dd'); 'yyyy-MM-dd');
String dateFrom = DateUtils.convertDateToFormat( String dateFrom = AppDateUtils.convertDateToFormat(
widget.patientSearchViewModel.selectedFromDate, widget.patientSearchViewModel.selectedFromDate,
'yyyy-MM-dd'); 'yyyy-MM-dd');

@ -134,8 +134,8 @@ class PatientCard extends StatelessWidget {
) )
: patientInfo.arrivedOn != null : patientInfo.arrivedOn != null
? AppText( ? AppText(
AppDateUtils.getDayMonthYearDate(DateUtils.convertStringToDate(patientInfo.arrivedOn,) AppDateUtils.getDayMonthYearDate(AppDateUtils.convertStringToDate(patientInfo.arrivedOn,)
)+" "+ "${DateUtils.getStartTime(patientInfo.startTime)}", )+" "+ "${AppDateUtils.getStartTime(patientInfo.startTime)}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 15, fontSize: 15,
@ -143,7 +143,7 @@ class PatientCard extends StatelessWidget {
: (patientInfo.appointmentDate != null && patientInfo.appointmentDate.isNotEmpty)? : (patientInfo.appointmentDate != null && patientInfo.appointmentDate.isNotEmpty)?
AppText( AppText(
"${DateUtils.getDayMonthYearDate(DateUtils.convertStringToDate(patientInfo.appointmentDate,))} ${DateUtils.getStartTime(patientInfo.startTime)}", "${AppDateUtils.getDayMonthYearDate(AppDateUtils.convertStringToDate(patientInfo.appointmentDate,))} ${AppDateUtils.getStartTime(patientInfo.startTime)}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 15, fontSize: 15,

@ -291,7 +291,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
new TextSpan( new TextSpan(
text: patient.admissionDate == null text: patient.admissionDate == null
? "" ? ""
: "${DateUtils.convertDateFromServerFormat(patient.admissionDate.toString(), 'yyyy-MM-dd')}", : "${AppDateUtils.convertDateFromServerFormat(patient.admissionDate.toString(), 'yyyy-MM-dd')}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 15)), fontSize: 15)),
@ -305,12 +305,12 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
), ),
if(isDischargedPatient && patient.dischargeDate!=null) if(isDischargedPatient && patient.dischargeDate!=null)
AppText( AppText(
"${DateUtils.getDateTimeFromServerFormat(patient.dischargeDate).difference(DateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}", "${AppDateUtils.getDateTimeFromServerFormat(patient.dischargeDate).difference(AppDateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w700) fontWeight: FontWeight.w700)
else else
AppText( AppText(
"${DateTime.now().difference(DateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}", "${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patient.admissionDate)).inDays + 1}",
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
], ],

@ -35,7 +35,7 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.5.0" version: "2.5.0-nullsafety.1"
autocomplete_textfield: autocomplete_textfield:
dependency: "direct main" dependency: "direct main"
description: description:
@ -63,7 +63,7 @@ packages:
name: boolean_selector name: boolean_selector
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0-nullsafety.1"
build: build:
dependency: transitive dependency: transitive
description: description:
@ -140,14 +140,14 @@ packages:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0-nullsafety.3"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0-nullsafety.1"
charts_common: charts_common:
dependency: transitive dependency: transitive
description: description:
@ -196,7 +196,7 @@ packages:
name: clock name: clock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0-nullsafety.1"
code_builder: code_builder:
dependency: transitive dependency: transitive
description: description:
@ -210,7 +210,7 @@ packages:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0" version: "1.15.0-nullsafety.3"
connectivity: connectivity:
dependency: "direct main" dependency: "direct main"
description: description:
@ -336,7 +336,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0-nullsafety.1"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@ -445,6 +445,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.11" version: "1.0.11"
flutter_staggered_grid_view:
dependency: "direct main"
description:
name: flutter_staggered_grid_view
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.4"
flutter_svg: flutter_svg:
dependency: transitive dependency: transitive
description: description:
@ -552,7 +559,7 @@ packages:
name: intl name: intl
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.17.0-nullsafety.2" version: "0.16.1"
io: io:
dependency: transitive dependency: transitive
description: description:
@ -566,7 +573,7 @@ packages:
name: js name: js
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.3" version: "0.6.2"
json_annotation: json_annotation:
dependency: transitive dependency: transitive
description: description:
@ -601,14 +608,14 @@ packages:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.10" version: "0.12.10-nullsafety.1"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.3.0-nullsafety.3"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -657,7 +664,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.8.0-nullsafety.1"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
@ -886,7 +893,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.8.0-nullsafety.2"
speech_to_text: speech_to_text:
dependency: "direct main" dependency: "direct main"
description: description:
@ -900,7 +907,7 @@ packages:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0" version: "1.10.0-nullsafety.1"
sticky_headers: sticky_headers:
dependency: "direct main" dependency: "direct main"
description: description:
@ -914,7 +921,7 @@ packages:
name: stream_channel name: stream_channel
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0-nullsafety.1"
stream_transform: stream_transform:
dependency: transitive dependency: transitive
description: description:
@ -928,21 +935,21 @@ packages:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0-nullsafety.1"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0-nullsafety.1"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.19" version: "0.2.19-nullsafety.2"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@ -963,7 +970,7 @@ packages:
name: typed_data name: typed_data
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.3.0-nullsafety.3"
url_launcher: url_launcher:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1012,7 +1019,7 @@ packages:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "2.1.0-nullsafety.3"
video_player: video_player:
dependency: transitive dependency: transitive
description: description:
@ -1091,5 +1098,5 @@ packages:
source: hosted source: hosted
version: "2.2.1" version: "2.2.1"
sdks: sdks:
dart: ">=2.12.0-0.0 <3.0.0" dart: ">=2.10.0 <2.11.0"
flutter: ">=1.22.0" flutter: ">=1.22.0 <2.0.0"

Loading…
Cancel
Save