Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nuevo template #5

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
e3249f0
'comandos'
ryacyna Aug 24, 2018
a94897a
movimeintos save
ryacyna Aug 29, 2018
a8135c3
'xx'
ryacyna Sep 5, 2018
bac5406
Se agregó Forms
ryacyna Sep 6, 2018
278201f
Se agregó referencia a Forms de Django Girls
ryacyna Sep 6, 2018
57fe0ae
template base
LourFabiM Sep 6, 2018
e05b3c4
Depuracion de la sesion de comandos.
ryacyna Sep 7, 2018
216ad71
trabajamos sobre permisos de usuario y grupos
LourFabiM Sep 12, 2018
a207795
corregims error en static
LourFabiM Sep 12, 2018
3b643b1
template base
LourFabiM Sep 12, 2018
73cbca4
merge
Sep 12, 2018
5180187
Form mov_gral con filtros
ryacyna Sep 12, 2018
1a058f7
arreglo javascripts chotos
Sep 12, 2018
2d614ba
Filtrar con mov_gral
ryacyna Sep 12, 2018
5f000af
cambios en plantilla_base, stock, campaña, nuevos template inicio y a…
LourFabiM Sep 12, 2018
3b25f9e
mergueando
LourFabiM Sep 13, 2018
09490d8
merge again
LourFabiM Sep 13, 2018
0c9191a
Filtrar con mov_gral con opciones de ordenamiento
ryacyna Sep 13, 2018
1760c38
final merge (arreglando el quilombo de lu)
LourFabiM Sep 13, 2018
b25f83f
mezclo cambios
ryacyna Sep 13, 2018
b773760
empezamos a usar django-registration
learodriguezcba Sep 13, 2018
a00b9b5
formulario de login con django-registration
learodriguezcba Sep 13, 2018
932b099
file change mode from non executable to executable
LourFabiM Sep 19, 2018
144d920
otros cambios en templates
LourFabiM Sep 19, 2018
48b9e19
vista para descargar db de desarrollo online
ryacyna Sep 26, 2018
11c1514
Ultima modificacion a MovGral
ryacyna Oct 3, 2018
68a9b13
integrando el estilo de bootstrap en los templates
LourFabiM Oct 3, 2018
192bee4
modificacion gitignore
LourFabiM Oct 3, 2018
aff5d9e
resolviendo conflictos en url y mov gral
LourFabiM Oct 3, 2018
48fbc28
cambios para las tablas en templates
LourFabiM Oct 3, 2018
3525b29
Agregamos filtros
ryacyna Oct 3, 2018
2d95d39
Merge branch 'template' of https://github.com/tecnicatura-villa-el-li…
ryacyna Oct 3, 2018
64af98b
generalize form
Oct 10, 2018
382edbe
integracion
Oct 10, 2018
ef540ab
modificaciones en templates
LourFabiM Oct 10, 2018
43bb490
Merge branch 'template' of https://github.com/tecnicatura-villa-el-li…
LourFabiM Oct 10, 2018
b08ce18
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
LourFabiM Oct 10, 2018
4b1dcea
cambios en los permisos login y form
LourFabiM Oct 15, 2018
3435a0c
Background
AIDEA775 Oct 15, 2018
90d35f4
trabajando con template inicio
LourFabiM Oct 15, 2018
c28701e
landing page base
Oct 15, 2018
932a002
Se agrego tipo y nro de comprobante en Movimientos
ryacyna Oct 15, 2018
cd20752
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
ryacyna Oct 15, 2018
b64621f
modificaciones en formulario y plantilla reportes de movimientos
LourFabiM Oct 15, 2018
8a80614
filtros
ryacyna Oct 15, 2018
649ecf4
modificaciones formularios
LourFabiM Oct 15, 2018
5c311f0
corregimos conflictos y error en formulario
LourFabiM Oct 15, 2018
b833595
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
LourFabiM Oct 15, 2018
89a3f43
ultima migracion
LourFabiM Oct 15, 2018
0047c75
Se crea el home
learodriguezcba Oct 15, 2018
7f48e2c
corregimos error en formulario
LourFabiM Oct 15, 2018
09c80bf
Se modifica el archico Macbook.png
learodriguezcba Oct 15, 2018
3077f39
Reset tipo comp y Letra
ryacyna Oct 15, 2018
e3dee84
modificaciones plantilla-base, forms y mov_gral
LourFabiM Oct 15, 2018
e278ad7
Reset tipo comp y letra
ryacyna Oct 15, 2018
d2bb16a
Se modifica la imagen de la landpage
learodriguezcba Oct 15, 2018
ac35a48
Merge branch 'template' into dev
ryacyna Oct 15, 2018
ac83c49
merge landing
Oct 15, 2018
ee46bc8
filter
ryacyna Oct 15, 2018
6b757fc
wip
Oct 15, 2018
c432359
trabajando sobre formulario y plantilla mov_gral
LourFabiM Oct 15, 2018
fd73652
fix del filtro
Oct 15, 2018
4cbfd18
modificacion de permisos
LourFabiM Oct 15, 2018
996c095
corrijo link0
Oct 15, 2018
ad82604
modificacion de permisos
LourFabiM Oct 15, 2018
ef2dbd6
Se modifica el home y se linkea a los html de registro y logueo
learodriguezcba Oct 15, 2018
4cfcc54
Reducido el tamaño del formulario en mov_gral
AIDEA775 Oct 17, 2018
8b0a9f3
filter
ryacyna Oct 17, 2018
71e4555
Merge remote-tracking branch 'origin/template' into dev
Oct 17, 2018
ce7b6e9
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
LourFabiM Oct 17, 2018
6d32afa
Merge branch 'landpage' of https://github.com/tecnicatura-villa-el-li…
LourFabiM Oct 17, 2018
4c77be7
nueva plantilla base y usuario_base
LourFabiM Oct 18, 2018
5a49058
Se agrega botón para regitrar nueva campaña y para registrar nuevos l…
learodriguezcba Oct 18, 2018
ab38772
se modifican todos los templates con nueva interfaz, botones para red…
LourFabiM Oct 22, 2018
174596b
carga de datos
Oct 22, 2018
87581ff
modificacion de template stock
LourFabiM Oct 22, 2018
b65f781
merge con nuevo template
Oct 22, 2018
39cd68d
mas detalles de movimiento
Oct 22, 2018
03d3444
cambios en stock
LourFabiM Oct 22, 2018
dd2210e
conflictos merge
LourFabiM Oct 22, 2018
ce1fc78
landing redirige una vez logueado
Oct 23, 2018
5a41259
merge
LourFabiM Oct 23, 2018
7d8e435
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
LourFabiM Oct 23, 2018
1b4ac39
fixeando lo que se puede
Oct 23, 2018
11616de
Merge branch 'dev' of github.com:tecnicatura-villa-el-libertador/grin…
Oct 23, 2018
2f27786
Se agrega funcionalidad a los botones de campañas
learodriguezcba Oct 23, 2018
3054aa2
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
learodriguezcba Oct 23, 2018
8263b84
botones de campaña
learodriguezcba Oct 23, 2018
0a55042
botones de crear
Oct 23, 2018
31070d2
quite codigo comentado en template campaña, modifique estilo tabla en…
LourFabiM Oct 23, 2018
509737f
modifique la tabla en stock, quite link inicio en base y arregle agun…
LourFabiM Oct 23, 2018
c26a803
migracion faltante
Oct 24, 2018
d575ee1
resolvi conflictos del merge con nuevo templete
LourFabiM Oct 24, 2018
b67ebff
acceder a cualquier campaña
learodriguezcba Oct 24, 2018
097e680
Merge branch 'dev' of https://github.com/tecnicatura-villa-el-liberta…
learodriguezcba Oct 24, 2018
0293b40
vuelvo a subir el archivo que borre en el merge y corregi un error en…
LourFabiM Oct 25, 2018
63754aa
modificaciones en botones de campañas y correccion de algunos errores
LourFabiM Oct 31, 2018
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
2 changes: 1 addition & 1 deletion .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.fuse*
.directory

