Release: v1.0.4

XPH0816 · Jun 21, 2024 · b752939 · b752939
1 parent dd930d7
commit b752939
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "libraryroombookingsystem",
   "private": true,
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "LibraryRoomBookingSystem"
-version = "1.0.3"
+version = "1.0.4"
 description = "A Library Room Booking System built with Tauri and Rust"
 authors = ["Lim Shi Song limshisong123@gmail.com"]
 edition = "2021"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "LibraryRoomBookingSystem",
-    "version": "1.0.3"
+    "version": "1.0.4"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/lib/components/forms/BookingForm.svelte b/src/lib/components/forms/BookingForm.svelte
@@ -39,9 +39,13 @@
 
     onMount(async () => {
         roomsAvailable = await getRoomsByType(roomName);
-        roomId
-            ? (roomName = (await getRoomById(roomId)).type)
-            : (roomId = roomsAvailable[0].room_id);
+        let room;
+        if (roomId != null) {
+            room = await getRoomById(roomId);
+            roomName = room.type;
+        } else {
+            roomId = roomsAvailable[0].room_id;
+        }
         price = getPrice(rooms.find((value) => value.name === roomName).price);
         changeDate();
     });
@@ -73,7 +77,11 @@
         let endDateTime = new Date(dateTime);
         endDateTime = GetEndDateTime(endDateTime, room.duration);
         checkOutTime = formatTime(endDateTime);
-        if (checkInDate !== checkOutDate && isNotHikmahRoomAndEksplorasiRoom(roomName)) changeDate();
+        if (
+            checkInDate !== checkOutDate &&
+            isNotHikmahRoomAndEksplorasiRoom(roomName)
+        )
+            changeDate();
     };
 
     let changeEndTime = () => {
@@ -131,11 +139,15 @@
                         )}
                         bind:value={roomId}
                     >
-                        {#each roomsAvailable as room}
-                            <option value={room.room_id}
-                                >{room.room_number}</option
-                            >
-                        {/each}
+                        <!-- {#await getRoomsByType(roomName) then roomsAvailable} -->
+                            {#each roomsAvailable as room}
+                                <option
+                                    value={room.room_id}
+                                    selected={roomId === room.room_id}
+                                    >{room.room_number}</option
+                                >
+                            {/each}
+                        <!-- {/await} -->
                     </Input>
                 </FormGroup>
             </Col>

diff --git a/src/routes/(admin)/manage/feedback/form/+page.svelte b/src/routes/(admin)/manage/feedback/form/+page.svelte
@@ -13,6 +13,8 @@
     let submit;
     let success = false;
     let failure = false;
+    let msg;
+
     let view = false;
     let reply;
     let close;
@@ -39,7 +41,7 @@
         submit = async () => {
             success = failure = false;
             try {
-                if (reply.comment === "") throw new Error("Reply is Required"); 
+                if (!reply.comment) throw new Error("Please enter your reply");
                 data.feedback.content = content;
                 data.feedback.admin_id = $user.id;
                 data.feedback.comment = reply.comment;
@@ -50,6 +52,8 @@
                 } else throw new Error("Failed to Submit Feedback");
             } catch (e) {
                 failure = true;
+                if(e.message) msg = e.message;
+                else msg = "Failed to Submit Feedback";
             }
         };
     });
@@ -61,6 +65,7 @@
             bind:content
             bind:success
             bind:failure
+            bind:msg
             feedback={data.feedback}
             bind:data={reply}
             button="Reply"

diff --git a/src/routes/(authed)/booking/+page.svelte b/src/routes/(authed)/booking/+page.svelte
@@ -35,7 +35,7 @@
                     "Room is not available for the selected time period",
                 );
             }
-            if(roomId === undefined) throw new Error("Please select a room");
+            if(roomId == undefined) throw new Error("Please select a room");
             if(!reason) throw new Error("Please enter a reason");
             let booking = new Booking({
                 room_id: roomId,

diff --git a/src/routes/(authed)/booking/room/+page.svelte b/src/routes/(authed)/booking/room/+page.svelte
@@ -9,14 +9,13 @@
     import { Booking, checkAvailability } from "$lib/models/booking";
     import showModal from "$lib/showModal.js";
     import { currentDateTime, user } from "$lib/store";
-    import { onMount } from "svelte";
 
     export let data;
 
     let roomId = data.room.room_id;
-    let checkInDate;
+    let checkInDate = formatDate(data.dateTime);
     let checkOutDate;
-    let checkInTime;
+    let checkInTime = formatTime(data.dateTime);
     let checkOutTime;
     let reason;
     let success = false;
@@ -43,6 +42,8 @@
                     "Room is not available for the selected time period",
                 );
             }
+            if (roomId === undefined) throw new Error("Please select a room");
+            if (!reason) throw new Error("Please enter a reason");
             let booking = new Booking({
                 room_id: roomId,
                 user_id: $user.id,
@@ -57,11 +58,6 @@
             else showModal("Error", "Failed to book room");
         }
     };
-
-    onMount(() => {
-        checkInDate = formatDate(data.dateTime);
-        checkInTime = formatTime(data.dateTime);
-    });
 </script>
 
 <main class="container-fluid">