taskjuggler 0.0.11 → 0.1.0

data/spec/Tj3_spec.rb

@@ -12,7 +12,7 @@
 #
 
 require 'rubygems'
-require 'support/StdIoWrapper'
+require 'taskjuggler/StdIoWrapper'
 require 'taskjuggler/apps/Tj3'
 
 class TaskJuggler

data/spec/support/DaemonControl.rb

@@ -11,7 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-require 'support/StdIoWrapper'
+require 'taskjuggler/StdIoWrapper'
 require 'taskjuggler/apps/Tj3Daemon'
 require 'taskjuggler/apps/Tj3Client'
 

data/tasks/changelog.rake

@@ -19,6 +19,7 @@ task :CHANGELOG do
   # Get list of release tags from Git repository
   releases = `git tag`.split("\n").map { |r| r.chomp }.
     sort{ |a, b| compareTags(a, b) }
+  releases << 'HEAD'
 
   # Now we get the commit entries for each release
   sections = []
@@ -36,9 +37,8 @@ task :CHANGELOG do
     # Get the date of the release
     date = Time.parse(/Date: (.*)/.match(`git show #{release}`)[1]).utc
     date = date.strftime("%Y-%m-%d")
-    # We use RDOC markup syntax to generate a title
-    text += "= Release #{version} (#{date})\n\n"
 
+    logText = ''
     # Use -z option for git-log to get 0 bytes as separators.
     `git log -z #{interval}`.split("\0").each do |commit|
       # We ignore merges.
@@ -54,7 +54,17 @@ task :CHANGELOG do
       message.gsub!(/Signed-off-by: .*\n/, '')
       message.strip!
 
-      text += "  * #{message}\n"
+      logText += "  * #{message}\n"
+    end
+
+    # Skip the release if there are no changes. E. g. HEAD at release.
+    next if logText.empty?
+
+    # We use RDOC markup syntax to generate a title
+    if version
+      text += "= Release #{version} (#{date})\n\n"
+    else
+      text += "= Next Release (Some Day)\n\n"
     end
     sections << text
   end

data/tasks/manual.rake

@@ -1,6 +1,6 @@
 # TASK MANUAL
 
-require 'taskjuggler/Tj3Man'
+require 'taskjuggler/apps/Tj3Man'
 
 desc 'Generate User Manual'
 task :manual do

data/test/TestSuite/CSV-Reports/refs/celltext.csv

@@ -1,4 +1,4 @@
-"WBS";"Name"
+"BSI";"Name"
 1;"Plan Work (plan)"
 1.1;"  Plan A (plan.plan_a)"
 1.2;"  Plan B (plan.plan_b)"

data/test/TestSuite/CSV-Reports/refs/resourcereport.csv

@@ -1,4 +1,4 @@
-"WBS";"Name";"Effort";"2007-12-10-00:00:00";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00"
+"BSI";"Name";"Effort";"2007-12-10-00:00:00";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00"
 3;"Jack";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
 1;"Jill";42.5;"";5.0;2.5;5.0;5.0;5.0;5.0;5.0;5.0;5.0;""
 2;"Joe";14.0;"";5.0;5.0;"";2.0;"";"";"";2.0;"";""

data/test/TestSuite/CSV-Reports/refs/resourcereport_with_tasks.csv

@@ -1,4 +1,4 @@
-"WBS";"Name";"Effort";"2007-12-10-00:00:00";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00"
+"BSI";"Name";"Effort";"2007-12-10-00:00:00";"2007-12-17-00:00:00";"2007-12-24-00:00:00";"2007-12-31-00:00:00";"2008-01-07-00:00:00";"2008-01-14-00:00:00";"2008-01-21-00:00:00";"2008-01-28-00:00:00";"2008-02-04-00:00:00";"2008-02-11-00:00:00";"2008-02-18-00:00:00"
 3;"Jack";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
 2;"  Execute Work";17.0;"";"";"";"";3.0;5.0;4.0;"";5.0;"";""
 2.2;"    Step 2";5.0;"";"";"";"";"";"";"";"";5.0;"";""

data/test/TestSuite/CSV-Reports/refs/sortByTree.csv

@@ -1,4 +1,4 @@
-"WBS";"Name";"Id";"Duration"
+"BSI";"Name";"Id";"Duration"
 1;"Plan Work";"plan";19.8
 1.1;"  Plan A";"plan.plan_a";11.4
 1.2;"  Plan B";"plan.plan_b";9.2

data/test/TestSuite/CSV-Reports/refs/sortBy_effort.up.csv

@@ -1,4 +1,4 @@
-"Effort";"WBS";"Id"
+"Effort";"BSI";"Id"
 0.0;2.3;"execute.ms1"
 2.0;"2.2.1";"execute.ex2.ex2_1"
 2.0;2.5;"execute.ex4"

data/test/TestSuite/CSV-Reports/refs/sortBy_plan.start.down.csv

@@ -1,4 +1,4 @@
-"Start";"WBS";"Id"
+"Start";"BSI";"Id"
 "2008-02-11-10:00:00-+0100";3;"check"
 "2008-02-08-19:00:00-+0100";2.3;"execute.ms1"
 "2008-02-04-10:00:00-+0100";"2.2.2";"execute.ex2.ex2_2"

data/test/TestSuite/CSV-Reports/refs/taskreport.csv

@@ -1,4 +1,4 @@
-"WBS";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0100";"2007-12-17-00:00:00-+0100";"2007-12-24-00:00:00-+0100";"2007-12-31-00:00:00-+0100";"2008-01-07-00:00:00-+0100";"2008-01-14-00:00:00-+0100";"2008-01-21-00:00:00-+0100";"2008-01-28-00:00:00-+0100";"2008-02-04-00:00:00-+0100";"2008-02-11-00:00:00-+0100";"2008-02-18-00:00:00-+0100"
+"BSI";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0100";"2007-12-17-00:00:00-+0100";"2007-12-24-00:00:00-+0100";"2007-12-31-00:00:00-+0100";"2008-01-07-00:00:00-+0100";"2008-01-14-00:00:00-+0100";"2008-01-21-00:00:00-+0100";"2008-01-28-00:00:00-+0100";"2008-02-04-00:00:00-+0100";"2008-02-11-00:00:00-+0100";"2008-02-18-00:00:00-+0100"
 1;"Plan Work";"2007-12-16-01:00:00-+0100";"2008-01-04-19:00:00-+0100";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
 1.1;"  Plan A";"2007-12-17-10:00:00-+0100";"2007-12-28-19:00:00-+0100";11.4;10.0;"";5.0;5.0;"";"";"";"";"";"";"";""
 1.2;"  Plan B";"2007-12-17-10:00:00-+0100";"2007-12-26-15:00:00-+0100";9.2;7.5;"";5.0;2.5;"";"";"";"";"";"";"";""

data/test/TestSuite/CSV-Reports/refs/taskreport_with_resources.csv

@@ -1,4 +1,4 @@
-"WBS";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0000";"2007-12-17-00:00:00-+0000";"2007-12-24-00:00:00-+0000";"2007-12-31-00:00:00-+0000";"2008-01-07-00:00:00-+0000";"2008-01-14-00:00:00-+0000";"2008-01-21-00:00:00-+0000";"2008-01-28-00:00:00-+0000";"2008-02-04-00:00:00-+0000";"2008-02-11-00:00:00-+0000";"2008-02-18-00:00:00-+0000"
+"BSI";"Name";"Start";"End";"Duration";"Effort";"2007-12-10-00:00:00-+0000";"2007-12-17-00:00:00-+0000";"2007-12-24-00:00:00-+0000";"2007-12-31-00:00:00-+0000";"2008-01-07-00:00:00-+0000";"2008-01-14-00:00:00-+0000";"2008-01-21-00:00:00-+0000";"2008-01-28-00:00:00-+0000";"2008-02-04-00:00:00-+0000";"2008-02-11-00:00:00-+0000";"2008-02-18-00:00:00-+0000"
 1;"Plan Work";"2007-12-16-00:00:00-+0000";"2008-01-04-18:00:00-+0000";19.8;22.5;"";10.0;7.5;5.0;"";"";"";"";"";"";""
 1;"  Jill";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""
 2;"  Joe";"";"";"";0.0;"";"";"";"";"";"";"";"";"";"";""

data/test/TestSuite/CSV-Reports/sortByTree.tjp

@@ -1,4 +1,6 @@
-project test "Test" "1.0" 2007-12-16 +3m
+project test "Test" "1.0" 2007-12-16 +3m {
+  workinghours mon - fri 9:00 - 12:00, 13:00 - 18:00
+}
 include "project-1.tji"
 
 taskreport cvs "." {

data/test/TestSuite/CSV-Reports/sortBy_duration.down.tjp

@@ -1,4 +1,7 @@
-project test "Test" "1.0" 2007-12-16 +3m
+project test "Test" "1.0" 2007-12-16 +3m {
+  workinghours mon - fri 9:00 - 12:00, 13:00 - 18:00
+}
+
 include "project-1.tji"
 
 taskreport csv "." {

data/test/TestSuite/CSV-Reports/sortBy_effort.up.tjp

@@ -4,7 +4,7 @@ include "project-1.tji"
 taskreport csv "." {
   formats csv
   timezone "Europe/Amsterdam"
-  columns effort, wbs, id
+  columns effort, bsi, id
   timeformat "%Y-%m-%d-%H:%M:%S"
   sorttasks plan.effort.up, id.up
 }

data/test/TestSuite/CSV-Reports/sortBy_plan.start.down.tjp

@@ -1,4 +1,7 @@
-project test "Test" "1.0" 2007-12-16 +3m
+project test "Test" "1.0" 2007-12-16 +3m {
+  workinghours mon - fri 9:00 - 12:00, 13:00 - 18:00
+}
+
 include "project-1.tji"
 
 taskreport csv "." {

data/test/TestSuite/CSV-Reports/taskreport.tjp

@@ -1,4 +1,6 @@
-project test "Test" "1.0" 2007-12-16 +3m
+project test "Test" "1.0" 2007-12-16 +3m {
+  workinghours mon - fri 9:00 - 12:00, 13:00 - 18:00
+}
 include "project-1.tji"
 
 taskreport csv "." {

data/test/TestSuite/CSV-Reports/taskreport_with_resources.tjp

@@ -1,4 +1,6 @@
-project test "Test" "1.0" 2007-12-16 +3m
+project test "Test" "1.0" 2007-12-16 +3m {
+  workinghours mon - fri 9:00 - 12:00, 13:00 - 18:00
+}
 include "project-1.tji"
 
 taskreport csv "." {

data/test/TestSuite/CSV-Reports/weekly.tjp

@@ -1,5 +1,6 @@
 project "Weekly" "1.0" 2007-12-16 +3m {
   timezone 'UTC'
+  workinghours mon - fri 9:00 - 12:00, 13:00 - 18:00
 }
 include "project-1.tji"
 

data/test/TestSuite/Export-Reports/refs/Account.tjp

@@ -1,6 +1,7 @@
 project simple "Simple Project" "1.0" 2007-01-01-00:00-+0000 - 2007-01-30-00:00-+0000 {
   timezone "America/Denver"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 
@@ -12,28 +13,28 @@ resource konqui "Konqui"
 task items "Room decoration" {
   task plan "Plan work and buy material" {
     start 2007-01-06-07:00-+0000
-    end 2007-01-10-01:00-+0000
+    end 2007-01-10-00:00-+0000
     scheduling asap
     scheduled
   }
   task remove "Remove old inventory" {
     depends items.plan
     start 2007-01-10-16:00-+0000
-    end 2007-01-10-21:00-+0000
+    end 2007-01-10-20:00-+0000
     scheduling asap
     scheduled
   }
   task implement "Arrange new decoration" {
     depends items.remove
-    start 2007-01-10-21:00-+0000
-    end 2007-01-13-01:00-+0000
+    start 2007-01-10-20:00-+0000
+    end 2007-01-13-00:00-+0000
     scheduling asap
     scheduled
   }
   task acceptance "Presentation and customer acceptance" {
     depends items.implement
-    start 2007-01-13-01:00-+0000
-    end 2007-01-18-01:00-+0000
+    start 2007-01-13-00:00-+0000
+    end 2007-01-18-00:00-+0000
     scheduling asap
     scheduled
   }
@@ -47,24 +48,18 @@ supplement task items.plan {
   projectid simple
 }
 supplement task items.remove {
-  booking konqui 2007-01-10-16:00-+0000 + 3.0h,
-          2007-01-10-20:00-+0000 + 1.0h { overtime 2 }
-  booking tux 2007-01-10-16:00-+0000 + 3.0h,
-          2007-01-10-20:00-+0000 + 1.0h { overtime 2 }
+  booking konqui 2007-01-10-16:00-+0000 + 4.0h { overtime 2 }
+  booking tux 2007-01-10-16:00-+0000 + 4.0h { overtime 2 }
   priority 500
   projectid simple
 }
 supplement task items.implement {
-  booking konqui 2007-01-10-21:00-+0000 + 4.0h,
-          2007-01-11-16:00-+0000 + 3.0h,
-          2007-01-11-20:00-+0000 + 5.0h,
-          2007-01-12-16:00-+0000 + 3.0h,
-          2007-01-12-20:00-+0000 + 5.0h { overtime 2 }
-  booking tux 2007-01-10-21:00-+0000 + 4.0h,
-          2007-01-11-16:00-+0000 + 3.0h,
-          2007-01-11-20:00-+0000 + 5.0h,
-          2007-01-12-16:00-+0000 + 3.0h,
-          2007-01-12-20:00-+0000 + 5.0h { overtime 2 }
+  booking konqui 2007-01-10-20:00-+0000 + 4.0h,
+          2007-01-11-16:00-+0000 + 8.0h,
+          2007-01-12-16:00-+0000 + 8.0h { overtime 2 }
+  booking tux 2007-01-10-20:00-+0000 + 4.0h,
+          2007-01-11-16:00-+0000 + 8.0h,
+          2007-01-12-16:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid simple
 }
@@ -74,19 +69,19 @@ supplement task items.acceptance {
 }
 supplement resource tux {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }
 supplement resource konqui {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }

data/test/TestSuite/Export-Reports/refs/AdoptedTasks.tjp

@@ -1,6 +1,7 @@
 project prj "Adopted Tasks" "1.0" 2011-03-05-00:00-+0000 - 2011-04-04-10:00-+0000 {
   timezone "UTC"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 

data/test/TestSuite/Export-Reports/refs/Allocate-1.tjp

@@ -1,6 +1,7 @@
 project allocate "allocate" "1.0" 2003-06-05-00:00-+0000 - 2003-07-05-00:00-+0000 {
   timezone "America/Denver"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 
@@ -12,13 +13,13 @@ resource r2 "Resource 2"
 task t1 "Task 1" {
   task t2 "Task 2" {
     start 2003-06-19-15:00-+0000
-    end 2003-07-03-00:00-+0000
+    end 2003-07-02-23:00-+0000
     scheduling asap
     scheduled
   }
   task t3 "Task 3" {
     start 2003-06-05-15:00-+0000
-    end 2003-06-19-00:00-+0000
+    end 2003-06-18-23:00-+0000
     scheduling asap
     scheduled
   }
@@ -33,70 +34,40 @@ supplement task t1 {
   projectid allocate
 }
 supplement task t1.t2 {
-  booking r1 2003-06-19-15:00-+0000 + 3.0h,
-          2003-06-19-19:00-+0000 + 5.0h,
-          2003-06-20-15:00-+0000 + 3.0h,
-          2003-06-20-19:00-+0000 + 5.0h,
-          2003-06-23-15:00-+0000 + 3.0h,
-          2003-06-23-19:00-+0000 + 5.0h,
-          2003-06-24-15:00-+0000 + 3.0h,
-          2003-06-24-19:00-+0000 + 5.0h,
-          2003-06-25-15:00-+0000 + 3.0h,
-          2003-06-25-19:00-+0000 + 5.0h,
-          2003-06-26-15:00-+0000 + 3.0h,
-          2003-06-26-19:00-+0000 + 5.0h,
-          2003-06-27-15:00-+0000 + 3.0h,
-          2003-06-27-19:00-+0000 + 5.0h,
-          2003-06-30-15:00-+0000 + 3.0h,
-          2003-06-30-19:00-+0000 + 5.0h,
-          2003-07-01-15:00-+0000 + 3.0h,
-          2003-07-01-19:00-+0000 + 5.0h,
-          2003-07-02-15:00-+0000 + 3.0h,
-          2003-07-02-19:00-+0000 + 5.0h { overtime 2 }
+  booking r1 2003-06-19-15:00-+0000 + 8.0h,
+          2003-06-20-15:00-+0000 + 8.0h,
+          2003-06-23-15:00-+0000 + 8.0h,
+          2003-06-24-15:00-+0000 + 8.0h,
+          2003-06-25-15:00-+0000 + 8.0h,
+          2003-06-26-15:00-+0000 + 8.0h,
+          2003-06-27-15:00-+0000 + 8.0h,
+          2003-06-30-15:00-+0000 + 8.0h,
+          2003-07-01-15:00-+0000 + 8.0h,
+          2003-07-02-15:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid allocate
 }
 supplement task t1.t3 {
-  booking r1 2003-06-05-15:00-+0000 + 3.0h,
-          2003-06-05-19:00-+0000 + 5.0h,
-          2003-06-06-15:00-+0000 + 3.0h,
-          2003-06-06-19:00-+0000 + 5.0h,
-          2003-06-09-15:00-+0000 + 3.0h,
-          2003-06-09-19:00-+0000 + 5.0h,
-          2003-06-10-15:00-+0000 + 3.0h,
-          2003-06-10-19:00-+0000 + 5.0h,
-          2003-06-11-15:00-+0000 + 3.0h,
-          2003-06-11-19:00-+0000 + 5.0h,
-          2003-06-12-15:00-+0000 + 3.0h,
-          2003-06-12-19:00-+0000 + 5.0h,
-          2003-06-13-15:00-+0000 + 3.0h,
-          2003-06-13-19:00-+0000 + 5.0h,
-          2003-06-16-15:00-+0000 + 3.0h,
-          2003-06-16-19:00-+0000 + 5.0h,
-          2003-06-17-15:00-+0000 + 3.0h,
-          2003-06-17-19:00-+0000 + 5.0h,
-          2003-06-18-15:00-+0000 + 3.0h,
-          2003-06-18-19:00-+0000 + 5.0h { overtime 2 }
-  booking r2 2003-06-05-15:00-+0000 + 3.0h,
-          2003-06-05-19:00-+0000 + 5.0h,
-          2003-06-06-15:00-+0000 + 3.0h,
-          2003-06-06-19:00-+0000 + 5.0h,
-          2003-06-09-15:00-+0000 + 3.0h,
-          2003-06-09-19:00-+0000 + 5.0h,
-          2003-06-10-15:00-+0000 + 3.0h,
-          2003-06-10-19:00-+0000 + 5.0h,
-          2003-06-11-15:00-+0000 + 3.0h,
-          2003-06-11-19:00-+0000 + 5.0h,
-          2003-06-12-15:00-+0000 + 3.0h,
-          2003-06-12-19:00-+0000 + 5.0h,
-          2003-06-13-15:00-+0000 + 3.0h,
-          2003-06-13-19:00-+0000 + 5.0h,
-          2003-06-16-15:00-+0000 + 3.0h,
-          2003-06-16-19:00-+0000 + 5.0h,
-          2003-06-17-15:00-+0000 + 3.0h,
-          2003-06-17-19:00-+0000 + 5.0h,
-          2003-06-18-15:00-+0000 + 3.0h,
-          2003-06-18-19:00-+0000 + 5.0h { overtime 2 }
+  booking r1 2003-06-05-15:00-+0000 + 8.0h,
+          2003-06-06-15:00-+0000 + 8.0h,
+          2003-06-09-15:00-+0000 + 8.0h,
+          2003-06-10-15:00-+0000 + 8.0h,
+          2003-06-11-15:00-+0000 + 8.0h,
+          2003-06-12-15:00-+0000 + 8.0h,
+          2003-06-13-15:00-+0000 + 8.0h,
+          2003-06-16-15:00-+0000 + 8.0h,
+          2003-06-17-15:00-+0000 + 8.0h,
+          2003-06-18-15:00-+0000 + 8.0h { overtime 2 }
+  booking r2 2003-06-05-15:00-+0000 + 8.0h,
+          2003-06-06-15:00-+0000 + 8.0h,
+          2003-06-09-15:00-+0000 + 8.0h,
+          2003-06-10-15:00-+0000 + 8.0h,
+          2003-06-11-15:00-+0000 + 8.0h,
+          2003-06-12-15:00-+0000 + 8.0h,
+          2003-06-13-15:00-+0000 + 8.0h,
+          2003-06-16-15:00-+0000 + 8.0h,
+          2003-06-17-15:00-+0000 + 8.0h,
+          2003-06-18-15:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid allocate
 }
@@ -106,19 +77,19 @@ supplement task t1.m1 {
 }
 supplement resource r1 {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }
 supplement resource r2 {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }