From 48fa0864aaa9c9f79e90b3db4a85081b0c1bce58 Mon Sep 17 00:00:00 2001
From: Alasdair Colley <ac@brede.(none)>
Date: Tue, 1 Nov 2011 11:23:23 +0000
Subject: New admin/user options allowing addition of custom events from
 command line

---
 perc.cfg | 73 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

(limited to 'perc.cfg')

diff --git a/perc.cfg b/perc.cfg
index 018f379..454a9a8 100644
--- a/perc.cfg
+++ b/perc.cfg
@@ -6,9 +6,9 @@
         }, 
         "time": {
             "12hour": "%I:%M%p", 
-            "civilian": "%H:%M", 
+            "military": "%H%M", 
             "12houronly": "%I%p", 
-            "military": "%H%M"
+            "civilian": "%H:%M"
         }
     }, 
     "RATIO_SIGFIGS": 3, 
@@ -17,8 +17,8 @@
         "bondroid", 
         "bottlecap", 
         "carpnet", 
-        "daveg",
-        "dhm",
+        "daveg", 
+        "dhm", 
         "dsk", 
         "fbeans", 
         "sbeans", 
@@ -32,121 +32,121 @@
     "DEFAULTS": {
         "daveg": {
             "start": "07:30", 
-            "format": "%H:%M", 
             "finish": "18:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "12:30", 
                 "finish": "13:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
         "bikeman": {
             "start": "09:00", 
-            "format": "%I%p", 
             "finish": "17:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%I%p"
         }, 
         "wjoe": {
             "start": "09:00", 
-            "format": "%I%p", 
             "finish": "17:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "12:00", 
                 "finish": "13:00"
             }, 
-            "output": "bar"
+            "format": "%I%p"
         }, 
         "default": {
             "start": "09:00", 
-            "format": "%H:%M", 
             "finish": "17:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
-        "l_bratch": {
-            "start": "08:30", 
-            "format": "%H:%M", 
-            "finish": "17:00", 
+        "jagw": {
+            "start": "09:00", 
+            "finish": "18:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%I%p"
         }, 
         "bottlecap": {
             "start": "09:00", 
-            "format": "%H:%M", 
             "finish": "17:30", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
         "carpnet": {
             "start": "10:00", 
-            "format": "%H:%M", 
             "finish": "19:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
         "miniwork": {
             "start": "09:00", 
-            "format": "%H:%M", 
             "finish": "17:30", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
         "otherlw": {
             "start": "10:00", 
-            "format": "%H:%M", 
             "finish": "19:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
-        "jagw": {
-            "start": "09:00", 
-            "format": "%I%p", 
-            "finish": "18:00", 
+        "l_bratch": {
+            "start": "08:30", 
+            "finish": "17:00", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }, 
         "sbeans": {
             "start": "09:00", 
-            "format": "%H:%M", 
             "finish": "17:30", 
+            "output": "bar", 
             "lunch": {
                 "start": "13:00", 
                 "finish": "14:00"
             }, 
-            "output": "bar"
+            "format": "%H:%M"
         }
     }, 
     "OUTPUT": {
         "PERCENTAGE": "{ratio:.2%} {finish} ({start} start)", 
         "BAR": {
-            "character": "-", 
+            "length_mobile": 30, 
             "length": 40, 
-            "length_mobile": 30
+            "character": "-"
         }
     }, 
     "CUSTOM_EVENTS": {
@@ -159,11 +159,6 @@
             "start": "2011-09-04 18:00", 
             "finish": "2011-11-11 20:00", 
             "format": "{name} (%y-%m-%d %H:%M)"
-        }, 
-        "birth": {
-            "start": "2011-03-28 10:00", 
-            "finish": "2012-03-28 00:00", 
-            "format": "{name} %Y"
         }
     }
 }
-- 
cgit v1.2.3