12/7/15

karllassy · Dec 8, 2015 · 283df5c · 283df5c
1 parent e7f2842
commit 283df5c
Show file tree

Hide file tree

Showing 22 changed files with 21,180 additions and 1,010 deletions.
diff --git a/CSE2102/EnhancementDiagram.sqd b/CSE2102/EnhancementDiagram.sqd
diff --git a/CSE2102/data/data.xml b/CSE2102/data/data.xml
@@ -99,42 +99,35 @@
 
    <rapla:resources>
       <!-- resources -->
-      <rapla:resource id="r61c8da6-1812-4fc4-8516-cbe81199563d" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:01:09.0538Z" last-changed="2015-10-07T20:01:18.0784Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
-         <dynatt:resource>
-            <dynatt:name>myResource</dynatt:name>
-         </dynatt:resource>
-         <rapla:permission access="allocate_conflicts"/>
-      </rapla:resource>
-      <rapla:resource id="rf87ea5d-4379-46aa-ab1b-502c24eb3efd" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:17:23.0299Z" last-changed="2015-10-07T20:17:30.0862Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="r6be21be-0ed8-4814-931b-b5cb532f5b6e" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-21T20:37:40.0180Z" last-changed="2015-10-21T20:37:45.0035Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>karl lassy</dynatt:name>
+            <dynatt:name>hi</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
-      <rapla:resource id="r6be21be-0ed8-4814-931b-b5cb532f5b6e" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-21T20:37:40.0180Z" last-changed="2015-10-21T20:37:45.0035Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="rf4e930b-3490-4020-bab3-73efa797bd4a" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T03:07:52.0235Z" last-changed="2015-12-08T03:07:55.0075Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>hi</dynatt:name>
+            <dynatt:name>sdfg</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
 
    </rapla:resources>
 
    <rapla:reservations>
-      <rapla:reservation id="e75d84a5-e92a-4850-ae7c-60179fadf9a6" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:29:10.0738Z" last-changed="2015-10-07T20:29:18.0428Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:reservation id="e75d84a5-e92a-4850-ae7c-60179fadf9a6" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:29:10.0738Z" last-changed="2015-12-08T03:08:07.0235Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>asdf</dynatt:name>
          </dynatt:event>
          <rapla:appointment id="a08c8f8a-b34a-4f66-be67-3374ec9ce11b" start-date="2015-12-07" start-time="14:45:00" end-date="2015-12-07" end-time="15:00:00"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
+         <rapla:allocate idref="rf4e930b-3490-4020-bab3-73efa797bd4a"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="ec47e64a-eb77-416c-8231-f8368d29ef56" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-14T19:33:38.0461Z" last-changed="2015-10-14T19:33:45.0141Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>asdfadf</dynatt:name>
          </dynatt:event>
          <rapla:appointment id="a4d6053b-f7b1-4432-8edb-312ad60ff522" start-date="2015-10-11" start-time="09:00:00" end-date="2015-10-11" end-time="09:15:00"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="e6cee89b-1b7c-4939-9be6-b21cdfae674c" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-28T20:03:33.0971Z" last-changed="2015-10-28T20:04:37.0245Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -143,7 +136,6 @@
          </dynatt:event>
          <rapla:appointment id="a0d3b8e3-3fa6-4a00-85a0-96ad61b941b0" start-date="2015-10-26" start-time="09:30:00" end-date="2015-10-26" end-time="09:45:00"/>
          <rapla:appointment id="a1a25616-1e05-401d-a68c-a53d3c0903c7" start-date="2015-10-26" start-time="09:30:00" end-date="2015-10-26" end-time="09:45:00"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="e3951fc5-4b96-44e4-9d5c-ea4e4aa51768" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-02T22:04:34.0712Z" last-changed="2015-11-04T20:42:42.0511Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -155,7 +147,6 @@
          <rapla:appointment id="a29d9537-833a-4ef8-80d8-f3655df7c95c" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:appointment id="a09bf5ec-3cfe-4cea-9f19-4d39ba811f7b" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="ef2a1bb5-a741-4258-b335-7c04a0584d72" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-04T20:41:59.0270Z" last-changed="2015-11-04T20:43:10.0492Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -166,6 +157,32 @@
          <rapla:appointment id="a80513e2-abe4-45c6-b385-5767fd7f03e4" start-date="2015-11-02" start-time="11:00:00" end-date="2015-11-02" end-time="11:15:00"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
