Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updates & fixes

Browse Source
pull/18/head
haroon amjad 2 months ago
parent 542de41a82
commit f8be788a60
9 changed files with 84 additions and 115 deletions
Show Stats Download Patch File Download Diff File

2
lib/core/api_consts.dart
Unescape Escape View File

@ -726,7 +726,7 @@ const DEACTIVATE_ACCOUNT = 'Services/Patients.svc/REST/PatientAppleActivation_In
class ApiConsts { class ApiConsts {
static const maxSmallScreen = 660; static const maxSmallScreen = 660;
static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
// static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT

23
lib/features/lab/lab_repo.dart
Unescape Escape View File

@ -18,23 +18,7 @@ class LabRepoImp implements LabRepo {
@override @override
Future<Either<Failure, GenericApiModel<List<PatientLabOrdersResponseModel>>>> getPatientLabOrders({required String patientId}) async { Future<Either<Failure, GenericApiModel<List<PatientLabOrdersResponseModel>>>> getPatientLabOrders({required String patientId}) async {
final mapDevice = { Map<String, dynamic> mapDevice = {};
"isDentalAllowedBackend": false,
"VersionID": 50.0,
"Channel": 3,
"LanguageID": 2,
"IPAdress": "10.20.10.20",
"generalid": "Cs2020@2016\$2958",
"Latitude": 0.0,
"Longitude": 0.0,
"DeviceTypeID": 1,
"PatientType": 1,
"PatientTypeID": 1,
"TokenID": "@dm!n",
"PatientID": "1018977",
"PatientOutSA": "0",
"SessionID": "03478TYC02N80874CTYN04883475!?"
};
try { try {
GenericApiModel<List<PatientLabOrdersResponseModel>>? apiResponse; GenericApiModel<List<PatientLabOrdersResponseModel>>? apiResponse;
@ -52,10 +36,7 @@ class LabRepoImp implements LabRepo {
throw Exception("lab list is empty"); throw Exception("lab list is empty");
} }
final labOrders = list final labOrders = list.map((item) => PatientLabOrdersResponseModel.fromJson(item as Map<String, dynamic>)).toList().cast<PatientLabOrdersResponseModel>();
.map((item) => PatientLabOrdersResponseModel.fromJson(item as Map<String, dynamic>))
.toList()
.cast<PatientLabOrdersResponseModel>();
apiResponse = GenericApiModel<List<PatientLabOrdersResponseModel>>( apiResponse = GenericApiModel<List<PatientLabOrdersResponseModel>>(
messageStatus: messageStatus, messageStatus: messageStatus,

18
lib/features/radiology/radiology_repo.dart
Unescape Escape View File

@ -18,23 +18,7 @@ class RadiologyRepoImp implements RadiologyRepo {
@override @override
Future<Either<Failure, GenericApiModel<List<PatientRadiologyResponseModel>>>> getPatientRadiologyOrders({required String patientId}) async { Future<Either<Failure, GenericApiModel<List<PatientRadiologyResponseModel>>>> getPatientRadiologyOrders({required String patientId}) async {
final mapDevice = { Map<String, dynamic> mapDevice = {};
"isDentalAllowedBackend": false,
"VersionID": 50.0,
"Channel": 3,
"LanguageID": 2,
"IPAdress": "10.20.10.20",
"generalid": "Cs2020@2016\$2958",
"Latitude": 0.0,
"Longitude": 0.0,
"DeviceTypeID": 1,
"PatientType": 1,
"PatientTypeID": 1,
"TokenID": "@dm!n",
"PatientID": "1018977",
"PatientOutSA": "0",
"SessionID": "03478TYC02N80874CTYN04883475!?"
};
try { try {
GenericApiModel<List<PatientRadiologyResponseModel>>? apiResponse; GenericApiModel<List<PatientRadiologyResponseModel>>? apiResponse;

144
lib/presentation/appointments/widgets/appointment_doctor_card.dart
Unescape Escape View File

@ -42,77 +42,79 @@ class AppointmentDoctorCard extends StatelessWidget {
fit: BoxFit.fill, fit: BoxFit.fill,
).circle(100), ).circle(100),
SizedBox(width: 16.h), SizedBox(width: 16.h),
Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
patientAppointmentHistoryResponseModel.doctorNameObj!.toText16(isBold: true), children: [
SizedBox(height: 8.h), patientAppointmentHistoryResponseModel.doctorNameObj!.toText16(isBold: true),
Row( SizedBox(height: 8.h),
children: [ Row(
CustomButton( children: [
text: patientAppointmentHistoryResponseModel.clinicName!, CustomButton(
onPressed: () {}, text: patientAppointmentHistoryResponseModel.clinicName!,
backgroundColor: AppColors.greyColor, onPressed: () {},
borderColor: AppColors.greyColor, backgroundColor: AppColors.greyColor,
textColor: AppColors.blackColor, borderColor: AppColors.greyColor,
fontSize: 10, textColor: AppColors.blackColor,
fontWeight: FontWeight.w500, fontSize: 10,
borderRadius: 8, fontWeight: FontWeight.w500,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), borderRadius: 8,
height: 30.h, padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
), height: 30.h,
SizedBox(width: 6.h), ),
CustomButton( SizedBox(width: 6.h),
text: patientAppointmentHistoryResponseModel.projectName!, CustomButton(
onPressed: () {}, text: patientAppointmentHistoryResponseModel.projectName!,
backgroundColor: AppColors.greyColor, onPressed: () {},
borderColor: AppColors.greyColor, backgroundColor: AppColors.greyColor,
textColor: AppColors.blackColor, borderColor: AppColors.greyColor,
fontSize: 10, textColor: AppColors.blackColor,
fontWeight: FontWeight.w500, fontSize: 10,
borderRadius: 8, fontWeight: FontWeight.w500,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), borderRadius: 8,
height: 30.h, padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
), height: 30.h,
], ),
), ],
SizedBox(height: 6.h), ),
Row( SizedBox(height: 6.h),
children: [ Row(
CustomButton( children: [
icon: AppAssets.appointment_calendar_icon, CustomButton(
iconColor: AppColors.blackColor, icon: AppAssets.appointment_calendar_icon,
iconSize: 12.h, iconColor: AppColors.blackColor,
text: DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false), iconSize: 12.h,
onPressed: () {}, text: DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false),
backgroundColor: AppColors.greyColor, onPressed: () {},
borderColor: AppColors.greyColor, backgroundColor: AppColors.greyColor,
textColor: AppColors.blackColor, borderColor: AppColors.greyColor,
fontSize: 10, textColor: AppColors.blackColor,
fontWeight: FontWeight.w500, fontSize: 10,
borderRadius: 8, fontWeight: FontWeight.w500,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), borderRadius: 8,
height: 30.h, padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
), height: 30.h,
SizedBox(width: 6.h), ),
CustomButton( SizedBox(width: 6.h),
icon: AppAssets.appointment_time_icon, CustomButton(
iconColor: AppColors.blackColor, icon: AppAssets.appointment_time_icon,
iconSize: 12.h, iconColor: AppColors.blackColor,
text: DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false), iconSize: 12.h,
onPressed: () {}, text: DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false),
backgroundColor: AppColors.greyColor, onPressed: () {},
borderColor: AppColors.greyColor, backgroundColor: AppColors.greyColor,
textColor: AppColors.blackColor, borderColor: AppColors.greyColor,
fontSize: 10, textColor: AppColors.blackColor,
fontWeight: FontWeight.w500, fontSize: 10,
borderRadius: 8, fontWeight: FontWeight.w500,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0), borderRadius: 8,
height: 30.h, padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
), height: 30.h,
], ),
) ],
], )
],
),
), ),
], ],
), ),

1
lib/presentation/authentication/saved_login_screen.dart
Unescape Escape View File

@ -189,6 +189,7 @@ class _SavedLogin extends State<SavedLogin> {
borderColor: AppColors.textColor, borderColor: AppColors.textColor,
textColor: AppColors.textColor, textColor: AppColors.textColor,
icon: AppAssets.whatsapp, icon: AppAssets.whatsapp,
iconColor: null,
), ),
), ),
], ],

4
lib/presentation/home/landing_page.dart
Unescape Escape View File

@ -287,7 +287,7 @@ class _LandingPageState extends State<LandingPage> {
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getServiceCardsList.length, itemCount: LandingPageData.getServiceCardsList.length,
shrinkWrap: true, shrinkWrap: true,
padding: const EdgeInsets.only(left: 0, right: 8), padding: EdgeInsets.only(left: 24.h, right: 24.h),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return AnimationConfiguration.staggeredList( return AnimationConfiguration.staggeredList(
position: index, position: index,
@ -305,7 +305,7 @@ class _LandingPageState extends State<LandingPage> {
), ),
); );
}, },
separatorBuilder: (BuildContext cxt, int index) => 0.width, separatorBuilder: (BuildContext cxt, int index) => 8.width,
), ),
), ),
], ],

2
lib/presentation/home/widgets/large_service_card.dart
Unescape Escape View File

@ -34,7 +34,7 @@ class LargeServiceCard extends StatelessWidget {
borderRadius: 16, borderRadius: 16,
), ),
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 8.h), padding: EdgeInsets.symmetric(horizontal: 0.h),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

3
lib/presentation/lab/search_lab_report.dart
Unescape Escape View File

@ -71,8 +71,9 @@ class _SearchLabResultsContentState extends State<SearchLabResultsContent> {
controller: searchEditingController, controller: searchEditingController,
isEnable: true, isEnable: true,
prefix: null, prefix: null,
autoFocus: true, autoFocus: false,
isBorderAllowed: false, isBorderAllowed: false,
keyboardType: TextInputType.text,
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
vertical: ResponsiveExtension(10).h, vertical: ResponsiveExtension(10).h,
horizontal: ResponsiveExtension(15).h, horizontal: ResponsiveExtension(15).h,

2
lib/widgets/buttons/custom_button.dart
Unescape Escape View File

@ -18,7 +18,7 @@ class CustomButton extends StatelessWidget {
final String? fontFamily; final String? fontFamily;
final FontWeight fontWeight; final FontWeight fontWeight;
final bool isDisabled; final bool isDisabled;
final Color iconColor; final Color? iconColor;
final double height; final double height;
final double iconSize; final double iconSize;

Write Preview
Loading…
Cancel
Save