lots of work on slot presentations

[clinton/lisp-on-lines.git] / src / mewa / slot-presentations.lisp

diff --git a/src/mewa/slot-presentations.lisp b/src/mewa/slot-presentations.lisp
index 6e46f0d..edc42fd 100644 (file)
--- a/src/mewa/slot-presentations.lisp
+++ b/src/mewa/slot-presentations.lisp
@@ -8,6 +8,28 @@
                     (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)
        ()
        (:type-name clsql-sys:wall-time))
@@ -22,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)"))
@@ -62,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)
@@ -70,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 )
@@ -82,10 +104,9 @@
                :initargs (list 
                           :global-properties 
                           (list :editablep nil :linkedp nil)))))
-      (when (ucw::parent slot) 
+      (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))))
-      ))
 
 
 
@@ -121,22 +142,14 @@
   (:type-name has-many))
 
 
-(defun get-join-class-info (slot instance)
-  "hack around m-v-b"
-  (multiple-value-bind (s h f) (meta-model:explode-has-many instance (slot-name slot))
-    (list s h f)))
-((jci (get-join-class-info slot instance))
-        (class (first jci))
-        (home (second jci))
-        (foreign (third jci)))
-
 (defaction add-to-has-many ((slot has-many-slot-presentation) instance)
   (destructuring-bind (class home foreign) 
-      (maxwell-web-gui::multiple-value-funcall #'meta-model:explode-has-many instance (slot-name slot))
+      (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)
-      (call-component (parent slot) (mewa:make-presentation new :type :editor)))))
+      (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:a :action (add-to-has-many slot instance) 
@@ -155,6 +168,9 @@
 (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)