Commit d6186097 authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'feature/timer' into devo

parents c2dbd8d9 9486f4d3
((("0" "5") ("Description of task")))
\ No newline at end of file
(("0" "1") ("Description of task"))
\ No newline at end of file
(in-package :timer-journaler)
;; meaningless change to test git.
(defparameter *source-path* (make-pathname :directory (pathname-directory (glisp:source-pathname))
:name nil :type nil))
......@@ -18,25 +16,16 @@
(main-sheet-body (with-cl-who-string ()
(:div :id "content"
(:script :src "/timer-static/scripts.js")
(:script :type "text/javascript"
"function timerStop() {"
(str (the (gdl-ajax-call
:form-controls (list
(the timer-form-min)
(the timer-form-sec)
(the journal-form-name)
(the journal-form-descr))
:function-key :record-journal-entry)))
"}")
(str (the timer-header main-div))
(str (the timer-form-min form-control))
(str (the timer-form-sec form-control))
(:br)
(str (the timer-button main-div))
(:hr)
(str (the journal-form-name form-control))
(:br)
(str (the journal-form-descr form-control))
(str (the timer-button main-div))
(str (the journal-button main-div))
(:br)
(str (the journal-entries-display main-div)))))
(additional-header-content
......@@ -68,20 +57,31 @@
; Button that says "START"
(timer-button :type 'sheet-section
:inner-html (with-cl-who-string ()
(:button :onclick
((:button :onclick
(concatenate 'string
"timerStart('"
(symbol-name (the timer-form-min id))
"','"
(symbol-name (the timer-form-sec id))
"')")
"')"))
"Start")))
(journal-button :type 'sheet-section
:inner-html (with-cl-who-string ()
((:button :onclick (the (gdl-ajax-call
:form-controls (list (the timer-form-min)
(the timer-form-sec)
(the journal-form-name)
(the journal-form-descr))
:function-key :record-journal-entry)))
"Record entry")))
; Displays journal entries
(journal-entries-display :type 'sheet-section
:inner-html (progn (the force-update-flag)
(with-cl-who-string ()
(fmt "Previous entries: ~{~a<br>~}"
(fmt "Previous entries: ~{<p>~a</p>~}"
(the read-journal-entry))))))
:functions
((read-journal-entry ()
......@@ -91,7 +91,8 @@
(concatenate 'string
(namestring (merge-pathnames "../db/" *source-path*))
(the journal-form-name value))
:direction :input)
:direction :input
:if-does-not-exist :create)
(read stream nil nil))))
file-contents))
......
......@@ -41,7 +41,7 @@ function countDown() {
document.getElementById(min_id).value = start_min;
document.getElementById(sec_id).value = start_sec;
timerStop();
alert('Please record your journal entry for this time.');
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment