Cambios Windmy

alarms/apps.py → citas/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class AlarmsConfig(AppConfig):
+class CitasConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'alarms'
+    name = 'citas'

citas/logic/logic_cita.py

@@ -0,0 +1,17 @@
+from plantillas.models import Plantilla
+from ..models import Cita
+
+def get_citas():
+    queryset = Cita.objects.all().order_by('-dateTime')
+    return (queryset)
+
+def get_plantillas_by_historia(historia):
+    queryset = Plantilla.objects.filter(historia=historia).order_by('-dateTime')[:10]
+    return (queryset)
+
+def create_cita( historia, plantilla):
+    cita = Cita()
+    cita.historia = historia
+    cita.plantilla = plantilla
+    cita.save()
+    return cita

citas/models.py

@@ -0,0 +1,19 @@
+from django.db import models
+from historias.models import Historia
+from plantillas.models import Plantilla
+
+class Cita(models.Model):
+    historia = models.ForeignKey(Historia, on_delete=models.CASCADE, default=None)
+    plantilla = models.ForeignKey(Plantilla, on_delete=models.CASCADE, default=None)
+    dateTime = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return '{"historia": %s}' % (self.historia.name)
+
+    def toJson(self):
+        cita = {
+            'historia': self.historia.name,
+            'historia': self.plantilla.nombre,
+            'dateTime': self.dateTime,
+        }
+        return cita

alarms/urls.py → citas/urls.py

@@ -4,6 +4,6 @@
 from . import views
 
 urlpatterns = [
-    path('alarms/', views.alarm_list),
-    path('alarmsValidate/<int:variable_id>', views.generate_alarm),
+    path('citas/', views.cita_list),
+    path('citasValidate/<int:variable_id>', views.generate_cita),
 ]

citas/views.py

@@ -0,0 +1,25 @@
+from django.http import JsonResponse
+from django.shortcuts import render
+from historias.logic.historia_logic import get_historia_by_name
+from .logic.logic_cita import get_citas, get_plantillas_by_historia, create_cita
+
+
+def cita_list(request):
+    citas = get_citas()
+    context = list(citas.values())
+    return JsonResponse(context, safe=False)
+
+def generate_cita(request, historia_name):
+    historia = get_historia_by_name(historia_name)
+    plantillas = get_plantillas_by_historia(historia_name)
+    createcita = False
+    upperPlantilla = None
+    for plantilla in plantillas:
+        if plantilla.especificacion == 'Emergencia':
+            createCita = True
+            upperPlantilla = plantilla
+    if createcita:
+        cita = create_cita(historia, plantilla)
+        return JsonResponse(cita.toJson(), safe=False)
+    else:
+        return JsonResponse({'message': 'No cita created'}, status=200)

historias/admin.py

@@ -0,0 +1,4 @@
+from django.contrib import admin
+from . models import Historia
+
+admin.site.register(Historia)

historias/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class HistoriasConfig(AppConfig):
+    name = 'historias'

variables/forms.py → historias/forms.py

@@ -1,12 +1,12 @@
 from django import forms
-from .models import Variable
+from .models import Historia
 
-class VariableForm(forms.ModelForm):
+class HistoriaForm(forms.ModelForm):
     class Meta:
-        model = Variable
+        model = Historia
         fields = [
             'name',
         ]
         labels = {
             'name': 'Name',
-        }
+        }

historias/logic/historia_logic.py

@@ -0,0 +1,16 @@
+
+
+from ..models import Historia
+
+def get_historia_by_name(name):
+    queryset = Historia.objects.get(name=name)
+    return (queryset)
+
+def get_historias():
+    queryset = Historia.objects.all()
+    return (queryset)
+
+def create_historia(form):
+    plantilla = form.save()
+    plantilla.save()
+    return ()

variables/models.py → historias/models.py

@@ -1,8 +1,9 @@
 from django.db import models
 
-class Variable(models.Model):
+class Historia(models.Model):
     name = models.CharField(max_length=50)
 
     def __str__(self):
         return '{}'.format(self.name)
 
+

variables/templates/Variable/variableCreate.html → historias/templates/Historia/historiaCreate.html

@@ -1,12 +1,12 @@
-{% extends 'base.html' %}

-{% block content %}

-<form method="POST">

+{% extends 'base.html' %}
+{% block content %}
+<form method="POST">
     {% csrf_token %}
     <br>
-    {{ form.as_p }}

