From 3700fd855fd5808d4d7811543658629e20bf8f87 Mon Sep 17 00:00:00 2001
From: afpinzon10 <af.pinzon10@uniandes.edu.co>
Date: Mon, 7 May 2018 19:44:14 -0500
Subject: [PATCH 1/3] probando ignore xml

---
 .gitignore                                  |  7 +-
 EntidadVirtual/horarios/.idea/workspace.xml | 76 ++++++++++-----------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb692d3..3f15865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-
-*.xml
-*.xml
-.idea/workspace.xml
-*.xml
-*.xml
+**/*.xml
diff --git a/EntidadVirtual/horarios/.idea/workspace.xml b/EntidadVirtual/horarios/.idea/workspace.xml
index f85cd50..b5a2340 100644
--- a/EntidadVirtual/horarios/.idea/workspace.xml
+++ b/EntidadVirtual/horarios/.idea/workspace.xml
@@ -11,35 +11,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="horariosLogic.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/horariosLogic.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="78">
-              <caret line="27" column="41" lean-forward="true" selection-start-line="27" selection-start-column="41" selection-end-line="28" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="server.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/../API_REST/server.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="listenerHeartbeat.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/../notificadores/listenerHeartbeat.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="250">
-              <caret line="17" column="12" lean-forward="true" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
-              <folding>
-                <element signature="e#0#31#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="136">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
             </state>
           </provider>
         </entry>
@@ -109,7 +85,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.listenerHeartbeat">
+  <component name="RunManager" selected="Python.server">
     <configuration name="horariosLogic" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="horarios" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -164,6 +140,24 @@
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
+    <configuration name="server" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="horarios" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../API_REST" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../API_REST/server.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
     <configuration name="tragaperras" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="horarios" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -187,9 +181,11 @@
       <item itemvalue="Python.listenerHeartbeat" />
       <item itemvalue="Python.tragaperras" />
       <item itemvalue="Python.prueba" />
+      <item itemvalue="Python.server" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.server" />
         <item itemvalue="Python.listenerHeartbeat" />
         <item itemvalue="Python.horariosLogic" />
         <item itemvalue="Python.prueba" />
@@ -291,6 +287,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/prueba.py" />
     <entry file="file://$PROJECT_DIR$/../API_REST/apirest.py" />
+    <entry file="file://$PROJECT_DIR$/../notificadores/listenerHeartbeat.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="17" column="12" lean-forward="true" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/horariosLogic.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="78">
@@ -303,18 +309,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/../API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../notificadores/listenerHeartbeat.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="17" column="12" lean-forward="true" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#31#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="136">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
         </state>
       </provider>
     </entry>

From 7c7b85131c450a26be6f258a88dcfd7b5a1bbda3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zulma=20Casta=C3=B1eda?= <zl.castaneda10@uniandes.edu.co>
Date: Tue, 8 May 2018 10:02:37 -0500
Subject: [PATCH 2/3] REST que camilo no hizo

Es broma, yo le dije que no lo hiciera :v
---
 EntidadVirtual/API_REST/test_cerradura.py | 43 +++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 EntidadVirtual/API_REST/test_cerradura.py

diff --git a/EntidadVirtual/API_REST/test_cerradura.py b/EntidadVirtual/API_REST/test_cerradura.py
new file mode 100644
index 0000000..2243e72
--- /dev/null
+++ b/EntidadVirtual/API_REST/test_cerradura.py
@@ -0,0 +1,43 @@
+from flask import Flask
+import time
+import paho.mqtt.client as paho
+app = Flask(__name__)
+broker="broker.hivemq.com"
+
+
+#Insertar una cerradura
+@app.route("/cerradura", methods=["POST"])
+def insert_cerradura():
+    password = request.json['password']
+    posicion = request.json['posicion']
+    hora_inicio = request.json['hora_inicio']
+    hora_fin = request.json['hora_fin']
+
+    nuevo_candado = "0;"+password+";"+posicion;
+    #Escribir y publicar mensaje
+
+
+@app.route("/cerradura", methods=["UPDATE"])
+def update_cerradura():
+    password = request.json['password']
+    posicion = request.json['posicion']
+    nuevo_candado = "1;"+password+";"+posicion;
+
+
+@app.route("/cerradura", methods=["DELETE"])
+def delete_cerradura():
+    posicion = request.json['posicion']
+    nuevo_candado = "2;" + posicion;
+
+@app.route("/cerradura_all", methods=["DELETE"])
+def delete_all_cerraduras():
+    mensaje = "3"
+
+
+@app.route("/cerradura", methods = ["PUT"])
+def change_state_cerradura():
+    posicion = request.json['posicion']
+    mensaje = "4;"posicion;
+
+if __name__ == '__main__':
+    app.run(debug=True)

From 32ab61773b021b9923499fc82e4f2017e019dd33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zulma=20Casta=C3=B1eda?= <zl.castaneda10@uniandes.edu.co>
Date: Tue, 8 May 2018 19:12:27 -0500
Subject: [PATCH 3/3] terminada la parte de horarios

Tod funciona no tocar
---
 .idea/201810_01_softsecurity.iml              |   2 +-
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 216 +++++++++++++-----
 EntidadVirtual/API_REST/__init__.py           |   0
 EntidadVirtual/API_REST/test_cerradura.py     |  35 ++-
 EntidadVirtual/horarios/__init__.py           |   0
 .../__pycache__/__init__.cpython-36.pyc       | Bin 0 -> 173 bytes
 .../__pycache__/horariosLogic.cpython-36.pyc  | Bin 2096 -> 2800 bytes
 EntidadVirtual/horarios/horariosLogic.py      |  50 ++--
 .../notificadores/listenerHeartbeat.py        |   2 +-
 10 files changed, 218 insertions(+), 89 deletions(-)
 create mode 100644 EntidadVirtual/API_REST/__init__.py
 create mode 100644 EntidadVirtual/horarios/__init__.py
 create mode 100644 EntidadVirtual/horarios/__pycache__/__init__.cpython-36.pyc

diff --git a/.idea/201810_01_softsecurity.iml b/.idea/201810_01_softsecurity.iml
index 1f377c8..9eedabc 100644
--- a/.idea/201810_01_softsecurity.iml
+++ b/.idea/201810_01_softsecurity.iml
@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.6" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.6 (venv)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7a5c067..a3ffc2d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (venv)" project-jdk-type="Python SDK" />
   <component name="PyCharmProfessionalAdvertiser">
     <option name="shown" value="true" />
   </component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2a8c2c0..3228af7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -15,29 +15,65 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="apirest.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py">
+      <file leaf-file-name="server.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1122">
+              <caret line="81" column="16" selection-start-line="81" selection-start-column="16" selection-end-line="81" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="test_cerradura.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/test_cerradura.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="476">
-              <caret line="28" column="9" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
+            <state relative-caret-position="323">
+              <caret line="19" column="56" selection-start-line="19" selection-start-column="56" selection-end-line="19" selection-end-column="56" />
               <folding>
-                <element signature="e#11#34#0" expanded="true" />
+                <element signature="e#0#41#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
+      <file leaf-file-name="horariosLogic.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/EntidadVirtual/horarios/horariosLogic.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1037">
-              <caret line="81" column="16" selection-start-line="81" selection-start-column="16" selection-end-line="81" selection-end-column="16" />
+            <state relative-caret-position="153">
+              <caret line="60" column="27" selection-start-line="60" selection-start-column="27" selection-end-line="60" selection-end-column="27" />
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/EntidadVirtual/horarios/__init__.py">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="listenerHeartbeat.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/EntidadVirtual/notificadores/listenerHeartbeat.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="75" column="16" selection-start-line="75" selection-start-column="16" selection-end-line="75" selection-end-column="16" />
+              <folding>
+                <element signature="e#0#31#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -46,21 +82,24 @@
       <list>
         <option value="$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py" />
         <option value="$PROJECT_DIR$/EntidadVirtual/API_REST/server.py" />
+        <option value="$PROJECT_DIR$/EntidadVirtual/horarios/__init__.py" />
+        <option value="$PROJECT_DIR$/EntidadVirtual/API_REST/__init__.py" />
+        <option value="$PROJECT_DIR$/EntidadVirtual/notificadores/listenerHeartbeat.py" />
+        <option value="$PROJECT_DIR$/EntidadVirtual/API_REST/test_cerradura.py" />
+        <option value="$PROJECT_DIR$/EntidadVirtual/horarios/horariosLogic.py" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1346" />
-    <option name="height" value="688" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
+    <option name="width" value="1153" />
+    <option name="height" value="1047" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -73,10 +112,29 @@
               <item name="201810_01_softsecurity" type="462c0819:PsiDirectoryNode" />
               <item name="EntidadVirtual" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="201810_01_softsecurity" type="b2602c69:ProjectViewProjectNode" />
+              <item name="201810_01_softsecurity" type="462c0819:PsiDirectoryNode" />
+              <item name="EntidadVirtual" type="462c0819:PsiDirectoryNode" />
+              <item name="API_REST" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="201810_01_softsecurity" type="b2602c69:ProjectViewProjectNode" />
+              <item name="201810_01_softsecurity" type="462c0819:PsiDirectoryNode" />
+              <item name="EntidadVirtual" type="462c0819:PsiDirectoryNode" />
+              <item name="horarios" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="201810_01_softsecurity" type="b2602c69:ProjectViewProjectNode" />
+              <item name="201810_01_softsecurity" type="462c0819:PsiDirectoryNode" />
+              <item name="EntidadVirtual" type="462c0819:PsiDirectoryNode" />
+              <item name="notificadores" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -95,7 +153,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.apirest">
+  <component name="RunManager" selected="Python.test_cerradura">
     <configuration name="apirest" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="201810_01_softsecurity" />
       <option name="INTERPRETER_OPTIONS" value="python-3.6.5" />
@@ -114,6 +172,24 @@
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
+    <configuration name="horariosLogic" type="PythonConfigurationType" factoryName="Python" temporary="true">
+      <module name="201810_01_softsecurity" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/EntidadVirtual/horarios" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/EntidadVirtual/horarios/horariosLogic.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
     <configuration name="notifications" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="201810_01_softsecurity" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -150,13 +226,34 @@
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
     </configuration>
+    <configuration name="test_cerradura" type="PythonConfigurationType" factoryName="Python">
+      <module name="201810_01_softsecurity" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="C:\Users\Zulma\Documents\GitHub\201810_01_softsecurity\EntidadVirtual\notificadores\venv\Scripts\python.exe" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/EntidadVirtual/API_REST" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/EntidadVirtual/API_REST/test_cerradura.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+    </configuration>
     <list>
+      <item itemvalue="Python.test_cerradura" />
       <item itemvalue="Python.apirest" />
       <item itemvalue="Python.notifications" />
       <item itemvalue="Python.server" />
+      <item itemvalue="Python.horariosLogic" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Python.horariosLogic" />
         <item itemvalue="Python.apirest" />
         <item itemvalue="Python.server" />
         <item itemvalue="Python.notifications" />
@@ -177,18 +274,18 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-7" y="0" width="1196" height="1047" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24270834" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.39491525" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3290938" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.33154505" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Python Console" order="7" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39914164" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -202,17 +299,20 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="7" />
+    </breakpoint-manager>
+  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py">
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
-          <folding>
-            <element signature="e#11#34#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1377">
+          <caret line="81" column="16" selection-start-line="81" selection-start-column="16" selection-end-line="81" selection-end-column="16" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py" />
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1037">
@@ -220,16 +320,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
-          <folding>
-            <element signature="e#11#34#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py" />
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1309">
@@ -237,13 +328,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py" />
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1309">
@@ -251,13 +336,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py" />
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="612">
@@ -274,19 +353,46 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/eve-master/examples/notifications.py" />
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/eve-master/eve/auth.py" />
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py" />
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/server.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1037">
+        <state relative-caret-position="1122">
           <caret line="81" column="16" selection-start-line="81" selection-start-column="16" selection-end-line="81" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/apirest.py">
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/notificadores/listenerHeartbeat.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="75" column="16" selection-start-line="75" selection-start-column="16" selection-end-line="75" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/horarios/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/API_REST/test_cerradura.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="19" column="56" selection-start-line="19" selection-start-column="56" selection-end-line="19" selection-end-column="56" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/EntidadVirtual/horarios/horariosLogic.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="476">
-          <caret line="28" column="9" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
+        <state relative-caret-position="153">
+          <caret line="60" column="27" selection-start-line="60" selection-start-column="27" selection-end-line="60" selection-end-column="27" />
           <folding>
-            <element signature="e#11#34#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/EntidadVirtual/API_REST/__init__.py b/EntidadVirtual/API_REST/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/EntidadVirtual/API_REST/test_cerradura.py b/EntidadVirtual/API_REST/test_cerradura.py
index 2243e72..0a03d69 100644
--- a/EntidadVirtual/API_REST/test_cerradura.py
+++ b/EntidadVirtual/API_REST/test_cerradura.py
@@ -1,9 +1,11 @@
-from flask import Flask
-import time
+from flask import Flask, request, jsonify
+
+
 import paho.mqtt.client as paho
 app = Flask(__name__)
-broker="broker.hivemq.com"
-
+topico = "conjunto1/residencia1/cerradura"
+client = paho.Client()
+client.connect("broker.mqtt-dashboard.com", 1883)
 
 #Insertar una cerradura
 @app.route("/cerradura", methods=["POST"])
@@ -14,30 +16,45 @@ def insert_cerradura():
     hora_fin = request.json['hora_fin']
 
     nuevo_candado = "0;"+password+";"+posicion;
-    #Escribir y publicar mensaje
 
+    #hl.agregar_candado(hora_inicio, hora_fin, posicion)
+    client.publish("horariocandado", hora_inicio+";"+hora_fin+";"+posicion)
+    client.publish(topico, nuevo_candado)
+    return jsonify(nuevo_candado)
 
-@app.route("/cerradura", methods=["UPDATE"])
+
+@app.route("/cerradura", methods=["PUT"])
 def update_cerradura():
     password = request.json['password']
     posicion = request.json['posicion']
     nuevo_candado = "1;"+password+";"+posicion;
+    client.publish(topico, nuevo_candado)
+    return jsonify(nuevo_candado)
 
 
 @app.route("/cerradura", methods=["DELETE"])
 def delete_cerradura():
     posicion = request.json['posicion']
-    nuevo_candado = "2;" + posicion;
+    nuevo_candado = "2;" + posicion
+    client.publish(topico, nuevo_candado)
+    return jsonify(nuevo_candado)
+
+
 
 @app.route("/cerradura_all", methods=["DELETE"])
 def delete_all_cerraduras():
     mensaje = "3"
+    client.publish(topico,mensaje)
+    return jsonify(mensaje)
 
 
-@app.route("/cerradura", methods = ["PUT"])
+@app.route("/cerraduraHorario", methods = ["PUT"])
 def change_state_cerradura():
     posicion = request.json['posicion']
-    mensaje = "4;"posicion;
+    mensaje = "4;"+posicion
 
 if __name__ == '__main__':
     app.run(debug=True)
+
+
+
diff --git a/EntidadVirtual/horarios/__init__.py b/EntidadVirtual/horarios/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/EntidadVirtual/horarios/__pycache__/__init__.cpython-36.pyc b/EntidadVirtual/horarios/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..95d7770d0731691b75490f29833f0da4dbf2f3c6
GIT binary patch
literal 173
zcmXr!<>gu^_9==12p)q77+?f49Dul(1xTbY1T$zd`mJOr0tq9CUs29hF`>n&Ma3~u
zr8&8YF)sPZrManjCB-rBnI#^jNijwSh8Bhf@dk$R#rbI^#i_}qMVTd)F|K(fnJI}W
wVVOlGrHMH)8TmztMVa}<G4b)4d6^~g@p=W7w>WHa^HWN5Qtd!?76UN@0AmC%3jhEB

literal 0
HcmV?d00001

diff --git a/EntidadVirtual/horarios/__pycache__/horariosLogic.cpython-36.pyc b/EntidadVirtual/horarios/__pycache__/horariosLogic.cpython-36.pyc
index 1557402049dd32b4c13049fe5834f56ec1752084..88cd127e552a462f141bbe29207e1e20eb094d44 100644
GIT binary patch
literal 2800
zcma)8UvJws5GO@RmL11&(llw(t$%>6fVS05+5#KeV(6Bx-G(81ShoV22SFBDM~*Ey
zB#otp^W;7a=)T9k$36vL_te)t_Gx#N<GSezR05BGbh_i+{qD$H%gZ(M>A%s}0U`g8
zg~x^QeQ4@$Ae?a8CsEncp3`HIYuCKUv%Mer+(|0X0%%pvxci($HSTdA`X%A^>QfRi
zQ4=h#i6x-Wdds}RgQ-Iaj2pZ<rIhemwDO4XC0>6{cwIE7EL!c7WQ{NL21q)`S9lZp
zb-v2ipg+&g@pb4ogxA{?8&ks1zo5|taiO<0B_Ma3Z&<1HClYSH1WU-iAt}QFJlLb1
zd(hN65Dj)}I&r3Sli2?V{O9bCy+OwBTnQcH4P};V!<3dGGk)671WbdG5|Sr6i5M{c
zMPvnJy^8nlw10*VsvV8`gQWeSNJj%;SM5ic{&v)9-`v^#Vs|Ir*^O24R4b8=WTv0B
zzsYsR6aGsk^(g7L4+@#ctWfj84@EaiTf=9jR^;(;)ahsHpoSJWKnRsppmP(^yt#>=
zz(kXY)1y;*!X~Wea2T~&!V)*}w6B?VwKruDhSKm?^ln&@_`j(PlV|-R;l@+Lex}V5
z?kmpnEX@iN*vZo@H^Hz_xRjffq$@=?k#U;jU``Rb(gQ)#M`>)Jx`rNGN0kKdN32By
zp;Xcp%P?2SOPm^QQh5$W<E@S?4uxzDj<mkc6Lruj63JU>G01)epPR<aSu>U6%W0AK
zM!7C_Z%CmsF7h->c5kFY%7l+(lA`?62i<ocnz{!>kce^;frGdM_+m3eyE8<4h+J6r
zd6n0ouat<50=^80X_(4hX>^Jv<AXgauu%I91`}sO4~c9}K*i_e1ZEQw<0^^igaLIX
zE>Jd$#7o>%=$aZ@_+9Ds3XUIw)4eR`;@J2?X>_z_TqXKXCAv^HkZd8@MuNy(aCi`7
z2z4A^f^}5~LTCW5Z{KlqW=89jEv3i;5BAusJs745=^<w5en{me%%Qso-C2bz91vmA
zQbOk%@XUZa-aOTIhUfj1UU;|C`dlDDG+fZQ{+32yct3UM(s$TcMRhhL80b^$Ru^^I
zukWV_!}bnEHB?jv{l<c(wM9+k=ea7xAY#$R?N1nJh#S-c(sNEIVz9>mm6s;eqSDSM
z)P+iUNQ>L>)jg!S>p<uwhnZK0Ui-a@hO)1#uu{X)iOKSUK^5@;!Crn1IprTSKL3CC
zD#&M%9_-5v*wxs%eODsBLK?B7LOmWkx9&a+mrMX<R_JUX49kn(jX%ipkrozl5)n|M
z94&;3Rn|u1>0+3rwv5?K2ptQ}hyf1I;&U}gvFc{yxo2;JEVTxN&^oO_ZhS<yZH8>q
z@z$xQ-}-AmtQttJJQ;{MHnlh&6nxajaXpTYKtuUOegJaihe$93<z*ySkYHjgY|iE_
z)<}6C2>xKR6>>EQSozv7ZxsG{piwpyegXl;lJA}{4W~F18-}Ovti(JHnH6Dzv@BlA
z_*o7In1<5*W-W<aWLemr-B}Z~e1$v11B1{8mAEp89)@#X0<kOs^Z;P<a~4X6Bk_nb
zY*-8d^0sQ7DOimT#0+9H+u}oDKRx%Z!}yJYKCe%>JGexYhS~~+Y8JLX_pYhW<m-YL
z>ifBLN46HFqhtonX3=dJ9JkOIJWVM%zNDQ8<hP9zYaoZq1jXve@IrF5_JkZcPs*LJ
z66-H(AOK3cYhmrFz7Rv}2aAD_8k#O_)t-~}Io^07e}vx^${^GMfZ{7}p-5_coye|$
z`-;eUcu`)3Rnr_M2ZcRBTeItni^r)woQ;bgO;sOAk?<_<${qMct{{1h0K8z>^Vs-%
z<prn$=WH%g9aYt+qf(i5g!~wl`9-G(>lRm~O$Z5zp|T#e8#Vr8tIyB`ZWpj+Ez!9P
uM!$|vaIZ|HFEIoPgAzbmLK-+Oh1Y>p2+HFNlhtL-t1b(?z=c+60N;OL&Q47L

literal 2096
zcma(SU27aSP}=Xi+w)h_xNh9mO`&k5bqL8raY_gnS_<U|gqE^3EV`BK+x6Y*EbWDQ
z@!RD!f1+>wOM2}~{S%s}&S=-p`I40EqR~h*nlH_a9`^g)yZ`=^yz&Y8n=E}E;7?)b
zKLK#U>4YTBObe%Q6A$*Bi9ZdJfD-O<?<Gk>?(+cVh=)9axg)%yyC8`xLgA*NhyX^S
z0}w{h;~m~zIFtY$^WK75tiK>2FHY8eB)repUJ|}0))#IPoRDNg1bm%u@J(26ij87R
zY~m?SpOeAXCD=)Z18TxUR&vH==Hd=~IHNm<F!XHz6&$JPg|ndB#0nrFz!}#5H0K9<
z1IPF?m6w%qb)^Qb39?BpU>VJ|P@GlFxWM=qQ4z>`{p9fA=ocX9qu+#*dx<E^ygYh#
zo{gEBK2x#~S*4H0QZbdwH^|TOB+vF|=cX&mbT%JNay<^wKnDP!stYhftMSA6+Jik<
zEPKG6Z35o7H@tC&b^Lrj(wWLf0-SnH!7qi8P$+2NDY$T=0tBem^iC8jE5Xw<sjXuT
z=pZcy6ZMs_9_(Bh*$4dHVg4E@6}fN<$|1;=1DG}Ndga|P*BL65JMgWE#;@co&#a}!
z1%pgDW9Jje_`rQ*H{60gSv3`-ITc#76S2Nz=oaAh&Pd5qq4uX|RrM`rdOVU$@%>Cr
z^WPx`^=>B1VqRAA!F?rk&PAE!?7@9D5vpSK=kKOwLMg`Qie;eU`ol|n3PV2vAV@+v
zNgPhO16AR+)#A0);<wcjU_Agm<UL5oSfPv?8Gsu$hwlJ#K`%%O0R{+n576P5#dHV>
z+r@1Asm!xnnh^0H^3wQu$;BT7&v;r)j!h5u)4XAd?BX~t)kh$DHKqZwRq1Cy(wH!W
z2JqKwZJq5m<cuN-KAdq_Q<49I6s>7g-GcRiD)eAg%{pf)U9##+;As=B-oDbc!t-HD
zvF6{SG`<!H-hZ{E@%CF9f#Ji{VGQ4+u7m2Di&)aNxva}lZz#e_wZVJ=NJR>0zz|Z`
zgT{91%iU(@)Gs{;;;s%VukfpYLw*$DHZ*DOzH%ukzgsy;<*)5Y+MZPHN$=)Kn^*p@
zb{;)ec(33ZmR9XNd_0Iu1PxJC`BWIMfnzyW3L|bS6)LysZE6j-{wFk>EUV^hlGhL+
zp(|+M-@pltJ(kdW^kW$H&Q+k^;vJ$XX<D+WNK?~I)2Zb13F2{@o`KwkqIS@VPY~Qi
zu#4ae1gK{TVBfP9_$eS7n{h-VKXUQ6`<KXZiRpZ4gK|qDr`edXv9uj#zkM}4Y&T6T
zJS3Vv<~Y6u_6e}UY`0g~O%--36C5@#P6$1xg!jXAuG_DPCsNMRW2wXoXgwHJ6UY(1
zGA7EJmk;`7i<yAUW}@Uvo>@n2TaUhPg7gF((DwjDG<IS)^6YP`JfJb{(ujKQ#vKpv
F{{Shr%!2>`

diff --git a/EntidadVirtual/horarios/horariosLogic.py b/EntidadVirtual/horarios/horariosLogic.py
index 941fa15..1c31a7d 100644
--- a/EntidadVirtual/horarios/horariosLogic.py
+++ b/EntidadVirtual/horarios/horariosLogic.py
@@ -3,30 +3,20 @@
 import threading
 import time
 
-from click._compat import _force_correct_text_reader
-
+posicion = 0
+hora_inicio = 0
+hora_fin = 0
 
 def on_publish(client, userdata, mid):
     print("mid: "+str(mid))
 
-
-"""def on_subscribe(client, userdata, mid, granted_qos):
+def on_subscribe(client, userdata, mid, granted_qos):
     print("Subscribed: " + str(mid) + " " + str(granted_qos))
-
-
-def on_message(client, userdata, msg):
-    print(msg.topic + " " + str(msg.qos) + " " + str(msg.payload))
-
-"""
 client = paho.Client()
+client.on_subscribe = on_subscribe
 client.on_publish = on_publish
-"""client.on_subscribe = on_subscribe
-client.on_message = on_message"""
-client.connect("broker.mqtt-dashboard.com", 1883)
-"""client.subscribe("conjunto1/residencia1/alerta")
-#client.loop_forever()"""
 topic = "conjunto1/residencia1/cerradura"
-
+client.connect("broker.mqtt-dashboard.com", 1883)
 
 class Candado(object):
     def __init__(self, hora_inicio, hora_fin, index, estado):
@@ -62,15 +52,14 @@ def actualizar_estado(self):
 
 
 candados = []
-candado1 = Candado(10, 15, 1, True)
-candado2 = Candado(13, 18, 2, True)
-candados.append(candado1)
-candados.append(candado2)
 
 
-def agregar_candado(hora_inicio, hora_fin, index, estado):
-    cand = Candado(hora_inicio, hora_fin, index, estado)
+def agregar_candado(hora_inicio, hora_fin, index):
+    cand = Candado(hora_inicio, hora_fin, index, True)
     candados.insert(index, cand)
+    print("candado agregado")
+c = agregar_candado(11,15,3)
+c2 = agregar_candado(13,17,2)
 
 
 def borrar_candado(index):
@@ -83,12 +72,29 @@ def borrar_todos():
 
 
 def actualizador():
+    print("aacr")
     while True:
         time.sleep(60)
         for c in candados:
             time.sleep(10)
             c.actualizar_estado()
 
+def on_message(client, userdata, msg):
+    global hora_inicio,hora_fin,posicion
+    x=str(msg.payload)
+    x=x[2:-1]
+    print(x)
+    hora_inicio, hora_fin, posicion = x.split(";")
+    agregar_candado(int(hora_inicio),int(hora_fin),int(posicion))
+client.on_message = on_message
 a = threading.Thread(target=actualizador())
 a.start()
 
+client.subscribe("horariocandado")
+client.loop_forever()
+
+
+
+
+print("end")
+
diff --git a/EntidadVirtual/notificadores/listenerHeartbeat.py b/EntidadVirtual/notificadores/listenerHeartbeat.py
index 86b1040..1c2cc57 100644
--- a/EntidadVirtual/notificadores/listenerHeartbeat.py
+++ b/EntidadVirtual/notificadores/listenerHeartbeat.py
@@ -79,7 +79,7 @@ def on_message(client, userdata, msg):
 client.on_subscribe = on_subscribe
 client.on_message = on_message
 client.on_connect = on_connect
-client.connect("broker.mqttdashboard.com", 1883)
+client.connect("broker.mqtt-dashboard.com", 1883)
 client.subscribe("conjunto1/residencia1/alerta")
 client.loop_forever()