new file mode 100644

@@ -0,0 +1,30 @@

+(in-package #:timesheet)

+

+(defclass status-calculator ()

+  ((rate :initarg :rate :accessor rate)

+   (total-hours :initform 0 :initarg :total-hour :accessor total-hours)

+   (client-totals :initarg :client-totals :accessor client-totals)))

+

+(defclass status-line ()

+  ((client :initarg :client :accessor client)

+   (duration :initarg :duration :accessor duration :initform 0)))

+

+(defclass parsed-entry ()

+  ((date :initarg :date :accessor date)

+   (client :initarg :client :accessor client)

+   (memo :initarg :memo :accessor memo)))

+

+(defclass complete-entry (parsed-entry)

+  ((duration :initarg :duration :accessor duration)))

+

+(defclass partial-entry (parsed-entry)

+  ((start-times :initarg :start-times :initform nil :accessor start-times)))

+

+(define-condition incomplete-entry-warning (warning) ())

+

+(define-condition parsing-error ()

+  ((leftovers :initarg :leftovers :accessor leftovers))

+  (:report (lambda (condition stream)

+               (format stream "Parse error: ~20s leftover" (leftovers condition)))))

+

+

@@ -28,6 +28,7 @@

                (:file "macros")

                (:file "parser")

                (:file "mvc")

+               (:file "main-classes")  

                (:file "timesheet")))

@@ -9,27 +9,6 @@

 (defvar *default-time-sheet-file*)

 (defvar *rate*)

-(defclass status-calculator ()

-  ((rate :initarg :rate :accessor rate)

-   (total-hours :initform 0 :initarg :total-hour :accessor total-hours)

-   (client-totals :initarg :client-totals :accessor client-totals)))

-

-(defclass status-line ()

-  ((client :initarg :client :accessor client)

-   (duration :initarg :duration :accessor duration :initform 0)))

-

-(defclass parsed-entry ()

-  ((date :initarg :date :accessor date)

-   (client :initarg :client :accessor client)

-   (memo :initarg :memo :accessor memo)))

-

-(defclass complete-entry (parsed-entry)

-  ((duration :initarg :duration :accessor duration)))

-

-(defclass partial-entry (parsed-entry)

-  ((start-times :initarg :start-times :initform nil :accessor start-times)))

-

-(defcondition incomplete-entry-warning (warning) ())

 (defmethod duration ((obj partial-entry))

   (warn "incomplete entry detected for ~a" (client obj))

   (local-time-duration:duration))

@@ -48,11 +27,6 @@

                  :memo memo

                  :start-times start-times))

-(define-condition parsing-error ()

-  ((leftovers :initarg :leftovers :accessor leftovers))

-  (:report (lambda (condition stream)

-               (format stream "Parse error: ~20s leftover" (leftovers condition)))))

-

 (defun parse-file (&optional (file *default-time-sheet-file*))

   (with-open-file (s file :direction :input)

     (let ((dest (make-string (file-length s))))