+    {{ form.as_p }}
     <button type="submit" class="btn btn-success waves-effect waves-light">Create</button>
     <button type="button" class="btn btn-primary waves-effect waves-light"
-                                onClick=" window.location.href='/variables' ">Back
+                                onClick=" window.location.href='/historias' ">Back
     </button>
-</form>

+</form>
 {% endblock %}

variables/templates/Variable/variables.html → historias/templates/Historia/historias.html

@@ -4,10 +4,10 @@
 <div class="content">
     <div class="">
         <div class="page-header-title">
-            <h4 class="page-title">Variables</h4>
+            <h4 class="page-title">Historias</h4>
             <div style="text-align:right;">
                 <button type="button" class="btn btn-success waves-effect waves-light"
-                        onClick=" window.location.href='/variablecreate' " style="text-align:center;">+
+                        onClick=" window.location.href='/historiacreate' " style="text-align:center;">+
                 </button>
             </div>
         </div>
@@ -25,14 +25,14 @@ <h4 class="page-title">Variables</h4>
                     <table class="table table-hover">
                         <thead>
                         <tr style="color:#0E2EB0">
-                            <th>Variable</th>
+                            <th>Historia</th>
                         </tr>
                         </thead>
                         <tbody>
 
-                        {% for variable in variable_list %}
+                        {% for historia in historia_list %}
                         <tr>
-                            <td>{{ variable.name }}</td>
+                            <td>{{ historia.name }}</td>
                         </tr>
                         {% endfor %}
 
@@ -51,4 +51,4 @@ <h4 class="page-title">Variables</h4>
         </div>
     </div>
 </div>
-{% endblock %}
+{% endblock %}

historias/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+from django.views.decorators.csrf import csrf_exempt
+
+from . import views
+
+urlpatterns = [
+    path('historias/', views.historia_list, name='historiaList'),
+    path('historiacreate/', csrf_exempt(views.historia_create), name='historiaCreate'),
+]

historias/views.py

@@ -0,0 +1,30 @@
+from django.shortcuts import render
+from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from .forms import HistoriaForm
+from .logic.historia_logic import get_historias, create_historia
+
+def historia_list(request):
+    historias = get_historias()
+    context = {
+        'historia_list': historias
+    }
+    return render(request, 'Historia/historias.html', context)
+
+def historia_create(request):
+    if request.method == 'POST':
+        form = HistoriaForm(request.POST)
+        if form.is_valid():
+            create_historia(form)
+            messages.add_message(request, messages.SUCCESS, 'Successfully created historia')
+            return HttpResponseRedirect(reverse('historiaCreate'))
+        else:
+            print(form.errors)
+    else:
+        form = HistoriaForm()
+
+    context = {
+        'form': form,
+    }
+    return render(request, 'Historia/historiaCreate.html', context)

kong.yml

@@ -1,35 +1,35 @@
 _format_version: "2.1"
 
 services:
-  - host: monitoring_upstream
-    name: monitoring_service
+  - host: windmy_upstream
+    name: windmy_service
     protocol: http
     routes:
 
-      - name: monitoring
+      - name: windmy
         paths:
           - /
         strip_path: false
 
-  - host: alarms_upstream
-    name: alarms_service
+  - host: citas_upstream
+    name: citas_service
     protocol: http
     routes:
 
-      - name: alarms
+      - name: citas
         paths:
-          - /alarms
-          - /alarmsValidate/
+          - /citas
+          - /citasValidate/
         strip_path: false
 
 upstreams:
-  - name: alarms_upstream
+  - name: citas_upstream
     targets:
-      - target: <ip-privada-alarms-app-a>:8080
+      - target: <ip-privada-citas-app-a>:8080
         weight: 100
-      - target: <ip-privada-alarms-app-b>:8080
+      - target: <ip-privada-citas-app-b>:8080
         weight: 100
-      - target: <ip-privada-alarms-app-c>:8080
+      - target: <ip-privada-citas-app-c>:8080
         weight: 100
     #healthchecks:
     #  threshold: 0
@@ -43,9 +43,9 @@ upstreams:
     #      tcp_failures: 0
     #      interval: 0
 
-  - name: monitoring_upstream
+  - name: windmy_upstream
     targets:
-      - target: <ip-privada-monitoring-app>:8080
+      - target: <ip-privada-windmy-app>:8080
         weight: 100
 
 

manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "monitoring.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "windmy.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: