fixed autocomplete to be more specific

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

diff --git a/src/slot-presentations.lisp b/src/slot-presentations.lisp
index 4dcbecc..c92fa4b 100644 (file)
--- a/src/slot-presentations.lisp
+++ b/src/slot-presentations.lisp
@@ -1,5 +1,8 @@
+(declaim (optimize (speed 0) (space 3) (safety 0)))
 (in-package :lisp-on-lines)
 
+
+;;;; I dont think i'm using these anymore.
 (defun multiple-value-funcall->list (function &rest args)
   "The function to be called by m-v-bf"
                   (multiple-value-call #'list (apply function args)))
@@ -16,10 +19,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,13 +44,13 @@
                 "")
         :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)))))
+       (when (presentation-slot-value slot instance)
+         (maybe-convert-newline-and-escape-html-then-print)))))
 
 
 (defcomponent mewa-slot-presentation ()
-  ((slot-name :accessor slot-name 
+  ((validate-functions :accessor validate-functions :initform (list (constantly t)))
+   (slot-name :accessor slot-name 
              :initarg :slot-name 
              :documentation 
              "The name of the slot being accessed")
@@ -47,6 +64,8 @@ When T, only the default value for primary keys and the joins are updated.")
    (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
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun generate-slot-presentation-definition-for-type (type)
@@ -72,7 +91,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)
@@ -87,15 +107,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 "[...]"))
@@ -358,7 +383,7 @@ Calendar.setup({
                           :initargs
                           `(:attributes ,(attributes slot)))
                           ))
-         (<:as-html "--"))))
+          (<:as-html "--"))))
 
 (defslot-presentation many-to-many-slot-presentation (mewa-relation-slot-presentation)
   ((list-view :accessor list-view :initarg :list-view :initform :one-line)