X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/7d87c1d23f23c4aa5632712191ee989240afe80a..12dcf3d4b06fd83b8c62c01a93dc26f94dc922ee:/src/mewa/slot-presentations.lisp

diff --git a/src/mewa/slot-presentations.lisp b/src/mewa/slot-presentations.lisp
index 131d01c..e0ddb79 100644
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -1,5 +1,34 @@
 (in-package :it.bese.ucw)
 
+(defun multiple-value-funcall->list (function &rest args)
+		   (multiple-value-call #'list (apply function args)))
+
+(defmacro multiple-value-bindf (vars form &body body)
+		   `(destructuring-bind ,vars 
+		     (multiple-value-funcall->list #',(car form) ,@(cdr form))
+		     ,@body))
+
+(defslot-presentation mewa-boolean-slot-presentation (boolean-slot-presentation)
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-boolean))
+
+(defslot-presentation mewa-string-slot-presentation (string-slot-presentation   )
+
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-string))
+
+(defslot-presentation mewa-number-slot-presentation (number-slot-presentation)
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-number))
+
+(defslot-presentation mewa-integer-slot-presentation (integer-slot-presentation)
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-integer))
+
+(defslot-presentation mewa-currency-slot-presentation (currency-slot-presentation)
+
+  ((slot-name :accessor slot-name :initarg :slot-name))
+  (:type-name mewa-currency))
 
 (defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
        ()
@@ -15,9 +44,9 @@
 	(old-time (when (slot-boundp instance (slot-name slot))
 		    (slot-value instance (slot-name slot)))))
     (unless (or (eql old-time new-time)
-		(and (null old-time) new-time)
-		 (equal :equal (clsql:time-compare new-time old-time)))
-      (setf (presentation-slot-value slot instance) new-time ))))
+		(when (and new-time old-time)
+		  (equal :equal (clsql:time-compare new-time old-time))))
+    (setf (presentation-slot-value slot instance) new-time ))))
 
 (defmethod label :around ((slot clsql-wall-time-slot-presentation))
   (concatenate 'string (call-next-method) "  (mm/dd/yyyy)"))
@@ -55,7 +84,8 @@
 	 (new-instance
     (call-component 
      (parent slot) 
-     (make-instance 'mewa::mewa-presentation-search
+     (make-instance (or (cadr (mewa:find-attribute finstance :presentation-search))
+                        'mewa::mewa-presentation-search)
 		    :search-presentation
 		    (mewa:make-presentation finstance 
 					    :type :search-presentation)
@@ -63,8 +93,7 @@
 		    (mewa:make-presentation finstance 
 					    :type :listing)))))
     (setf (slot-value instance (slot-name slot)) (slot-value new-instance foreign-slot-name))
-    (meta-model:sync-instance instance)
-    (clsql:update-objects-joins (list instance))))
+    (meta-model:sync-instance instance)))
     
 (defmethod present-relation ((slot mewa-relation-slot-presentation) instance)
  ;;;;(<:as-html (slot-name slot) "=> " (foreign-instance slot) " from " instance )
@@ -75,18 +104,9 @@
 		:initargs (list 
 			   :global-properties 
 			   (list :editablep nil :linkedp nil)))))
-      (when (ucw::parent slot) (setf (component.place pres) (component.place (ucw::parent slot))))
-      (flet ((render () (when i (<ucw:render-component :component pres))))
-      (cond 
-	((editablep slot)
-	 (render)
-	 (<ucw:a :action (search-records slot instance) (<:as-html " (search)"))
-	 (<ucw:a :action (create-record slot i) (<:as-html " (new)")))
-	((linkedp slot)
-	 (<ucw:a :action (view-instance slot i) 
-		 (render)))
-	(t       
-	 (render))))))
+      (when (and (ucw::parent slot) (slot-boundp slot 'ucw::place))
+	(setf (component.place pres) (component.place (ucw::parent slot))))
+      (when i (<ucw:render-component :component pres))))
 
 
 
@@ -99,31 +119,59 @@
   (:default-initargs))
 
 (defaction view-instance ((self component) instance &rest initargs)
-  (call-component (parent self) (apply #'mewa:make-presentation instance initargs)))
-
-(defmethod  present-slot :before ((slot foreign-key-slot-presentation) instance)
-  (setf (foreign-instance slot) (meta-model:explode-foreign-key instance (slot-name slot))))
+  (call-component (parent self) (apply #'mewa:make-presentation instance initargs))
+  ;; the viewed instance could have been changed/deleted, so we sync this instance
+  (meta-model:sync-instance (instance (parent self))))
+
+
+(defmethod  present-slot :around ((slot foreign-key-slot-presentation) instance)
+  (setf (foreign-instance slot) (when (presentation-slot-value slot instance) (meta-model:explode-foreign-key instance (slot-name slot))))
+  (flet ((render () (call-next-method)))
+    (cond 
+      ((editablep slot)
+       (render)
+       (<ucw:submit :action  (search-records slot instance) :value "Search" :style "display:inline")
+       (<ucw:submit :action  (create-record slot instance) :value "Add New" :style "display:inline"))
+      ((linkedp slot)
+       (<ucw:a :action (view-instance slot (foreign-instance slot)) 
+	       (render)))
+      (t       
+       (render)))))
 
 ;;;; HAS MANY 
 (defslot-presentation has-many-slot-presentation (mewa-relation-slot-presentation)
-  ()
+  ((add-new-label :accessor add-new-label :initarg :add-new-label :initform "Add New"))
   (:type-name has-many))
 
+
+(defaction add-to-has-many ((slot has-many-slot-presentation) instance)
+  (destructuring-bind (class home foreign) 
+      (multiple-value-funcall #'meta-model:explode-has-many instance (slot-name slot))
+    (let ((new (make-instance class)))
+      (setf (slot-value new foreign) (slot-value instance home))
+      (meta-model:sync-instance new :fill-gaps-only t)
+      (call-component (parent slot) (mewa:make-presentation new :type :editor))
+      (meta-model:sync-instance (instance (parent slot))))))
+
 (defmethod present-slot ((slot has-many-slot-presentation) instance)
+  (<ucw:submit :action (add-to-has-many slot instance) :value (add-new-label slot))
   (let ((i (get-foreign-instances slot instance))
 	(linkedp (linkedp slot)))
-  (<:ul 
-   (dolist (s i)
-     (let ((s s))
-     (setf (foreign-instance slot) s)
-     (<ucw:a :action (view-instance slot s :initargs `(:global-properties ,(list :linkedp t :editablep nil)))
-     (<:li   (setf (linkedp slot) nil)
-	     (present-relation slot instance))))))))
+    (<:ul 
+     (dolist (s i)
+       (let ((s s))
+	 (setf (foreign-instance slot) s)
+	 (<ucw:a :action (view-instance slot s :initargs `(:global-properties ,(list :linkedp t :editablep nil)))
+		 (<:li   (setf (linkedp slot) nil)
+			 (present-relation slot instance))))))))
 
 
 (defmethod get-foreign-instances ((slot has-many-slot-presentation) instance)
   (slot-value instance (slot-name slot)))
 
+(defmethod presentation-slot-value ((slot has-many-slot-presentation) instance)
+  (get-foreign-instances slot instance))
+
 (defslot-presentation has-very-many-slot-presentation (has-many-slot-presentation)
   ((number-to-display :accessor number-to-display :initarg :number-to-display :initform 10)
    (current :accessor current :initform 0)