*.sqlite3
Expand Down Expand Up @@ -47,4 +48,3 @@ coverage.xml

# jupyter
.ipynb_checkpoints/

1,929 changes: 0 additions & 1,929 deletions comandos django

This file was deleted.

Binary file added db.sdssqlite3
Binary file not shown.
Empty file modified fixtures/initial_data.json
100644 → 100755
Empty file.
2 changes: 2 additions & 0 deletions grin.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

C:\Users\usuario\AppData\Local\Programs\Python\Python36-32\python.exe %1 %2
Empty file modified gringo/__init__.py
100644 → 100755
Empty file.
12 changes: 11 additions & 1 deletion gringo/settings.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'stock'
'stock',
'django_registration',
'bootstrap4',
'crispy_forms',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -68,6 +71,8 @@
},
]

CRISPY_TEMPLATE_PACK = 'bootstrap4'

WSGI_APPLICATION = 'gringo.wsgi.application'


Expand Down Expand Up @@ -119,3 +124,8 @@
# https://docs.djangoproject.com/en/2.0/howto/static-files/

STATIC_URL = '/static/'

LOGIN_REDIRECT_URL = '/stock/'
LOGOUT_REDIRECT_URL = '/'

LOGIN_URL = '/accounts/login'
17 changes: 16 additions & 1 deletion gringo/urls.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,23 @@
from django.contrib import admin
from django.urls import path
from stock import views
from django.conf.urls import include, url

urlpatterns = [
path('stock/', views.stock),
path('campaña/nueva', views.CampañaCreate.as_view(), name='campaña_nueva'),
path('admin/', admin.site.urls),
# Other URL patterns ...
url(r'^accounts/', include('django_registration.backends.activation.urls')),
url(r'^accounts/', include('django.contrib.auth.urls')),
path('_db', views.download_db),
path('stock/', views.stock, name = 'resumen_stock'),
path('', views.inicio, name='inicio'),
path('campañas/', views.campañas_listado, name = 'resumen_campañas'),
path('campaña/<int:id>', views.campaña_detalle, name='campaña_detalle'),
path('campaña/<int:id>/nueva_actividad', views.ActividadCreate.as_view(), name='nueva_actividad'),
path('campaña/<int:id_campaña>/actividad/<int:id_actividad>', views.actividad_detalle, name='actividad_detalle'),
path('movimientos/', views.mov_gral, name='resumen_movimientos'),
path('lotes/', views.mov_gral, name='resumen_lotes'),
path('lote/nuevo', views.LoteCreate.as_view(), name="Lote_Nuevo"),
path('actividades/', views.actividades, name='resumen_actividades')
]
Empty file modified gringo/wsgi.py
100644 → 100755
Empty file.
22 changes: 22 additions & 0 deletions node_modules/bootstrap/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

177 changes: 177 additions & 0 deletions node_modules/bootstrap/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading