From 08c0c0abc10aae93a38510579743bff72ae689b3 Mon Sep 17 00:00:00 2001
From: Sultan khan <>
Date: Sun, 10 Dec 2023 16:14:05 +0300
Subject: [PATCH] doctor rota
---
assets/images/svgs/next.svg | 8 ++++++++
assets/images/svgs/prev.svg | 4 ++++
lib/core/model/dashboard/doctor_schedule.dart | 16 ++++++++--------
lib/core/service/home/schedule_service.dart | 2 +-
lib/screens/doctor_schedule/doctor_schedule.dart | 6 +++---
5 files changed, 24 insertions(+), 12 deletions(-)
create mode 100644 assets/images/svgs/next.svg
create mode 100644 assets/images/svgs/prev.svg
diff --git a/assets/images/svgs/next.svg b/assets/images/svgs/next.svg
new file mode 100644
index 00000000..ec3d4fdd
--- /dev/null
+++ b/assets/images/svgs/next.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/svgs/prev.svg b/assets/images/svgs/prev.svg
new file mode 100644
index 00000000..1b95cda7
--- /dev/null
+++ b/assets/images/svgs/prev.svg
@@ -0,0 +1,4 @@
+
diff --git a/lib/core/model/dashboard/doctor_schedule.dart b/lib/core/model/dashboard/doctor_schedule.dart
index ab8cf192..bb0baf94 100644
--- a/lib/core/model/dashboard/doctor_schedule.dart
+++ b/lib/core/model/dashboard/doctor_schedule.dart
@@ -60,21 +60,21 @@ class Scheduleforuser {
}
class Shiftforuser {
- int fromtime;
- int totime;
+ String fromtimetext;
+ String totimetext;
Shiftforuser({
- this.fromtime,
- this.totime,
+ this.fromtimetext,
+ this.totimetext,
});
factory Shiftforuser.fromJson(Map json) => Shiftforuser(
- fromtime: json["fromtime"],
- totime: json["totime"],
+ fromtimetext: json["fromtimetext"],
+ totimetext: json["totimetext"],
);
Map toJson() => {
- "fromtime": fromtime,
- "totime": totime,
+ "fromtimetext": fromtimetext,
+ "totimetext": totimetext,
};
}
diff --git a/lib/core/service/home/schedule_service.dart b/lib/core/service/home/schedule_service.dart
index c0167592..cd4ffe46 100644
--- a/lib/core/service/home/schedule_service.dart
+++ b/lib/core/service/home/schedule_service.dart
@@ -31,7 +31,7 @@ class ScheduleService extends BaseService {
Future getDoctorRota(String fromDate, String toDate,{int pageNo = 1}) async{
hasError = false;
- String doctorId = '7826'; //await sharedPref.getString(DOCTOR_ID);
+ String doctorId = await sharedPref.getString(DOCTOR_ID); ////'7826';
String url = DOCTOR_SCHEDULE + '?userid='+doctorId+'&fromDate='+fromDate+'&toDate='+toDate+'&pagenumber='+pageNo.toString()+'&pagesize=10';
await baseAppClient.get( endPoint: url, onSuccess: (dynamic response, int statusCode) {
_doctorRota =[];
diff --git a/lib/screens/doctor_schedule/doctor_schedule.dart b/lib/screens/doctor_schedule/doctor_schedule.dart
index 9bdd4b62..21b1ee21 100644
--- a/lib/screens/doctor_schedule/doctor_schedule.dart
+++ b/lib/screens/doctor_schedule/doctor_schedule.dart
@@ -301,9 +301,9 @@ class _DoctorSchedulePageState extends State {
itemBuilder: (context,
index3) =>
Row(children: [
- Text(model.getDoctorRotation[index].scheduleforuser[index2].shiftforuser[index3].fromtime.toString()),
- Text(" To "),
- Text(model.getDoctorRotation[index].scheduleforuser[index2].shiftforuser[index3].totime.toString())
+ Text(model.getDoctorRotation[index].scheduleforuser[index2].shiftforuser[index3].fromtimetext.toString()),
+ Text(TranslationBase.of(context).to),
+ Text(model.getDoctorRotation[index].scheduleforuser[index2].shiftforuser[index3].totimetext.toString())
])))
// ],)