drag n drop

src/cljs/chicken_master/backend_mocks.cljs

@@ -11,12 +11,12 @@
 ;;; Orders
 
 (def id-counter (atom -1))
-(def days (atom
-           (->> (time/date-offset (new js/Date) -50)
-               (time/days-range 90)
-               (map (fn [date]
-                      [(time/iso-date date) (repeatedly (rand-int 6) #(swap! id-counter inc))]))
-               (into {}))))
+;; (def days (atom
+;;            (->> (time/date-offset (new js/Date) -50)
+;;                (time/days-range 90)
+;;                (map (fn [date]
+;;                       [(time/iso-date date) (repeatedly (rand-int 6) #(swap! id-counter inc))]))
+;;                (into {}))))
 (def notes ["bezglutenowy"
             "tylko z robakami"
             "przyjdzie wieczorem"
@@ -28,7 +28,10 @@
                       {:id 3 :name "johnny"}]))
 (def orders
   (atom
-   (->> @days
+   (->> (time/date-offset (new js/Date) -50)
+        (time/days-range 90)
+        (map (fn [date]
+               [(time/iso-date date) (repeatedly (rand-int 6) #(swap! id-counter inc))]))
         (map (fn [[day ids]]
                (map (fn [i]
                       {:id i :day day
@@ -58,7 +61,7 @@
                          :name customer-name})
   (fetch-stock params))
 
-(defn- day-customers [day] [day (->> day (get @days) (map (partial get @orders)))])
+(defn- day-customers [day] [day (->> @orders vals (filter (comp #{day} :day)))])
 (defn- days-between [from to]
   (time/days-range
    (int (/ (- (time/parse-date to) (time/parse-date from)) (* 24 3600000)))
@@ -70,17 +73,26 @@
        (map day-customers)
        (into {})))
 
-(defn- replace-order [order]
+(defn- replace-order [{start-from :start-from :as order}]
   (println "replacing order" order)
-  (let [order (update order :id #(or % (swap! id-counter inc)))]
-    (swap! days (fn [ds] (update ds (:day order) #(distinct (conj % (:id order))))))
-    (swap! orders #(assoc % (:id order) order))
-    {(->> order :day) (->> order :day day-customers second)}))
+  (let [order (-> order
+                  (dissoc :start-from)
+                  (update :id #(or % (swap! id-counter inc))))]
+    (prn "order 1" order)
+    (swap! orders assoc (:id order) order)
+    (prn "order 2" (@orders (:id order)))
+    (if start-from
+      (->> start-from
+           time/start-of-week
+           (time/days-range 28)
+           (map time/iso-date)
+           (map day-customers)
+           (into {}))
+      {(:day order) (->> order :day day-customers second)})))
 
 (defn- delete-order [{id :id}]
   (println "deleting order" id)
   (let [day (-> (get @orders id) :day)]
-    (swap! days (fn [ds] (update ds day (partial remove #{id}))))
     (swap! orders #(dissoc % id))
     {day (->> day day-customers second)}))
 

src/cljs/chicken_master/calendar.cljs

@@ -28,7 +28,9 @@
    (fn [form] (re-frame/dispatch [::event/save-order (format-raw-order form)]))))
 
 (defn format-order [{:keys [id who day hour notes products state]}]
-  [:div {:class [:order state] :key (gensym)}
+  [:div {:class [:order state] :key (gensym)
+         :draggable true
+         :on-drag-start #(-> % .-dataTransfer (.setData "text" id))}
    [:div {:class :actions}
     (condp = state
       :waiting   [:button {:on-click #(re-frame/dispatch [::event/fulfill-order id])} "✓"]
@@ -50,7 +52,11 @@
         (into [:div {:class :products}]))])
 
 (defn day [{:keys [date orders]}]
-  [:div {:class [:day (when (time/today? date) :today)]}
+  [:div {:class [:day (when (time/today? date) :today)]
+         :on-drag-over #(.preventDefault %)
+         :on-drop #(let [id (-> % .-dataTransfer (.getData "text") prod/num-or-nil)]
+                     (.preventDefault %)
+                     (re-frame/dispatch [::event/move-order id (time/iso-date date)]))}
    [:div {:class :day-header} (time/format-date date)]
    [:div
     [:div {:class :orders}

src/cljs/chicken_master/events.cljs

@@ -35,6 +35,15 @@
            :on-success  [::process-fetched-days]
            :on-fail     [::failed-blah]}}))
 
+(re-frame/reg-event-fx
+ ::move-order
+ (fn [{{orders :orders start-date :start-date} :db} [_ id day]]
+   {:http {:method :post
+           :url    "save-order"
+           :params (-> id orders (assoc :day day :start-from start-date))
+           :on-success  [::process-fetched-days]
+           :on-fail     [::failed-blah]}}))
+
  (re-frame/reg-event-db
   ::edit-order
   (fn [{orders :orders :as db} [_ day id]]