+      <rapla:reservation id="ec437406-7fcd-4c03-a43d-7fa9b7724a0a" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-12T17:29:25.0223Z" last-changed="2015-11-12T17:29:59.0675Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>asdf</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a3fa6c77-2e5e-43eb-b6b6-4c2199a21e16" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a4b6c0ee-bcf9-46c2-971e-b57a65142d05" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="afe044df-e1fa-493f-9be8-7ac48567641e" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a60c2ce9-5a12-4bcb-9ba8-ce4d91498de1" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="ae8963a2-2daa-4554-8976-2690551d8a43" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a7e2540c-d38e-4ff6-be20-767accc4721f" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a98f4c2b-77b8-43ee-b53b-9c0d4cf7f96b" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a2c14247-16c6-4ad3-a868-610956f84c95" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e5ad4971-6338-43be-960a-a4fdd9fc82ac" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-12T18:25:51.0999Z" last-changed="2015-11-12T18:26:04.0981Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>asdf</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a2551239-6a66-45aa-9587-92c503239786" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="a2985ebe-0512-4b37-843b-e0e3cb401f82" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="ad122b94-b1da-40ce-b030-db2f3e3aa31c" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="a9c6221f-0f58-4818-b5e1-4a714a837b01" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="ad8eabc3-c44e-4365-9bec-9746e3c6e9f6" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
    </rapla:reservations>
 
 </rapla:data>
diff --git a/CSE2102/data/data.xml.bak b/CSE2102/data/data.xml.bak
@@ -99,42 +99,34 @@
 
    <rapla:resources>
       <!-- resources -->
-      <rapla:resource id="r61c8da6-1812-4fc4-8516-cbe81199563d" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:01:09.0538Z" last-changed="2015-10-07T20:01:18.0784Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
-         <dynatt:resource>
-            <dynatt:name>myResource</dynatt:name>
-         </dynatt:resource>
-         <rapla:permission access="allocate_conflicts"/>
-      </rapla:resource>
-      <rapla:resource id="rf87ea5d-4379-46aa-ab1b-502c24eb3efd" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:17:23.0299Z" last-changed="2015-10-07T20:17:30.0862Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="r6be21be-0ed8-4814-931b-b5cb532f5b6e" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-21T20:37:40.0180Z" last-changed="2015-10-21T20:37:45.0035Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>karl lassy</dynatt:name>
+            <dynatt:name>hi</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
-      <rapla:resource id="r6be21be-0ed8-4814-931b-b5cb532f5b6e" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-21T20:37:40.0180Z" last-changed="2015-10-21T20:37:45.0035Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:resource id="rf4e930b-3490-4020-bab3-73efa797bd4a" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-12-08T03:07:52.0235Z" last-changed="2015-12-08T03:07:55.0075Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:resource>
-            <dynatt:name>hi</dynatt:name>
+            <dynatt:name>sdfg</dynatt:name>
          </dynatt:resource>
          <rapla:permission access="allocate_conflicts"/>
       </rapla:resource>
 
    </rapla:resources>
 
    <rapla:reservations>
-      <rapla:reservation id="e75d84a5-e92a-4850-ae7c-60179fadf9a6" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:29:10.0738Z" last-changed="2015-10-07T20:29:18.0428Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:reservation id="e75d84a5-e92a-4850-ae7c-60179fadf9a6" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-07T20:29:10.0738Z" last-changed="2015-12-08T03:07:43.0240Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>asdf</dynatt:name>
          </dynatt:event>
          <rapla:appointment id="a08c8f8a-b34a-4f66-be67-3374ec9ce11b" start-date="2015-12-07" start-time="14:45:00" end-date="2015-12-07" end-time="15:00:00"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="ec47e64a-eb77-416c-8231-f8368d29ef56" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-14T19:33:38.0461Z" last-changed="2015-10-14T19:33:45.0141Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>asdfadf</dynatt:name>
          </dynatt:event>
          <rapla:appointment id="a4d6053b-f7b1-4432-8edb-312ad60ff522" start-date="2015-10-11" start-time="09:00:00" end-date="2015-10-11" end-time="09:15:00"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="e6cee89b-1b7c-4939-9be6-b21cdfae674c" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-10-28T20:03:33.0971Z" last-changed="2015-10-28T20:04:37.0245Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -143,7 +135,6 @@
          </dynatt:event>
          <rapla:appointment id="a0d3b8e3-3fa6-4a00-85a0-96ad61b941b0" start-date="2015-10-26" start-time="09:30:00" end-date="2015-10-26" end-time="09:45:00"/>
          <rapla:appointment id="a1a25616-1e05-401d-a68c-a53d3c0903c7" start-date="2015-10-26" start-time="09:30:00" end-date="2015-10-26" end-time="09:45:00"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
       <rapla:reservation id="e3951fc5-4b96-44e4-9d5c-ea4e4aa51768" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-02T22:04:34.0712Z" last-changed="2015-11-04T20:42:42.0511Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
