Corrections in the model

swciitg · Jul 17, 2023 · 3434ce3 · 3434ce3
1 parent 0804f41
commit 3434ce3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 53 deletions.
diff --git a/packages/irbs/lib/src/models/booking_model.dart b/packages/irbs/lib/src/models/booking_model.dart
@@ -4,8 +4,6 @@ class BookingModel {
   String roomId = '';
   String user = '';
   String status = '';
-
-  //TODO convert this string to datetime approriately
   String inTime = '';
   String outTime = '';
   String bookingPurpose = '';

diff --git a/packages/irbs/lib/src/models/owned_room_booking.dart b/packages/irbs/lib/src/models/owned_room_booking.dart
diff --git a/packages/irbs/lib/src/screens/all_requests.dart b/packages/irbs/lib/src/screens/all_requests.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:irbs/src/services/api.dart';
 import 'package:irbs/src/widgets/home/request.dart';
-import 'package:irbs/src/models/owned_room_booking.dart';
 import '../globals/colors.dart';
 import '../globals/styles.dart';
+import '../models/booking_model.dart';
 class ViewAllRequests extends StatelessWidget {
-  final List<OwnedRoomBooking> requestedBookings;
+  final List<BookingModel> requestedBookings;
   const ViewAllRequests({required this.requestedBookings, super.key});
 
   @override

diff --git a/packages/irbs/lib/src/services/api.dart b/packages/irbs/lib/src/services/api.dart
@@ -1,6 +1,5 @@
 import 'package:dio/dio.dart';
 import 'package:irbs/src/models/booking_model.dart';
-import 'package:irbs/src/models/owned_room_booking.dart';
 import 'package:irbs/src/models/room_model.dart';
 import '../functions/auth_helper_functions.dart';
 import '../functions/snackbar.dart';
@@ -52,7 +51,7 @@ class APIService {
     }));
   }
 
-  Future<List<OwnedRoomBooking>> getOwnedRoomBookings()async{
+  Future<List<BookingModel>> getOwnedRoomBookings()async{
     try {
       Response res = await dio.get(
         '${Endpoints.baseUrl}${Endpoints.getOwnedRoomBookings}',
@@ -62,9 +61,9 @@ class APIService {
       );
 
       if(res.statusCode == 200){
-        List<OwnedRoomBooking> bookings = [];
+        List<BookingModel> bookings = [];
         for(var booking in res.data){
-          bookings.add(OwnedRoomBooking.fromJson(booking));
+          bookings.add(BookingModel.fromJson(booking));
         }
         return bookings;
       }else{
@@ -314,8 +313,8 @@ class APIService {
           }
         }
         List<List<BookingModel>> answer = [];
-        sortByParameter(currentBooking, (a, b) => a.inTime.compareTo(b.inTime));
-        sortByParameter(currentBooking, (a, b) => b.outTime.compareTo(a.outTime));
+        sortByParameter(currentBooking, (a, b) => b.inTime.compareTo(a.inTime));
+        sortByParameter(currentBooking, (a, b) => a.outTime.compareTo(b.outTime));
         answer.add(currentBooking);
         answer.add(pastBooking);
         return answer;

diff --git a/packages/irbs/lib/src/widgets/home/request.dart b/packages/irbs/lib/src/widgets/home/request.dart
@@ -3,10 +3,10 @@ import 'package:intl/intl.dart';
 import 'package:irbs/src/globals/colors.dart';
 import 'package:irbs/src/globals/styles.dart';
 import 'package:irbs/src/widgets/home/respond_dialog.dart';
-import 'package:irbs/src/models/owned_room_booking.dart';
+import '../../models/booking_model.dart';
 
 class Request extends StatelessWidget {
-  final OwnedRoomBooking bookingData;
+  final BookingModel bookingData;
   const Request({required this.bookingData, super.key});
 
   @override

diff --git a/packages/irbs/lib/src/widgets/home/respond_dialog.dart b/packages/irbs/lib/src/widgets/home/respond_dialog.dart
@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
+import 'package:irbs/src/functions/snackbar.dart';
 import 'package:irbs/src/globals/colors.dart';
 import 'package:irbs/src/globals/styles.dart';
-import 'package:irbs/src/models/owned_room_booking.dart';
 import 'package:irbs/src/services/api.dart';
+import '../../models/booking_model.dart';
 import 'approved_dialog.dart';
 import 'package:intl/intl.dart';
 
 class RespondDialog extends StatefulWidget {
-  final OwnedRoomBooking bookingData;
+  final BookingModel bookingData;
   const RespondDialog({required this.bookingData, super.key});
 
   @override
@@ -234,7 +235,7 @@ class _RespondDialogState extends State<RespondDialog> {
                           ),
                         ),
                         onTap: () async{
-                          // Navigator.pop(context);
+                          try{
                           await APIService().acceptBooking(widget.bookingData.id, textEditingController.text);
                           await showDialog(
                             context: context,
@@ -245,7 +246,10 @@ class _RespondDialogState extends State<RespondDialog> {
                               );
                             },
                           );
-                          Navigator.pop(context);
+                          Navigator.pop(context);}
+                              catch(e){
+                            showSnackBar(e.toString());
+                              }
                         },
                       ),
                     ),