Merge remote-tracking branch 'origin/master'

TangoGroup · Jun 17, 2014 · 49ce2e5 · 49ce2e5
2 parents 8cd6b86 + bf4e979
commit 49ce2e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 57 deletions.
diff --git a/sections/records.md b/sections/records.md
@@ -37,7 +37,8 @@ Records are where your data is stored. One record is stored per category, per ca
     "active": true,
     "created_at": "2012-01-25T00:14:02Z",
     "updated_at": "2013-03-04T03:13:22Z"
-  }
+  },
+  "event": null
 }, {
   "id": 1146321,
   "created_at": "2012-03-28T16:30:01Z",
@@ -62,6 +63,12 @@ Records are where your data is stored. One record is stored per category, per ca
     "active": true,
     "created_at": "2012-01-25T00:14:02Z",
     "updated_at": "2013-03-04T03:13:22Z"
+  },
+  "event": {
+    "id": 3834,
+    "name": "Easter",
+    "created_at": "2012-03-21T15:09:10Z",
+    "updated_at": "2012-03-21T15:09:10Z"
   }
 }]
 ```

diff --git a/sections/regions.md b/sections/regions.md
@@ -9,41 +9,21 @@ Regions are an optional feature.
 ## Get regions
 
 * `GET /regions.json` will return a list of all regions
-* Data includes list of all campuses within each region
+* Data includes list of all campus ids within each region
 
 ```
 [{
   "id": 2,
   "name": "Region 1",
   "created_at": "2012-01-25T00:13:54Z",
   "updated_at": "2012-01-25T00:13:54Z",
-  "campuses": [{
-    "id": 15,
-    "slug": "STO",
-    "description": "South Tulsa",
-    "region_id": 2,
-    "timezone": "Central Time (US & Canada)",
-    "active": true,
-    "created_at": "2012-01-25T00:14:02Z",
-    "updated_at": "2013-03-04T02:38:00Z"
-   }
-   …
+  "campus_ids": [1, 2, 3]
   }, {
   "id": 3,
   "name": "Region 2",
   "created_at": "2012-01-25T00:13:54Z",
   "updated_at": "2012-01-25T00:13:54Z",
-  "campuses": [{
-    "id": 6,
-    "slug": "CEN",
-    "description": "Central",
-    "region_id": 3,
-    "timezone": "Central Time (US & Canada)",
-    "active": true,
-    "created_at": "2012-01-25T00:14:02Z",
-    "updated_at": "2012-01-25T00:14:02Z"
-  }
-  … 
+  "campus_ids": [4, 5, 6]
 }]
 ```
 
@@ -59,17 +39,7 @@ Regions are an optional feature.
   "name": "Region 2",
   "created_at": "2012-01-25T00:13:54Z",
   "updated_at": "2012-01-25T00:13:54Z",
-  "campuses": [{
-    "id": 6,
-    "slug": "CEN",
-    "description": "Central",
-    "region_id": 3,
-    "timezone": "Central Time (US & Canada)",
-    "active": true,
-    "created_at": "2012-01-25T00:14:02Z",
-    "updated_at": "2012-01-25T00:14:02Z"
-  }
-  … 
+  "campus_ids": [1, 2, 3]
 }
 ```
 

diff --git a/sections/service_times.md b/sections/service_times.md
@@ -9,8 +9,8 @@ They are broken down into two groups: Regular service times and Event service ti
 When creating service times for Events, the service time must have:
 
 1. `event_id`
-2. `start_date`
-3. `end_date`
+2. `date_start`
+3. `date_end`
 
 For instance, if you need to setup services for Easter, you would first create the Event to obtain its `event_id`. Then you would create 
 
@@ -77,6 +77,7 @@ If a service time is associated with an Event, the API will return that Event da
     "created_at": "2012-01-25T00:14:02Z",
     "updated_at": "2013-03-04T02:19:53Z"
   }
+  "event": null
 }]
 ```
 

diff --git a/sections/users.md b/sections/users.md
@@ -33,16 +33,7 @@ Volunteers are assigned to a particular campus. They can only input data for a s
   "name": "test.user",
   "timezone": "Central Time (US & Canada)",
   "role": "staff",
-  "campus": {
-    "id": 6,
-    "slug": "EDM",
-    "description": "Central",
-    "region_id": 3,
-    "timezone": "Central Time (US & Canada)",
-    "active": true,
-    "created_at": "2012-01-25T00:14:02Z",
-    "updated_at": "2012-01-25T00:14:02Z"
-  }
+  "campus_id": 6
 }, {
   "id": 18342,
   "email": "[email protected]",
@@ -69,16 +60,7 @@ Volunteers are assigned to a particular campus. They can only input data for a s
   "name": "test.volunteer",
   "timezone": "Central Time (US & Canada)",
   "role": "volunteer",
-  "campus": {
-    "id": 2,
-    "slug": "ALB",
-    "description": "Albany",
-    "region_id": 2,
-    "timezone": "Eastern Time (US & Canada)",
-    "active": true,
-    "created_at": "2012-01-25T00:14:02Z",
-    "updated_at": "2013-03-04T22:09:56Z"
-  }
+  "campus_id": 2
 }
 ```