@@ -155,16 +146,40 @@
          <rapla:appointment id="a29d9537-833a-4ef8-80d8-f3655df7c95c" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:appointment id="a09bf5ec-3cfe-4cea-9f19-4d39ba811f7b" start-date="2015-11-02" start-time="10:00:00" end-date="2015-11-02" end-time="10:15:00"/>
          <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
-         <rapla:allocate idref="rf87ea5d-4379-46aa-ab1b-502c24eb3efd"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
-      <rapla:reservation id="ef2a1bb5-a741-4258-b335-7c04a0584d72" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-04T20:41:59.0270Z" last-changed="2015-11-04T20:42:34.0440Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+      <rapla:reservation id="ef2a1bb5-a741-4258-b335-7c04a0584d72" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-04T20:41:59.0270Z" last-changed="2015-11-04T20:43:10.0492Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
          <dynatt:event>
             <dynatt:name>my event</dynatt:name>
          </dynatt:event>
          <rapla:appointment id="a9b841cc-4865-419f-9256-a4209a227094" start-date="2015-11-02" start-time="10:15:00" end-date="2015-11-02" end-time="10:30:00"/>
          <rapla:appointment id="a80513e2-abe4-45c6-b385-5767fd7f03e4" start-date="2015-11-02" start-time="11:00:00" end-date="2015-11-02" end-time="11:15:00"/>
-         <rapla:allocate idref="r61c8da6-1812-4fc4-8516-cbe81199563d"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="ec437406-7fcd-4c03-a43d-7fa9b7724a0a" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-12T17:29:25.0223Z" last-changed="2015-11-12T17:29:59.0675Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>asdf</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a3fa6c77-2e5e-43eb-b6b6-4c2199a21e16" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a4b6c0ee-bcf9-46c2-971e-b57a65142d05" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="afe044df-e1fa-493f-9be8-7ac48567641e" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a60c2ce9-5a12-4bcb-9ba8-ce4d91498de1" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="ae8963a2-2daa-4554-8976-2690551d8a43" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a7e2540c-d38e-4ff6-be20-767accc4721f" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a98f4c2b-77b8-43ee-b53b-9c0d4cf7f96b" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:appointment id="a2c14247-16c6-4ad3-a868-610956f84c95" start-date="2015-11-08" start-time="02:15:00" end-date="2015-11-08" end-time="02:30:00"/>
+         <rapla:permission group="category[key='read-events-from-others']" access="read"/>
+      </rapla:reservation>
+      <rapla:reservation id="e5ad4971-6338-43be-960a-a4fdd9fc82ac" owner="u405db03-812f-4ff7-b52c-5423a7951cf4" created-at="2015-11-12T18:25:51.0999Z" last-changed="2015-11-12T18:26:04.0981Z" last-changed-by="u405db03-812f-4ff7-b52c-5423a7951cf4">
+         <dynatt:event>
+            <dynatt:name>asdf</dynatt:name>
+         </dynatt:event>
+         <rapla:appointment id="a2551239-6a66-45aa-9587-92c503239786" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="a2985ebe-0512-4b37-843b-e0e3cb401f82" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="ad122b94-b1da-40ce-b030-db2f3e3aa31c" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="a9c6221f-0f58-4818-b5e1-4a714a837b01" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:appointment id="ad8eabc3-c44e-4365-9bec-9746e3c6e9f6" start-date="2015-11-09" start-time="02:15:00" end-date="2015-11-09" end-time="02:30:00"/>
+         <rapla:allocate idref="r6be21be-0ed8-4814-931b-b5cb532f5b6e"/>
          <rapla:permission group="category[key='read-events-from-others']" access="read"/>
       </rapla:reservation>
    </rapla:reservations>