Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
564860f
agregando el documento con su revision y actualizacion
ElAlef Apr 23, 2023
d105851
creada la carpeta con el proyecto de Angular
SebaOlimaQ Apr 25, 2023
1f53595
Merge remote-tracking branch 'origin/E-Commerce_Desarrollo' into fron…
SebaOlimaQ Apr 25, 2023
1f77126
subiendo diseños SPA para el turnero
ElAlef Apr 25, 2023
e26ce58
Merge pull request #40 from ElAlef/RamaAlejandro
ElAlef Apr 25, 2023
c653ad3
instalacion de bootstrap y creacion del componente header
SebaOlimaQ Apr 26, 2023
4fa8050
Merge branch 'E-Commerce_Desarrollo' of https://github.com/ElAlef/Pro…
SebaOlimaQ Apr 26, 2023
afbd0e3
creando componente de login en router, falta vincular con boton en he…
VeroNievas Apr 27, 2023
7340f5b
Merge pull request #60 from ElAlef/RamaNatalia
natalialamia May 3, 2023
0a8f462
Merge pull request #62 from ElAlef/frontvero
VeroNievas May 3, 2023
e122881
ACtualizando los cambios a mi rama..
ElAlef May 3, 2023
519fade
actualizando los cambios a mi rama...
ElAlef May 3, 2023
69f8741
Creando componente de servicios y navegabilidad de boton iniciar sesión
SebaOlimaQ May 3, 2023
dd2259e
Merge pull request #63 from ElAlef/frontseba
SebaOlimaQ May 3, 2023
8e971e8
creando componente de registro y vinculando con login
VeroNievas May 4, 2023
359c506
Merge pull request #64 from ElAlef/frontvero
VeroNievas May 4, 2023
f7d8afe
creando componente de contacto
SebaOlimaQ May 4, 2023
8c1d1ac
resolviendo conflicto de merge
SebaOlimaQ May 4, 2023
276d2aa
Merge pull request #65 from ElAlef/frontseba
SebaOlimaQ May 4, 2023
0e19d4e
resolviendo conflicto de merge
SebaOlimaQ May 4, 2023
17e235b
Merge pull request #66 from ElAlef/frontseba
SebaOlimaQ May 4, 2023
d86160f
Merge branch 'E-Commerce_Desarrollo' of https://github.com/ElAlef/Pro…
ElAlef May 5, 2023
91946a8
agregando estilo a la la pagina
ElAlef May 5, 2023
231a636
cambio de estilos de login, vinculación con registro y con nuevo comp…
SebaOlimaQ May 5, 2023
3056a54
Merge pull request #68 from ElAlef/frontseba
SebaOlimaQ May 5, 2023
81e1ebb
crando componente footer
ElAlef May 5, 2023
029732e
agregando los estilos del footer
ElAlef May 5, 2023
c3c1ed9
eliminando estilos generales
SebaOlimaQ May 6, 2023
c67be49
Merge pull request #70 from ElAlef/frontseba
SebaOlimaQ May 6, 2023
b6f7bde
repararndo errores
ElAlef May 6, 2023
0365a44
recuperando cambios en los estilos de NuestrosServicios_cards
ElAlef May 6, 2023
f441355
editando estilos
ElAlef May 6, 2023
831c41a
editando formato de imagen y cards
ElAlef May 6, 2023
b83b1ca
subiendo diagrama de la base de datos y script con la opción de pago …
VeroNievas May 7, 2023
e4ee587
subiendo diagrama de clases con opción de pago de consultas
VeroNievas May 7, 2023
79ca12d
Merge pull request #72 from ElAlef/frontvero
VeroNievas May 7, 2023
dd00beb
Merge pull request #73 from ElAlef/frontvero
VeroNievas May 7, 2023
2d69c6d
edicion de estilos en contactos
ElAlef May 7, 2023
fd6b07f
agregando boton "sacar turno"
ElAlef May 8, 2023
5b2171b
Merge branch 'E-Commerce_Desarrollo' into RamaAlejandro
ElAlef May 8, 2023
384b6dd
resolviendo conflicto
ElAlef May 8, 2023
10d92a2
Merge pull request #74 from ElAlef/RamaAlejandro
ElAlef May 8, 2023
28ea6ba
resolviendo conflictos
ElAlef May 8, 2023
64193b2
corrigiendo errores en ruteo del boton sacar turno y sintaxis en app.…
ElAlef May 13, 2023
5ad389b
creando api en Django
ElAlef May 15, 2023
05a6af1
agregando cambios
ElAlef May 15, 2023
6513e9b
corrigiendo error en la creacion de entorno virtual y volviendo a cre…
ElAlef May 15, 2023
8353f72
agregando modificaciones
ElAlef May 15, 2023
5fb3e19
agregando mods
ElAlef May 15, 2023
deab53a
creando componente de especialistas, service y conexion a json
SebaOlimaQ May 17, 2023
cafb15f
Merge branch 'E-Commerce_Desarrollo' into frontseba
SebaOlimaQ May 17, 2023
5da35eb
Merge pull request #76 from ElAlef/frontseba
SebaOlimaQ May 17, 2023
96ff36e
resolviendo merge
SebaOlimaQ May 17, 2023
0494e62
resolviendo merge
SebaOlimaQ May 17, 2023
a7dcc26
subiendo proyecto django con la migracion y conexin al servidor
ElAlef May 18, 2023
c3b5095
actualizando rama
ElAlef May 18, 2023
7d64f1c
guardando cambios
ElAlef May 18, 2023
6c8939c
actualizando cambios
ElAlef May 18, 2023
983848d
actualizando angular
ElAlef May 18, 2023
281befe
subiendo cambios
SebaOlimaQ May 18, 2023
76e4a47
Merge branch 'E-Commerce_Desarrollo' of https://github.com/ElAlef/Pro…
SebaOlimaQ May 18, 2023
73b86c2
subiendo cambios
SebaOlimaQ May 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
"python.formatting.provider": "none"
}
6 changes: 6 additions & 0 deletions Backend/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
"python.formatting.provider": "none"
}
Empty file added Backend/TurneroRF/__init__.py
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Backend/TurneroRF/__pycache__/wsgi.cpython-311.pyc
Binary file not shown.
16 changes: 16 additions & 0 deletions Backend/TurneroRF/asgi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
ASGI config for TurneroRF project.

It exposes the ASGI callable as a module-level variable named ``application``.

For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/
"""

import os

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TurneroRF.settings')

application = get_asgi_application()
130 changes: 130 additions & 0 deletions Backend/TurneroRF/settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
"""
Django settings for TurneroRF project.

Generated by 'django-admin startproject' using Django 4.2.1.

For more information on this file, see
https://docs.djangoproject.com/en/4.2/topics/settings/

For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.2/ref/settings/
"""

from pathlib import Path

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-szbs2f3^$1v4be20vic3xbxna_8)+$d09!_4_&q*s&7=4=i!#l'

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True

ALLOWED_HOSTS = []


# Application definition

INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'rest_framework',
'api',
]

MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]

ROOT_URLCONF = 'TurneroRF.urls'

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]

WSGI_APPLICATION = 'TurneroRF.wsgi.application'


# Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'turneroweb',
'HOST': 'localhost',
'PORT': '3306',
'USER': 'root',
'PASSWORD': '',

}
}


# Password validation
# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]


# Internationalization
# https://docs.djangoproject.com/en/4.2/topics/i18n/

LANGUAGE_CODE = 'en-us'

TIME_ZONE = 'UTC'

USE_I18N = True

USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.2/howto/static-files/

STATIC_URL = 'static/'

# Default primary key field type
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
22 changes: 22 additions & 0 deletions Backend/TurneroRF/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
"""
URL configuration for TurneroRF project.

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.2/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
from django.urls import path

urlpatterns = [
path('admin/', admin.site.urls),
]
16 changes: 16 additions & 0 deletions Backend/TurneroRF/wsgi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
WSGI config for TurneroRF project.

It exposes the WSGI callable as a module-level variable named ``application``.

For more information on this file, see
https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/
"""

import os

from django.core.wsgi import get_wsgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TurneroRF.settings')

application = get_wsgi_application()
Empty file added Backend/api/__init__.py
Empty file.
Binary file added Backend/api/__pycache__/__init__.cpython-311.pyc
Binary file not shown.
Binary file added Backend/api/__pycache__/admin.cpython-311.pyc
Binary file not shown.
Binary file added Backend/api/__pycache__/apps.cpython-311.pyc
Binary file not shown.
Binary file added Backend/api/__pycache__/models.cpython-311.pyc
Binary file not shown.
13 changes: 13 additions & 0 deletions Backend/api/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from django.contrib import admin
from .models import Especialista
from .models import turnosPorEspecialista
# Register your models here.

class turnosPorEspecialistaAdmin(admin.ModelAdmin):
list_display = ("fecha","horarioDeInicio","horarioDeFin","horarioDeTurno")
class EspecialistaAdmin(admin.ModelAdmin):
list_display = ("nombre", "especialidad","horariosDeAtencion","id_Turnos")


admin.site.register(Especialista, EspecialistaAdmin)
admin.site.register(turnosPorEspecialista, turnosPorEspecialistaAdmin)
6 changes: 6 additions & 0 deletions Backend/api/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class ApiConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'api'
45 changes: 45 additions & 0 deletions Backend/api/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Generated by Django 4.2.1 on 2023-05-17 22:15

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='turnosPorEspecialista',
fields=[
('id_Turnos', models.AutoField(primary_key=True, serialize=False)),
('fecha', models.DateField(max_length=20)),
('horarioDeInicio', models.TextField(max_length=1000)),
('horarioDeFin', models.TextField(max_length=1000)),
('horarioDeTurno', models.TimeField(max_length=20)),
],
options={
'verbose_name': ' turnos para Especialista Médico',
'verbose_name_plural': 'turnosPorEspecialistas',
'db_table': 'turnosPorEspecialista',
},
),
migrations.CreateModel(
name='Especialista',
fields=[
('id_Especialista', models.AutoField(primary_key=True, serialize=False)),
('nombre', models.CharField(max_length=40)),
('especialidad', models.CharField(max_length=50)),
('horariosDeAtencion', models.TextField(max_length=1000)),
('id_Turnos', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.turnosporespecialista')),
],
options={
'verbose_name': 'Especialista Médico',
'verbose_name_plural': 'Especialistas',
'db_table': 'especialista',
},
),
]
Empty file.
Binary file not shown.
Binary file not shown.
35 changes: 35 additions & 0 deletions Backend/api/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
from django.db import models

# Create your models here.
class turnosPorEspecialista(models.Model):
id_Turnos = models.AutoField(primary_key=True)
fecha = models.DateField(max_length=20, blank=False)
horarioDeInicio = models.TextField(max_length=255, blank=False)
horarioDeFin = models.TextField(max_length=255, blank=False)
horarioDeTurno = models.TimeField(max_length=20, blank=False)

class Meta:
db_table = "turnosPorEspecialista"
verbose_name = " turnos para Especialista Médico"
verbose_name_plural = "turnosPorEspecialistas"
def __unicode__(self):
return self.fecha
def __str__(self):
return self.horarioDeInicio

class Especialista(models.Model):
id_Especialista = models.AutoField(primary_key=True)
nombre = models.CharField(max_length=40, blank=False)
especialidad = models.CharField(max_length=50, blank=False)
horariosDeAtencion = models.TextField(max_length=1000, blank=False)
id_Turnos = models.ForeignKey(turnosPorEspecialista,to_field="id_Turnos", on_delete=models.CASCADE )

class Meta:
db_table = "especialista"
verbose_name = "Especialista Médico"
verbose_name_plural = "Especialistas"
def __unicode__(self):
return self.nombre
def __str__(self):
return self.nombre

3 changes: 3 additions & 0 deletions Backend/api/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
3 changes: 3 additions & 0 deletions Backend/api/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.shortcuts import render

# Create your views here.
22 changes: 22 additions & 0 deletions Backend/manage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env python
"""Django's command-line utility for administrative tasks."""
import os
import sys


def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TurneroRF.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
"available on your PYTHONPATH environment variable? Did you "
"forget to activate a virtual environment?"
) from exc
execute_from_command_line(sys.argv)


if __name__ == '__main__':
main()
Binary file added Documentación 2023/diagrama DB.pdf
Binary file not shown.
Binary file not shown.
Loading