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

Merge branch 'feature/timer' of into devo

parents 57d1a3b5 b70045eb
((("19" "29") ("Agile KOM 2")) (("19" "39") ("Agile KOM")))
\ No newline at end of file
((("20" "00") ("Test description")) (("20" "00") ("Description of task")) (("20" "00") ("Description of task")) (("20" "00") ("Description of task")) (("20" "00") ("Description of task")) (("20" "00") ("Description of task")) (("20" "00") ("Description of task")) (("0" "3") ("Description of task")) (("0" "3") ("Description of task")) (("0" "3") ("Description of task")))
\ No newline at end of file
((("20" "00") ("Test")) (("20" "00") ("Test")) (("20" "00") ("Test")))
\ No newline at end of file
((("19" "44") ("timer dev")))
\ No newline at end of file
......@@ -15,24 +15,26 @@
(main-sheet-body (with-cl-who-string ()
(:div :id "content"
(:script :src "")
(:script :src "/timer-static/scripts.js")
(str (the timer-header main-div))
(str (the timer-form-min form-control))
(str (the timer-form-sec form-control))
(str (the timer-button main-div))
(str (the journal-form-name form-control))
(str (the journal-form-descr form-control))
(str (the journal-button main-div))
(str (the timer-section main-div))
(str (the journal-section main-div))
(str (the journal-entries-display main-div)))))
(with-cl-who-string ()
(:link :href "/timer-static/style/styles.css"
:rel "stylesheet"
:type "text/css"))))
:type "text/css")))
(report-to-mother (format nil "
function reportToMother (seconds, minutes)
(the (gdl-ajax-call :function-key :report-from-timer
:arguments (list "seconds" "minutes"))))))
; Header that says "TIMER"
......@@ -40,6 +42,27 @@
:inner-html (with-cl-who-string ()
(:h1 :id "header" "timer")))
(timer-section :type 'sheet-section
:inner-html (with-cl-who-string ()
(str (the timer-form-min form-control-string))
(str (the timer-form-sec form-control-string))
(str (the start-button form-control-string))
(str (the pause-button form-control-string))))
(journal-section :type 'sheet-section
:inner-html (with-cl-who-string ()
(str (the journal-form-name form-control-string))
(str (the journal-form-descr form-control-string))
(str (the journal-button form-control-string))))
; Form for the timer.
(timer-form-min :type 'text-form-control
:default "20"
......@@ -48,39 +71,44 @@
:default "00"
:size 2)
; Form for the name and description (journal)
(start-button :type 'button-form-control
:onclick (format nil "timerStart('~a','~a')"
(symbol-name (the timer-form-min id))
(symbol-name (the timer-form-sec id)))
:label "Start")
(pause-button :type 'button-form-control
:onclick (format nil "timerPause()")
:label "Pause")
;; Form for the name and description (journal)
;; FLAG -- make these into lookup items (menu-form-control or combo box).
(journal-form-name :type 'text-form-control
:id "journal-name"
:default "Name")
(journal-form-descr :type 'text-form-control
:id "journal-descr"
:default "Description of task")
; Button that says "START"
(timer-button :type 'sheet-section
:inner-html (with-cl-who-string ()
((:button :onclick
(concatenate 'string
(symbol-name (the timer-form-min id))
(symbol-name (the timer-form-sec id))
(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-button :type 'button-form-control
:id "journal-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))
:label "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: ~{<p>~a</p>~}"
(fmt "Previous entries: ~{<div class='journal-entry'>~{<div class='journal-time'>~{~a min ~a secs~}</div>~%<div class='journal-descr'>~{~a ~}</div>~%~}</div>~}"
(the read-journal-entry))))))
......@@ -5,6 +5,9 @@ var timerStarted = false;
var start_min, start_sec;
var min_id, sec_id;
function timerPause() {clearInterval(interval); timerStarted = false;}
function timerStart(minid, secid) {
if (timerStarted) {
......@@ -34,6 +37,8 @@ function countDown() {
reportToMother(seconds, minutes);
if (minutes==0 && seconds==0) {
timerStarted = false;
......@@ -49,4 +54,25 @@ function countDown() {
document.getElementById(min_id).value = minutes;
document.getElementById(sec_id).value = seconds;
\ No newline at end of file
// Code for allowing journal entries to be repeated easily.
// Journal entry changes color on hover,
// contents get placed into the form on click.
$(document).on("mouseenter", ".journal-entry", function(){
$(this).css('color', 'blue');
$(this).css('cursor', 'pointer');
$(document).on("mouseleave", ".journal-entry", function(){
$(this).css('color', '#000');
$(document).on("click", ".journal-entry", function(){
\ No newline at end of file
body {
padding: 0;
margin: 0;
margin-left: 10%;
margin-right: 10%;
font-family: "Arial";
#content {
text-align: center;
width: 400px;
margin-left: auto;
margin-right: auto;
input {
......@@ -25,4 +29,21 @@ button {
button:hover {
background-color: #ccc;
.journal-entry {
padding: 10px;
border-radius: 15px;
border: 2px solid #eee;
background-color: #eee;
margin: 5px;
.journal-time {
font-weight: bold;
margin-left: auto;
margin-right: auto;
.journal-descr {
margin-left: auto;
margin-right: auto;
\ No newline at end of file
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