First-change-branch

Jmeter-test/Load-tests.jmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jmeterTestPlan version="1.2" properties="4.0" jmeter="4.0 r1823414">
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.4.3">
   <hashTree>
     <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
       <stringProp name="TestPlan.comments"></stringProp>
@@ -18,22 +18,23 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">10</stringProp>
+        <stringProp name="ThreadGroup.num_threads">1000</stringProp>
         <stringProp name="ThreadGroup.ramp_time">10</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
+        <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
       </ThreadGroup>
       <hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="GET Request" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">172.10.10.10</stringProp>
+          <stringProp name="HTTPSampler.domain">172.24.41.140</stringProp>
           <stringProp name="HTTPSampler.port">8082</stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/measurements/</stringProp>
+          <stringProp name="HTTPSampler.path">/psicologos/</stringProp>
           <stringProp name="HTTPSampler.method">GET</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -160,51 +161,38 @@
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <stringProp name="LoopController.loops">1</stringProp>
         </elementProp>
-        <stringProp name="ThreadGroup.num_threads">10</stringProp>
+        <stringProp name="ThreadGroup.num_threads">0</stringProp>
         <stringProp name="ThreadGroup.ramp_time">10</stringProp>
         <boolProp name="ThreadGroup.scheduler">false</boolProp>
         <stringProp name="ThreadGroup.duration"></stringProp>
         <stringProp name="ThreadGroup.delay"></stringProp>
+        <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
       </ThreadGroup>
       <hashTree>
         <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="POST Request" enabled="true">
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
-              <elementProp name="variable" elementType="HTTPArgument">
+              <elementProp name="dateTime" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">1</stringProp>
+                <stringProp name="Argument.value">2006-10-25</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">variable</stringProp>
+                <stringProp name="Argument.name">dateTime</stringProp>
               </elementProp>
-              <elementProp name="value" elementType="HTTPArgument">
+              <elementProp name="plataforma" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">22.1</stringProp>
+                <stringProp name="Argument.value">Zoom</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">value</stringProp>
-              </elementProp>
-              <elementProp name="unit" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">C</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">unit</stringProp>
-              </elementProp>
-              <elementProp name="place" elementType="HTTPArgument">
-                <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">ML500</stringProp>
-                <stringProp name="Argument.metadata">=</stringProp>
-                <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                <stringProp name="Argument.name">place</stringProp>
+                <stringProp name="Argument.name">plataforma</stringProp>
               </elementProp>
             </collectionProp>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">172.10.10.10</stringProp>
+          <stringProp name="HTTPSampler.domain">172.24.41.140</stringProp>
           <stringProp name="HTTPSampler.port">8082</stringProp>
           <stringProp name="HTTPSampler.protocol"></stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">/measurementcreate/</stringProp>
+          <stringProp name="HTTPSampler.path">/citacreate/</stringProp>
           <stringProp name="HTTPSampler.method">POST</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>

README.md

@@ -0,0 +1,4 @@
+# ISIS2503-MonitoringApp
+Web application for monitoring physical variables in python Djan
+
+Grupo2.

acompanantes/admin.py

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

acompanantes/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class AcompananteConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'acompanantes'

acompanantes/forms.py

@@ -0,0 +1,14 @@
+from django import forms
+from .models import Acompanante
+
+class AcompananteForm(forms.ModelForm):
+    class Meta:
+        model = Acompanante
+        fields = [
+            'nombre',
+            'edad',
+        ]
+        labels = {
+            'nombre': 'Nombre',
+            'edad': 'Edad',
+        }

acompanantes/logic/acompanante_logic.py

@@ -0,0 +1,14 @@
+
+#HOla
+
+from ..models import Acompanante
+
+def get_acompanante():
+    acompanante = Acompanante.objects.all()
+    return acompanante
+
+def create_acompanante(form):
+    acompanante = form.save()
+    acompanante.save()
+    return ()
+

acompanantes/models.py

@@ -0,0 +1,15 @@
+
+from django.db import models
+"""
+from estudianteEstrella.models import EstudianteEstrella
+"""
+class Acompanante(models.Model):
+
+    nombre = models.CharField(max_length=50)
+
+    edad = models.FloatField(null=True, blank=True, default=None)
+    """
+    estudiante = models.ForeignKey(EstudianteEstrella, on_delete=models.CASCADE, default=None)
+    """
+    def __str__(self):
+        return '%s %s' % (self.edad, self.nombre)

acompanantes/templates/Acompanante/acompananteCreate.html

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

+{% block content %}

+<form method="POST">

