backend/src/calendar.rs

@@ -525,69 +525,6 @@ pub async fn update_event(
     eventstring
 }
 
-pub async fn calendar_update_event_state(
-    State(db_pool): State<PgPool>,
-    Extension(user_data): Extension<Option<AccountData>>,
-    Extension(rbac): Extension<RbacService>,
-    request: axum::http::Request<axum::body::Body>,
-) -> impl IntoResponse {
-    // Is the user logged in?
-    let logged_in = user_data.is_some();
-
-    // Set default events
-    let mut eventstring: String = "[]".to_string();
-
-    if logged_in {
-        // Extract the user data.
-        let _user = user_data.as_ref().unwrap().clone();
-        let userid = user_data.as_ref().map(|s| s.id.clone()).unwrap_or_default();
-        let personid = user_data
-            .as_ref()
-            .map(|s| s.person_id.clone())
-            .unwrap_or_default();
-
-        if rbac.has_permission(userid, "calendar:*:*").await {
-            let (_parts, body) = request.into_parts();
-            let bytes = axum::body::to_bytes(body, usize::MAX).await.unwrap();
-            let body_str = String::from_utf8(bytes.to_vec()).unwrap();
-
-            let v: Value = serde_json::from_str(&body_str).unwrap();
-
-            // Convert calendar id to UUID
-            let calendar_event_id = Uuid::parse_str(v["id"].as_str().unwrap()).unwrap();
-
-            let event = sqlx::query_scalar::<_, uuid::Uuid>(
-                r#"with cet as (select id from calendar_event_types where name = $1 and state = $2)
-                        update calendar_events 
-                        set updated_by = $3, 
-                        updated_at = now(),
-                        event_type_id = cet.id
-                        from cet
-                        where calendar_events.id = $4
-                        returning calendar_events.id"#
-            )
-            .bind(v["eventType"].as_str().unwrap())
-            .bind(v["state"].as_str().unwrap())
-            .bind(personid)
-            .bind(calendar_event_id)
-            .fetch_one(&db_pool)
-            .await
-            .map_err(|e| {
-                (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    format!("Error creating event: {}", e),
-                )
-            });
-
-            let event_id = event.clone();
-
-            eventstring = get_event(event_id.unwrap(), &db_pool).await;
-        }
-    }
-
-    eventstring
-}
-
 #[derive(Template)]
 #[template(path = "newevent.html")]
 struct EventTemplate {

backend/src/main.rs

@@ -34,7 +34,7 @@ use wishlist::{
     user_wishlist_returned_item, user_wishlist_save_item, wishlists,
 };
 
-use crate::calendar::{calendar_update_event_state, update_event};
+use crate::calendar::update_event;
 
 //use email::send_emails;
 
@@ -98,7 +98,6 @@ async fn main() {
         .route("/calendar/newevent", get(new_event))
         .route("/calendar/newrequest", post(new_request))
         .route("/calendar/updaterequest", post(update_event))
-        .route("/calendar/updateeventstate", post(calendar_update_event_state))
         // Wishlist
         .route("/wishlists", get(wishlists))
         .route("/userwishlist/{user_id}", get(user_wishlist))

backend/templates/calendar.html

@@ -19,11 +19,7 @@
                 </div>
                 <div class="modal-body">
                     <div class="form-group">
-                        <label for="eventTitle">Reservation for</label>
+                        <label for="eventStart">Starting</label>
-                        <input type="text" id="eventTitle" class="form-control" placeholder="Reservation for">
-                    </div>
-                    <div class="form-group">
-                        <label for="eventStart">Arriving</label>
                         <input type="date" class="form-control" id="eventStart" required>
                     </div>
                     <div class="form-group">
@@ -51,29 +47,9 @@
                     <h5 class="modal-title">Edit Event</h5>
                 </div>
                 <div class="modal-body">
-                    <div class="form-group">
+                    <input type="text" id="eventEditTitle" class="form-control" placeholder="Event Title">
-                        <label for="eventEditTitle">Reservation for</label>
+                    <input type="date" id="eventEditStart" class="form-control" placeholder="Start">
-                        <input type="text" id="eventEditTitle" class="form-control" placeholder="Event Title">
+                    <input type="date" id="eventEditEnd" class="form-control" placeholder="End">
-                    </div>
-                    <div class="form-group">
-                        <label for="eventEditEnd">Arriving</label>
-                        <input type="date" id="eventEditStart" class="form-control" placeholder="Start">
-                    </div>
-                    <div class="form-group">
-                        <label for="eventEditEnd">Leaving</label>
-                        <input type="date" id="eventEditEnd" class="form-control" placeholder="End">
-                    </div>
-
-                    {% for user_role in user_roles %}
-                    {% if user_role.role_name == "admin" %}
-                    <h5>Actions</h5>
-                    <ul>
-                        <button type="button" id="eventApprove" onclick="updateEventState('Approved')">Approve</button>
-                        <button type="button" id="eventReject" onclick="updateEventState('Rejected')">Reject</button>
-                        <button type="button" id="eventConfirm" onclick="updateEventState('Confirmed')">Confirm</button>
-                    </ul>
-                    {% endif %}
-                    {% endfor %}
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" id="closeEventEdit"
@@ -218,34 +194,5 @@
             $('#eventEditModal').modal('hide');
         });
     });
-
-    function updateEventState(state) {
-        var updatedEvent = {
-            id: window.calEvent.id,
-            eventType: 'Reservation',
-            state: state
-        };
-
-        // Save the updates to the record
-        fetch('/calendar/updateeventstate', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify(updatedEvent)
-        })
-            .then(response => {
-                if (!response.ok) throw new Error('Network response was not ok');
-                return response.json();
-            })
-            .then(data => {
-                // Update the original event object
-                window.calEvent.setProp('backgroundColor', data.backgroundColor);
-
-                e.target.reset();
-            })
-            .catch(error => {
-                console.error('Error creating event:', error);
-                //alert('An error occurred while creating the event.');
-            });
-    }
 </script>
 {% endblock scripts %}

backend/toprod.sh

@@ -1,4 +1,7 @@
 cargo build --release
+#ssh www@192.168.59.11 'pkill jean-marie'
 scp target/release/jean-marie www@192.168.59.11:/opt/jean-marie
-#scp prod.env www@192.168.59.11:/opt/jean-marie
+scp runsite.sh www@192.168.59.11:/opt/jean-marie
+scp prod.env www@192.168.59.11:/opt/jean-marie
 scp -r templates www@192.168.59.11:/opt/jean-marie
+#ssh www@192.168.59.11 '/opt/jean-marie/runsite.sh'

backend/totestviapw10.sh

@@ -1,5 +0,0 @@
-proxy=99.232.244.189
-cargo build --release
-scp target/release/jean-marie chris@$proxy:development/jean-marie/backend/target/release
-scp -r templates chris@$proxy:development/jean-marie/backend
-