From 15ff3ee51b0d19668450db93467189dd375aa6a1 Mon Sep 17 00:00:00 2001
From: Alasdair Colley <ac@brede.(none)>
Date: Mon, 7 Nov 2011 13:09:52 +0000
Subject: config class created, lunch fixed, two config files now

---
 perc.cfg | 67 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

(limited to 'perc.cfg')

diff --git a/perc.cfg b/perc.cfg
index f5a9b8c..c5657f8 100644
--- a/perc.cfg
+++ b/perc.cfg
@@ -1,35 +1,5 @@
 {
-    "FORMAT": {
-        "date": {
-            "slashes": "%d/%m/%Y", 
-            "hyphens": "%d-%m-%Y"
-        }, 
-        "time": {
-            "12hour": "%I:%M%p", 
-            "military": "%H%M", 
-            "12houronly": "%I%p", 
-            "civilian": "%H:%M"
-        }
-    }, 
-    "RATIO_SIGFIGS": 3, 
-    "ADMINS": [
-        "bikeman", 
-        "bondroid", 
-        "bottlecap", 
-        "carpnet", 
-        "daveg", 
-        "dhm", 
-        "dsk", 
-        "fbeans", 
-        "sbeans", 
-        "jagw", 
-        "l_bratch", 
-        "miniwork", 
-        "otherlw", 
-        "otherlp", 
-        "wjoe"
-    ], 
-    "DEFAULTS": {
+    "USERS": {
         "daveg": {
             "start": "07:30", 
             "finish": "18:00", 
@@ -49,7 +19,7 @@
                 "finish": "14:00"
             }, 
             "format": "%I%p"
-        },
+        }, 
         "wjoe": {
             "start": "09:00", 
             "finish": "17:00", 
@@ -141,6 +111,36 @@
             "format": "%H:%M"
         }
     }, 
+    "FORMAT": {
+        "date": {
+            "slashes": "%d/%m/%Y", 
+            "hyphens": "%d-%m-%Y"
+        }, 
+        "time": {
+            "12hour": "%I:%M%p", 
+            "military": "%H%M", 
+            "12houronly": "%I%p", 
+            "civilian": "%H:%M"
+        }
+    }, 
+    "RATIO_SIGFIGS": 3, 
+    "ADMINS": [
+        "bikeman", 
+        "bondroid", 
+        "bottlecap", 
+        "carpnet", 
+        "daveg", 
+        "dhm", 
+        "dsk", 
+        "fbeans", 
+        "sbeans", 
+        "jagw", 
+        "l_bratch", 
+        "miniwork", 
+        "otherlw", 
+        "otherlp", 
+        "wjoe"
+    ], 
     "OUTPUT": {
         "PERCENTAGE": "{ratio:.2%} {finish} ({start} start)", 
         "BAR": {
@@ -148,6 +148,5 @@
             "length": 40, 
             "character": "-"
         }
-    }, 
-    "CUSTOM_EVENTS": {}
+    }
 }
-- 
cgit v1.2.3