fix home page design

merge-requests/669/head
Mohammad Aljammal 5 years ago
parent a525787c19
commit 57fcd2cdeb

@ -105,7 +105,7 @@ class LabsService extends BaseService {
await baseAppClient.postPatient(url, patient: patient,
onSuccess: (dynamic response, int statusCode) {
patientLabSpecialResult.clear();
// patientLabSpecialResult.clear();
labResultList.clear();
if (isInpatient) {

@ -257,41 +257,6 @@ class ProcedureViewModel extends BaseViewModel {
}
}
getPatientLabResult(
{PatientLabOrders patientLabOrder, PatiantInformtion patient}) async {
setState(ViewState.Busy);
await _labsService.getPatientLabResult(
patientLabOrder: patientLabOrder, patient: patient);
if (_labsService.hasError) {
error = _labsService.error;
setState(ViewState.Error);
} else {
_labsService.labResultList.forEach((element) {
List<LabResultList> patientLabOrdersClinic = labResultLists
.where(
(elementClinic) => elementClinic.filterName == element.testCode)
.toList();
if (patientLabOrdersClinic.length != 0) {
var value =
labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])]
.patientLabResultList
.where((e) =>
e.sampleCollectedOn == element.sampleCollectedOn &&
e.resultValue == element.resultValue)
.toList();
if (value.isEmpty)
labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])]
.patientLabResultList
.add(element);
} else {
labResultLists
.add(LabResultList(filterName: element.testCode, lab: element));
}
});
setState(ViewState.Idle);
}
}
getPatientLabOrdersResults(
{PatientLabOrders patientLabOrder,

@ -62,9 +62,7 @@ class _LandingPageState extends State<LandingPage> {
physics: NeverScrollableScrollPhysics(),
controller: pageController,
children: [
ShowCaseWidget(
builder: Builder(builder: (context) => HomeScreen()),
),
HomeScreen(),
MyScheduleScreen(),
QrReaderScreen(),
DoctorReplyScreen(

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@ -28,8 +29,8 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
@override
Widget build(BuildContext context) {
return Container(
// height: MediaQuery.of(context).size.height * 0.35,
height: 230,
height: MediaQuery.of(context).size.height * 0.35,
// height: 230,
child: Swiper(
onIndexChanged: (index) {
if (mounted) {
@ -210,12 +211,12 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
widget.model
.getPatientCount(dashboardItemList[2])
.toString(),
fontSize: 28,
fontSize: SizeConfig.textMultiplier * 3.0,
fontWeight: FontWeight.bold,
)
],
),
top: MediaQuery.of(context).size.height * 0.12,
top: MediaQuery.of(context).size.height * 0.13,
left: 0,
right: 0)
]),

@ -27,7 +27,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
PatiantInformtion patient;
bool isFromSearch = false;
bool isFromLiveCare = true;
bool isFromLiveCare = false;
bool isInpatient = false;
@ -73,6 +73,9 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
if (routeArgs.containsKey("isSearchAndOut")) {
isSearchAndOut = routeArgs['isSearchAndOut'];
}
if(routeArgs.containsKey("isFromLiveCare")) {
isFromLiveCare = routeArgs['isFromLiveCare'];
}
if (isInpatient)
_activeTab = 0;
else
@ -287,7 +290,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
),
],
),
) : Container(),
) : null,
),

@ -9,12 +9,12 @@ class GetActivityButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
width: 110,
width: MediaQuery.of(context).size.height * 0.125,
padding: EdgeInsets.all(5),
margin: EdgeInsets.all(5),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(20),
borderRadius: BorderRadius.circular(15),
),
child: Padding(
padding: const EdgeInsets.fromLTRB(8, 0, 8, 0),

@ -14,7 +14,7 @@ class GetOutPatientStack extends StatelessWidget {
var list = new List<Widget>();
value.summaryoptions.forEach((result) =>
{list.add(getStack(result, value.summaryoptions.first.value))});
{list.add(getStack(result, value.summaryoptions.first.value,context))});
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@ -32,7 +32,7 @@ class GetOutPatientStack extends StatelessWidget {
);
}
getStack(Summaryoptions value, max) {
getStack(Summaryoptions value, max,context) {
return Expanded(
child: Container(
margin: EdgeInsets.symmetric(horizontal: 2),
@ -55,7 +55,7 @@ class GetOutPatientStack extends StatelessWidget {
child: Container(
child: SizedBox(),
padding: EdgeInsets.all(10),
height: max != 0 ? (150 * value.value) / max : 0,
height: max != 0 ? ((MediaQuery.of(context).size.height * 0.24 )* value.value) / max : 0,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
color: Color(0x63D02127),
@ -63,7 +63,7 @@ class GetOutPatientStack extends StatelessWidget {
),
),
Container(
height: 150,
height: (MediaQuery.of(context).size.height * 0.24 ),
margin: EdgeInsets.only(left: 5, top: 5),
padding: EdgeInsets.all(10),
child: RotatedBox(

Loading…
Cancel
Save