X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/a4232a83263192fdd2ca2f33f1947fe6747d3bc3..db4fe3430ee9cc4190222e915e32d809928f64cb:/src/slot-presentations.lisp

diff --git a/src/slot-presentations.lisp b/src/slot-presentations.lisp
index 7827c37..d7e874d 100644
--- a/src/slot-presentations.lisp
+++ b/src/slot-presentations.lisp
@@ -16,10 +16,24 @@
 (defslot-presentation text-slot-presentation ()
   ((rows :initarg :rows :accessor rows :initform 5)
    (columns :initarg :columns :accessor columns :initform 40)
-   (escape-html-p :initarg :escape-html-p :accessor escape-html-p :initform nil))
+   (escape-html-p :initarg :escape-html-p :accessor escape-html-p :initform nil)
+   (convert-newlines-p :initarg :convert-newlines-p :accessor convert-newlines-p :initform nil))
   (:type-name text))
 
 (defmethod present-slot ((slot text-slot-presentation) instance)
+  (flet ((maybe-convert-newline-and-escape-html-then-print ()
+	   (let ((string (if (convert-newlines-p slot)
+			     (with-output-to-string (new-string)
+			       (with-input-from-string
+				   (s (presentation-slot-value slot instance))
+				 (loop for line = (read-line s nil)
+				       while line
+				       do (format new-string "~A~A" line "<br/>"))))
+			     (presentation-slot-value slot instance))))
+	     (if (escape-html-p slot)
+		 (<:as-html string)
+		 (<:as-is string)))))
+    
     (if (editablep slot)
 	(<ucw:textarea
 	 :accessor (presentation-slot-value slot instance)
@@ -27,9 +41,7 @@
 		 "")
 	 :rows (rows slot)
 	 :cols (columns slot))
-	(if (escape-html-p slot)
-	    (<:as-html (presentation-slot-value slot instance))
-	    (<:as-is (presentation-slot-value slot instance)))))
+	(maybe-convert-newline-and-escape-html-then-print))))
 
 
 (defcomponent mewa-slot-presentation ()
@@ -43,7 +55,8 @@
 		     :documentation 
 		     "When nil, the instance is syncronised with the database. 
 When T, only the default value for primary keys and the joins are updated.")
-   (show-label-p :accessor show-label-p :initarg :show-label-p :initform t))
+   (show-label-p :accessor show-label-p :initarg :show-label-p :initform t)
+   (creatablep :accessor creatablep :initarg :creatablep :initform t))
   (:documentation "The superclass of all Mewa slot presentations"))
 
 ;;;; this has to be in the eval when i would think
@@ -71,7 +84,8 @@ When T, only the default value for primary keys and the joins are updated.")
 
 (defslot-presentation clsql-wall-time-slot-presentation (mewa-relation-slot-presentation)
        ((input-id :accessor input-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+))
-	(trigger-id :accessor trigger-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+)))
+	(trigger-id :accessor trigger-id :initform (arnesi:random-string 10 arnesi:+ascii-alphabet+))
+	(default-to-now-p :accessor default-to-now-p :initarg :default-to-now-p :initform nil))
        (:type-name clsql-sys:wall-time))
 
 (defmethod presentation-slot-value ((slot clsql-wall-time-slot-presentation) instance)
@@ -86,15 +100,20 @@ When T, only the default value for primary keys and the joins are updated.")
     (unless (or (eql old-time 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 ))))
+    (setf (presentation-slot-value slot instance) new-time))))
 
 (defmethod label :around ((slot clsql-wall-time-slot-presentation))
   (concatenate 'string (call-next-method) "  (m/d/y)"))
 
 (defmethod present-slot ((slot clsql-wall-time-slot-presentation) instance)
   (let ((date (presentation-slot-value slot instance)))
+    ;; Default values
+    (when (and (not date) (default-to-now-p slot))
+      (setf (presentation-slot-value slot instance) (clsql:get-time)))
+    ;;simple viewer
     (if (and date (not (editablep slot)))
 	(<:as-html date))
+    ;; editor
     (when (editablep slot)
       (<ucw:input :accessor (presentation-slot-value slot instance) :id (input-id slot) :style "display:inline")
       (<:button :id (trigger-id slot) (<:as-html "[...]"))
@@ -250,7 +269,7 @@ Calendar.setup({
 					  :linkedp t
 					  :editablep nil)))
 		(<:as-html string))))
-	(<:table
+	(<:table :cellpadding 10
 	 (<:tr
 	  (<:th)			;empty col for (view) link
 	  (dolist (s (slots presentation))
@@ -347,7 +366,8 @@ Calendar.setup({
 			   :initargs
 			   `(:attributes ,(attributes slot)))
 			))))
-	     (<ucw:submit :action  (create-record-on-foreign-key slot instance) :value "Add New" :style "display:inline")) 
+	     (when (creatablep slot)
+	       (<ucw:submit :action  (create-record-on-foreign-key slot instance) :value "Add New" :style "display:inline"))) 
       (if (presentation-slot-value slot instance)
 	  (progn
 	   (lol:present
@@ -398,8 +418,8 @@ Calendar.setup({
   (let ((instances (slot-value instance (slot-name slot)))
 	new-instance)
     (<:ul
-     (<:li (<ucw:a :action (add-to-many-to-many slot instance)
-		   (<:as-html "Add New")))
+     (<:li (<ucw:button :action (add-to-many-to-many slot instance)
+			 (<:as-html "Add New")))
      (<:li  (<ucw:button :action (add-to-many-to-many slot instance new-instance)
 			 (<:as-html "Add:"))
 	    (<ucw:select :accessor new-instance
@@ -415,6 +435,7 @@ Calendar.setup({
 		(<:as-html "(remove) "))
 	(present-view ((car i) (list-view slot) (ucw::parent slot)))) ))))
 
+
 (defaction add-to-many-to-many ((slot many-to-many-slot-presentation) instance &optional foreign-instance)
   ;;;; First things first, we sync.
   (sync-instance instance)
@@ -440,11 +461,3 @@ Calendar.setup({
       
       (sync-instance instance)
       c)))
-	 
-
-	
-
-
-
-
-