+    {% csrf_token %}
+    <br>
+    {{ 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='/acompanantes' ">Back
+    </button>
+</form>

+{% endblock %}

acompanantes/templates/Acompanante/acompanantes.html

@@ -0,0 +1,61 @@
+{% extends 'base.html' %}
+{% block content %}
+
+<div class="content">
+    <div class="">
+        <div class="page-header-title">
+            <h4 class="page-title">Last Ten Acompanantes</h4>
+            <!--- 
+            <div style="text-align:right;">
+                <button type="button" class="btn btn-success waves-effect waves-light"
+                        onClick=" window.location.href='/measurementcreate' " style="text-align:center;">+
+                </button>
+            </div>
+            --->
+        </div>
+    </div>
+
+    <br>
+
+    <div class="page-content-wrapper">
+        <div class="container">
+            <!-- Content page -->
+
+            <div class="panel panel-default">
+                <div class="panel-body">
+                    <table class="table table-hover">
+                        <thead>
+                        <tr style="color:#0E2EB0">
+                            <!---<th font color="red">Variable</th>--->
+                            <th>Nombre</th>
+                            <th>Edad</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+
+                        {% for acompanante in acompanante_list %}
+                        <tr>
+
+                            <td>{{ acompanante.nombre }}</td>
+                            <td>{{ acompanante.edad  }}</td>
+
+                        </tr>
+                        {% endfor %}
+
+                        </tbody>
+                    </table>
+
+                    <div style="text-align:center;">
+                        <button type="button" class="btn btn-primary waves-effect waves-light"
+                                onClick=" window.location.href='/' ">
+                            Back
+                        </button>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}

acompanantes/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

acompanantes/urls.py

@@ -0,0 +1,11 @@
+
+from django.urls import path
+from django.views.decorators.csrf import csrf_exempt
+
+from . import views
+
+urlpatterns = [
+    path('acompanantes/', views.acompanante_list),
+    path('acompanantecreate/', csrf_exempt(views.acompanante_create), name='acompananteCreate'),
+]
+

acompanantes/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 AcompananteForm
+from .logic.acompanante_logic import get_acompanante, create_acompanante
+
+def acompanante_list(request):
+    acompanantes = get_acompanante()
+    context = {
+        'acompanante_list': acompanantes
+    }
+    return render(request, 'Acompanante/acompanantes.html', context)
+
+def acompanante_create(request):
+    if request.method == 'POST':
+        form = AcompananteForm(request.POST)
+        if form.is_valid():
+            create_acompanante(form)
+            messages.add_message(request, messages.SUCCESS, 'Successfully created acompanante')
+            return HttpResponseRedirect(reverse('acompananteCreate'))
+        else:
+            print(form.errors)
+    else:
+        form = AcompananteForm()
+
+    context = {
+        'form': form,
+    }
+    return render(request, 'Acompanante/acompananteCreate.html', context)

citas/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .models import Cita
+
+# Register your models here.
+admin.site.register(Cita)

citas/apps.py

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

citas/forms.py

@@ -0,0 +1,16 @@
+from django import forms
+from .models import Cita
+
+class CitaForm(forms.ModelForm):
+    class Meta:
+        model = Cita
+        fields = [
+            'psicologo',
+            'dateTime',
+            'plataforma',   
+        ]
+        labels = {
+            'psicologo': 'Psicologo',
+            'dateTime': 'DateTime',
+            'plataforma': 'Plataforma',
+        }

citas/logic/cita_logic.py

@@ -0,0 +1,14 @@
+
+#HOla
+
+from ..models import Cita
+
+def get_citas():
+    queryset = Cita.objects.all().order_by('-dateTime')[:10]
+    return queryset
+
+def create_cita(form):
+    cita = form.save()
+    cita.save()
+    return ()
+

citas/models.py

@@ -0,0 +1,17 @@
+from django.db import models
+
+# Create your models here. hola
+from psicologos.models import Psicologo
+
+#from acompanantes.models import Acompanante
+#from estudianteEstrella.models import EstudianteEstrella
+
+class Cita(models.Model):
+    psicologo = models.ForeignKey(Psicologo, on_delete=models.CASCADE, default=None)
+    #acompanantes = models.ForeignKey(Acompanante, on_delete=models.CASCADE, default=None) 
+    #estudianteEstrella = models.ForeignKey(EstudianteEstrella, on_delete=models.CASCADE, default=None)
+    dateTime = models.DateTimeField(auto_now=False, auto_now_add=False)
+    plataforma = models.CharField(max_length=50)
+
+    def __str__(self):
+        return '%s %s' % (self.dateTime, self.plataforma)

citas/serializers.py

@@ -0,0 +1,9 @@
+from rest_framework import serializers
+from . import models
+
+
+class CitaSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        fields = ('id','psicologo', 'dateTime', 'plataforma',)
+        model = models.Cita

citas/templates/Cita/citaCreate.html

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

+{% block content %}

+<form method="POST">

+    {% csrf_token %}
+    <br>
+    {{ 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='/citas' ">Back
+    </button>
+</form>

+{% endblock %}