OpenSource/sms-lapli
1
0 Fork 0
mirror of https://github.com/GFDRR/sms-lapli.git synced 2026-10-26 17:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Esdras1995 committed 2015-10-16 14:07:03 -04:00
1 parent cf0fd66077
commit 0228edbff3
45 files changed
+431 -1051
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

base/migrations/0001_initial.py
+33 -19
View File
@@ -13,59 +13,73 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Commune',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('commune', models.CharField(max_length=45, verbose_name='Commune')),
('description', models.TextField(max_length=100, verbose_name='Description', blank=True)),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('commune', models.CharField(unique=True, max_length=45, verbose_name='Commune')),
('description', models.TextField(max_length=100, blank=True, verbose_name='Description')),
('id_code', models.CharField(unique=True, max_length=7, verbose_name='Code')),
],
),
migrations.CreateModel(
name='Departement',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('departement', models.CharField(max_length=40, verbose_name='Departement')),
('description', models.TextField(max_length=100, verbose_name='Description', blank=True)),
('ihsi', models.CharField(max_length=10, verbose_name='Code IHSI')),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('departement', models.CharField(max_length=40, choices=[('Ouest', 'OUEST'), ('Nord', 'NORD'), ('Nordouest', 'NORD-OUEST'), ('Nordest', 'NORD-EST'), ('Sud', 'SUD'), ('Sudest', 'SUD-EST'), ('Artibonite', 'ARTIBONITE'), ('Nippes', 'NIPPES'), ('Centre', 'CENTRE'), ('Grandanse', "GRAND'ANSE")], verbose_name='Departement')),
('description', models.TextField(max_length=100, blank=True, verbose_name='Description')),
('id_code', models.CharField(unique=True, max_length=7, verbose_name='Code')),
],
),
migrations.CreateModel(
name='PersonneContact',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('nomPersonne', models.CharField(max_length=45, verbose_name='Nom')),
('prenomPersonne', models.CharField(max_length=45, verbose_name='Prenom')),
('telephoneBureau', models.CharField(max_length=45, verbose_name='Telephone (Bureau)', blank=True)),
('telephonePersonnel', models.CharField(max_length=45, verbose_name='Telephone (Personnel)')),
('emailPersonnel', models.CharField(max_length=45, verbose_name='Email (Personnel)')),
('adressePersonnelle', models.CharField(max_length=45, verbose_name='Adresse (Personnlle)')),
('nif', models.CharField(max_length=45, verbose_name='NIF/CIN', unique=True)),
('telephoneBureau', models.CharField(max_length=45, blank=True, verbose_name='Telephone (Bureau)')),
('telephonePersonnel', models.CharField(unique=True, max_length=45, verbose_name='Telephone (Personnel)')),
('emailPersonnel', models.CharField(max_length=45, blank=True, verbose_name='Email (Personnel)')),
('adressePersonnelle', models.CharField(max_length=45, blank=True, verbose_name='Adresse (Personnlle)')),
('nif', models.CharField(unique=True, max_length=45, verbose_name='NIF/CIN')),
('dateEmbauche', models.DateField(verbose_name="Date d'embauche")),
('isactif', models.BooleanField(verbose_name='Active')),
],
),
migrations.CreateModel(
name='Poste',
fields=[
('nomPoste', models.CharField(max_length=45, primary_key=True, verbose_name='Poste', serialize=False)),
('nomPoste', models.CharField(serialize=False, primary_key=True, unique=True, max_length=45, verbose_name='Poste')),
('description', models.CharField(max_length=45, verbose_name='Description')),
],
),
migrations.CreateModel(
name='SectionCommunale',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('sectionCommunale', models.CharField(max_length=45, verbose_name='Section Communale')),
('description', models.TextField(max_length=100, verbose_name='Description', blank=True)),
('commune', models.ForeignKey(verbose_name='Commune', to='base.Commune')),
('nomOfficiel', models.CharField(max_length=45, blank=True, verbose_name='Nom officiel')),
('description', models.TextField(max_length=100, blank=True, verbose_name='Description')),
('id_code', models.CharField(unique=True, max_length=7, verbose_name='Code')),
('commune', models.ForeignKey(to='base.Commune', verbose_name='Commune')),
],
),
migrations.CreateModel(
name='SiteSentinelle',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('localite', models.CharField(max_length=45, verbose_name='Localite')),
('latitude', models.DecimalField(decimal_places=2, default=0, max_digits=8, verbose_name='Latitude')),
('longitude', models.DecimalField(decimal_places=2, default=0, max_digits=8, verbose_name='Longitude')),
('hauteur', models.DecimalField(decimal_places=2, default=0, max_digits=8, verbose_name='Hauteur')),
('sectionCommunale', models.ForeignKey(verbose_name='Section Communale', to='base.SectionCommunale')),
('sectionCommunale', models.ForeignKey(to='base.SectionCommunale', verbose_name='Section Communale')),
],
),
migrations.AddField(
model_name='personnecontact',
name='nomPoste',
field=models.ForeignKey(to='base.Poste', verbose_name='Poste'),
),
migrations.AddField(
model_name='commune',
name='departement',
field=models.ForeignKey(to='base.Departement', verbose_name='Departement'),
),
]
base/migrations/0002_auto_20150930_2004.py
-30
View File
@@ -1,30 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0001_initial'),
('base', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='personnecontact',
name='cfAtachStation',
field=models.ForeignKey(verbose_name='Affectation Station', to='hydromet.StationPluviometrique'),
),
migrations.AddField(
model_name='personnecontact',
name='nomPoste',
field=models.ForeignKey(verbose_name='Poste', to='base.Poste'),
),
migrations.AddField(
model_name='commune',
name='departement',
field=models.ForeignKey(verbose_name='Departement', to='base.Departement'),
),
]
base/migrations/0003_remove_departement_ihsi.py
-18
View File
@@ -1,18 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0002_auto_20150930_2004'),
]
operations = [
migrations.RemoveField(
model_name='departement',
name='ihsi',
),
]
base/migrations/0004_auto_20151003_1247.py
-64
View File
@@ -1,64 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0003_remove_departement_ihsi'),
]
operations = [
migrations.AddField(
model_name='commune',
name='id_code',
field=models.TextField(unique=True, max_length=4, blank=True),
),
migrations.AddField(
model_name='departement',
name='id_code',
field=models.TextField(unique=True, max_length=2, blank=True),
),
migrations.AddField(
model_name='sectioncommunale',
name='id_code',
field=models.TextField(unique=True, max_length=7, blank=True),
),
migrations.AlterField(
model_name='commune',
name='commune',
field=models.CharField(unique=True, max_length=45, verbose_name=b'Commune'),
),
migrations.AlterField(
model_name='departement',
name='departement',
field=models.CharField(unique=True, max_length=40, verbose_name=b'Departement'),
),
migrations.AlterField(
model_name='personnecontact',
name='adressePersonnelle',
field=models.CharField(max_length=45, verbose_name=b'Adresse (Personnlle)', blank=True),
),
migrations.AlterField(
model_name='personnecontact',
name='emailPersonnel',
field=models.CharField(max_length=45, verbose_name=b'Email (Personnel)', blank=True),
),
migrations.AlterField(
model_name='personnecontact',
name='telephonePersonnel',
field=models.CharField(unique=True, max_length=45, verbose_name=b'Telephone (Personnel)'),
),
migrations.AlterField(
model_name='poste',
name='nomPoste',
field=models.CharField(max_length=45, unique=True, serialize=False, verbose_name=b'Poste', primary_key=True),
),
migrations.AlterField(
model_name='sectioncommunale',
name='sectionCommunale',
field=models.CharField(unique=True, max_length=45, verbose_name=b'Section Communale'),
),
]
base/migrations/0005_auto_20151003_1258.py
-24
View File
@@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0004_auto_20151003_1247'),
]
operations = [
migrations.AddField(
model_name='sectioncommunale',
name='nomOfficiel',
field=models.CharField(unique=True, max_length=45, blank=True),
),
migrations.AlterField(
model_name='sectioncommunale',
name='sectionCommunale',
field=models.CharField(max_length=45, verbose_name=b'Section Communale'),
),
]
base/migrations/0006_auto_20151003_1300.py
-19
View File
@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0005_auto_20151003_1258'),
]
operations = [
migrations.AlterField(
model_name='sectioncommunale',
name='nomOfficiel',
field=models.CharField(max_length=45, blank=True),
),
]
base/migrations/0007_auto_20151003_1806.py
-55
View File
@@ -1,55 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0006_auto_20151003_1300'),
]
operations = [
migrations.AddField(
model_name='personnecontact',
name='isactif',
field=models.BooleanField(default=''),
preserve_default=False,
),
migrations.AlterField(
model_name='commune',
name='commune',
field=models.CharField(max_length=45, verbose_name='Commune', unique=True),
),
migrations.AlterField(
model_name='departement',
name='departement',
field=models.CharField(max_length=40, verbose_name='Departement', unique=True),
),
migrations.AlterField(
model_name='personnecontact',
name='adressePersonnelle',
field=models.CharField(max_length=45, blank=True, verbose_name='Adresse (Personnlle)'),
),
migrations.AlterField(
model_name='personnecontact',
name='emailPersonnel',
field=models.CharField(max_length=45, blank=True, verbose_name='Email (Personnel)'),
),
migrations.AlterField(
model_name='personnecontact',
name='telephonePersonnel',
field=models.CharField(max_length=45, verbose_name='Telephone (Personnel)', unique=True),
),
migrations.AlterField(
model_name='poste',
name='nomPoste',
field=models.CharField(serialize=False, max_length=45, unique=True, verbose_name='Poste', primary_key=True),
),
migrations.AlterField(
model_name='sectioncommunale',
name='sectionCommunale',
field=models.CharField(max_length=45, verbose_name='Section Communale'),
),
]
base/migrations/0008_auto_20151004_0851.py
-19
View File
@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0007_auto_20151003_1806'),
]
operations = [
migrations.AlterField(
model_name='personnecontact',
name='isactif',
field=models.BooleanField(verbose_name=b'Active'),
),
]
base/migrations/0009_remove_personnecontact_cfatachstation.py
-18
View File
@@ -1,18 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0008_auto_20151004_0851'),
]
operations = [
migrations.RemoveField(
model_name='personnecontact',
name='cfAtachStation',
),
]
base/migrations/0010_auto_20151004_1408.py
-19
View File
@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0009_remove_personnecontact_cfatachstation'),
]
operations = [
migrations.AlterField(
model_name='personnecontact',
name='isactif',
field=models.BooleanField(verbose_name='Active'),
),
]
base/migrations/0010_auto_20151006_1205.py
-39
View File
@@ -1,39 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0009_remove_personnecontact_cfatachstation'),
]
operations = [
migrations.AlterField(
model_name='commune',
name='id_code',
field=models.CharField(unique=True, max_length=7),
),
migrations.AlterField(
model_name='departement',
name='departement',
field=models.CharField(verbose_name='Departement', max_length=40),
),
migrations.AlterField(
model_name='departement',
name='id_code',
field=models.CharField(unique=True, max_length=7),
),
migrations.AlterField(
model_name='personnecontact',
name='isactif',
field=models.BooleanField(verbose_name='Active'),
),
migrations.AlterField(
model_name='sectioncommunale',
name='id_code',
field=models.CharField(unique=True, max_length=7),
),
]
base/migrations/0011_merge.py
-15
View File
@@ -1,15 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0010_auto_20151006_1205'),
('base', '0010_auto_20151004_1408'),
]
operations = [
]
base/migrations/0012_auto_20151008_2256.py
-34
View File
@@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0011_merge'),
]
operations = [
migrations.AlterField(
model_name='commune',
name='id_code',
field=models.CharField(unique=True, verbose_name='Code', max_length=7),
),
migrations.AlterField(
model_name='departement',
name='id_code',
field=models.CharField(unique=True, verbose_name='Code', max_length=7),
),
migrations.AlterField(
model_name='sectioncommunale',
name='id_code',
field=models.CharField(unique=True, verbose_name='Code', max_length=7),
),
migrations.AlterField(
model_name='sectioncommunale',
name='nomOfficiel',
field=models.CharField(blank=True, verbose_name='Nom officiel', max_length=45),
),
]
base/models.py
+1 -18
View File
@@ -7,25 +7,8 @@ from django.db import models
# Models for this app
# -------------------------------------------
DEPARTEMENTS_CHOICES = (
('Ouest', 'OUEST'),
('Nord', 'NORD'),
('Nordouest', 'NORD-OUEST'),
('Nordest', 'NORD-EST'),
('Sud', 'SUD'),
('Sudest', 'SUD-EST'),
('Artibonite', 'ARTIBONITE'),
('Nippes', 'NIPPES'),
('Centre', 'CENTRE'),
('Grandanse', 'GRAND\'ANSE'),
)
class Departement(models.Model):
departement = models.CharField(max_length=40, choices=DEPARTEMENTS_CHOICES,verbose_name="Departement")
departement = models.CharField(max_length=40, verbose_name="Departement")
description = models.TextField(max_length=100, blank=True, verbose_name="Description")
id_code = models.CharField(max_length=7, unique=True, verbose_name="Code")
# ihsi = models.CharField(max_length=10, verbose_name="Code IHSI")
hydromet/admin.py
+1 -1
View File
@@ -68,7 +68,7 @@ class ObservationAdmin(admin.ModelAdmin):
else:
message_bit = "%s Observation pluviometrique were" % rows_updated
self.message_user(request, "%s successfully marked as jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj Invalid." % message_bit)
self.message_user(request, "%s successfully marked as Invalid." % message_bit)
make_nonvalider.short_description = "Invalider les observations selectionnées"
hydromet/migrations/0001_initial.py
+46 -54
View File
@@ -12,81 +12,73 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
name='ObservationDirectionVent',
name='Observation',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('valider', models.IntegerField()),
],
),
migrations.CreateModel(
name='ObservationHumidite',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('valider', models.IntegerField()),
],
),
migrations.CreateModel(
name='ObservationPluviometrique',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('quantite', models.DecimalField(decimal_places=2, verbose_name='Quantite de Pluie', max_digits=15, blank=True)),
('dateDebut', models.DateField(verbose_name='Date de debut')),
('dateFin', models.DateField(verbose_name='Date de fin')),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('timestamp', models.DateTimeField(auto_now_add=True)),
('dateDebut', models.DateField(verbose_name='Debut')),
('dateFin', models.DateField(verbose_name='Fin')),
('temperatureMax', models.DecimalField(decimal_places=3, max_digits=5, null=True, blank=True, verbose_name='Temperature max')),
('temperatureMin', models.DecimalField(decimal_places=3, max_digits=5, null=True, blank=True, verbose_name='Temperature min')),
('quantitePluie', models.DecimalField(decimal_places=2, max_digits=15, blank=True, verbose_name='Quantite de Pluie')),
('description', models.TextField(max_length=100, blank=True)),
('numeroJour', models.IntegerField(verbose_name='Numero du Jour')),
('valider', models.IntegerField(verbose_name='Validation')),
('valider', models.BooleanField(default=False)),
],
),
migrations.CreateModel(
name='ObservationTemperature',
name='Station',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('temperatureMax', models.DecimalField(max_digits=5, decimal_places=3)),
('temperatureMin', models.DecimalField(max_digits=5, decimal_places=3)),
('valider', models.IntegerField()),
],
),
migrations.CreateModel(
name='StationPluviometrique',
fields=[
('id', models.AutoField(primary_key=True, verbose_name='ID', serialize=False, auto_created=True)),
('latitude', models.DecimalField(decimal_places=2, max_digits=8, default=0)),
('longitude', models.DecimalField(decimal_places=2, max_digits=8, default=0)),
('hauteur', models.DecimalField(decimal_places=2, max_digits=8, default=0)),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('latitude', models.FloatField()),
('longitude', models.FloatField()),
('hauteur', models.DecimalField(decimal_places=2, default=0, max_digits=8)),
('nomStation', models.CharField(max_length=45, verbose_name='Nom de la Station')),
('idSiteSeninnelle', models.ForeignKey(verbose_name='Site Sentinelle', to='base.SiteSentinelle')),
('idStation', models.CharField(max_length=5, blank=True)),
('idSiteSeninnelle', models.ForeignKey(to='base.SiteSentinelle', blank=True, verbose_name='Site Sentinelle', null=True)),
],
),
migrations.CreateModel(
name='TypeStationPluviometrique',
name='StationObservers',
fields=[
('typeStation', models.CharField(max_length=45, primary_key=True, verbose_name='Type de Station', serialize=False)),
('description', models.TextField(max_length=100, verbose_name='Description', blank=True)),
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('observer', models.OneToOneField(to='base.PersonneContact')),
('station', models.ForeignKey(to='hydromet.Station')),
],
),
migrations.CreateModel(
name='TypeStation',
fields=[
('typeStation', models.CharField(serialize=False, primary_key=True, max_length=45, verbose_name='Type de Station')),
('description', models.TextField(max_length=100, blank=True, verbose_name='Description')),
],
),
migrations.CreateModel(
name='UniteDeMesure',
fields=[
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID')),
('uniteMesure', models.CharField(unique=True, max_length=7, verbose_name='Unite de mesure')),
('description', models.TextField(blank=True)),
('formule', models.TextField(blank='True', verbose_name='Formule')),
],
),
migrations.AddField(
model_name='stationpluviometrique',
model_name='station',
name='typeStation',
field=models.ForeignKey(verbose_name='Type de la Station', to='hydromet.TypeStationPluviometrique'),
field=models.ForeignKey(to='hydromet.TypeStation', blank=True, verbose_name='Type de la Station', null=True),
),
migrations.AddField(
model_name='observationtemperature',
name='idStation',
field=models.ForeignKey(to='hydromet.StationPluviometrique'),
model_name='station',
name='uniteMesure',
field=models.ForeignKey(to='hydromet.UniteDeMesure', blank=True, verbose_name='Unite de mesure', null=True),
),
migrations.AddField(
model_name='observationpluviometrique',
model_name='observation',
name='idStation',
field=models.ForeignKey(verbose_name='Nom de la Station', to='hydromet.StationPluviometrique'),
field=models.ForeignKey(to='hydromet.Station'),
),
migrations.AddField(
model_name='observationhumidite',
name='idStation',
field=models.ForeignKey(to='hydromet.StationPluviometrique'),
),
migrations.AddField(
model_name='observationdirectionvent',
name='idStation',
field=models.ForeignKey(to='hydromet.StationPluviometrique'),
model_name='observation',
name='observer',
field=models.ForeignKey(to='base.PersonneContact'),
),
]
hydromet/migrations/0002_auto_20151003_1247.py
-19
View File
@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='observationpluviometrique',
name='valider',
field=models.BooleanField(verbose_name=b'Validation'),
),
]
hydromet/migrations/0003_auto_20151003_1329.py
-29
View File
@@ -1,29 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0002_auto_20151003_1247'),
]
operations = [
migrations.AddField(
model_name='stationpluviometrique',
name='idStation',
field=models.CharField(max_length=5, blank=True),
),
migrations.AlterField(
model_name='stationpluviometrique',
name='idSiteSeninnelle',
field=models.ForeignKey(verbose_name=b'Site Sentinelle', blank=True, to='base.SiteSentinelle', null=True),
),
migrations.AlterField(
model_name='stationpluviometrique',
name='typeStation',
field=models.ForeignKey(verbose_name=b'Type de la Station', blank=True, to='hydromet.TypeStationPluviometrique', null=True),
),
]
hydromet/migrations/0004_auto_20151003_1332.py
-24
View File
@@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0003_auto_20151003_1329'),
]
operations = [
migrations.AlterField(
model_name='stationpluviometrique',
name='latitude',
field=models.DecimalField(default=0, max_digits=20, decimal_places=15),
),
migrations.AlterField(
model_name='stationpluviometrique',
name='longitude',
field=models.DecimalField(default=0, max_digits=20, decimal_places=15),
),
]
hydromet/migrations/0005_auto_20151003_1333.py
-24
View File
@@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0004_auto_20151003_1332'),
]
operations = [
migrations.AlterField(
model_name='stationpluviometrique',
name='latitude',
field=models.FloatField(),
),
migrations.AlterField(
model_name='stationpluviometrique',
name='longitude',
field=models.FloatField(),
),
]
hydromet/migrations/0006_auto_20151003_1806.py
-49
View File
@@ -1,49 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0005_auto_20151003_1333'),
]
operations = [
migrations.CreateModel(
name='UniteDeMesure',
fields=[
('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
('uniteMesure', models.CharField(max_length=7, unique=True)),
('description', models.TextField(blank=True)),
],
),
migrations.AddField(
model_name='observationpluviometrique',
name='personne',
field=models.CharField(max_length=45, default='', verbose_name='Telephone (Personne)'),
preserve_default=False,
),
migrations.AlterField(
model_name='observationpluviometrique',
name='valider',
field=models.BooleanField(verbose_name='Validation'),
),
migrations.AlterField(
model_name='stationpluviometrique',
name='idSiteSeninnelle',
field=models.ForeignKey(to='base.SiteSentinelle', verbose_name='Site Sentinelle', null=True, blank=True),
),
migrations.AlterField(
model_name='stationpluviometrique',
name='typeStation',
field=models.ForeignKey(to='hydromet.TypeStationPluviometrique', verbose_name='Type de la Station', null=True, blank=True),
),
migrations.AddField(
model_name='stationpluviometrique',
name='uniteMesure',
field=models.ForeignKey(default='', to='hydromet.UniteDeMesure'),
preserve_default=False,
),
]
hydromet/migrations/0007_auto_20151004_0851.py
-24
View File
@@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0006_auto_20151003_1806'),
]
operations = [
migrations.AlterField(
model_name='stationpluviometrique',
name='uniteMesure',
field=models.ForeignKey(verbose_name=b'Unite de mesure', blank=True, to='hydromet.UniteDeMesure', null=True),
),
migrations.AlterField(
model_name='unitedemesure',
name='uniteMesure',
field=models.CharField(unique=True, max_length=7, verbose_name=b'Unite de mesure'),
),
]
hydromet/migrations/0008_auto_20151004_0917.py
-116
View File
@@ -1,116 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('base', '0009_remove_personnecontact_cfatachstation'),
('hydromet', '0007_auto_20151004_0851'),
]
operations = [
migrations.CreateModel(
name='Observation',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('timestamp', models.DateTimeField()),
('dateDebut', models.DateField(verbose_name=b'Date de debut')),
('dateFin', models.DateField(verbose_name=b'Date de fin')),
('temperatureMax', models.DecimalField(max_digits=5, decimal_places=3)),
('temperatureMin', models.DecimalField(max_digits=5, decimal_places=3)),
('quantitePluie', models.DecimalField(verbose_name=b'Quantite de Pluie', max_digits=15, decimal_places=2, blank=True)),
('description', models.TextField(max_length=100, blank=True)),
('valider', models.BooleanField()),
],
),
migrations.CreateModel(
name='Station',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('latitude', models.FloatField()),
('longitude', models.FloatField()),
('hauteur', models.DecimalField(default=0, max_digits=8, decimal_places=2)),
('nomStation', models.CharField(max_length=45, verbose_name=b'Nom de la Station')),
('idStation', models.CharField(max_length=5, blank=True)),
('idSiteSeninnelle', models.ForeignKey(verbose_name=b'Site Sentinelle', blank=True, to='base.SiteSentinelle', null=True)),
],
),
migrations.CreateModel(
name='StationObservers',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('observer', models.OneToOneField(to='base.PersonneContact')),
('station', models.ForeignKey(to='hydromet.Station')),
],
),
migrations.RenameModel(
old_name='TypeStationPluviometrique',
new_name='TypeStation',
),
migrations.RemoveField(
model_name='observationdirectionvent',
name='idStation',
),
migrations.RemoveField(
model_name='observationhumidite',
name='idStation',
),
migrations.RemoveField(
model_name='observationpluviometrique',
name='idStation',
),
migrations.RemoveField(
model_name='observationtemperature',
name='idStation',
),
migrations.RemoveField(
model_name='stationpluviometrique',
name='idSiteSeninnelle',
),
migrations.RemoveField(
model_name='stationpluviometrique',
name='typeStation',
),
migrations.RemoveField(
model_name='stationpluviometrique',
name='uniteMesure',
),
migrations.DeleteModel(
name='ObservationDirectionVent',
),
migrations.DeleteModel(
name='ObservationHumidite',
),
migrations.DeleteModel(
name='ObservationPluviometrique',
),
migrations.DeleteModel(
name='ObservationTemperature',
),
migrations.DeleteModel(
name='StationPluviometrique',
),
migrations.AddField(
model_name='station',
name='typeStation',
field=models.ForeignKey(verbose_name=b'Type de la Station', blank=True, to='hydromet.TypeStation', null=True),
),
migrations.AddField(
model_name='station',
name='uniteMesure',
field=models.ForeignKey(verbose_name=b'Unite de mesure', blank=True, to='hydromet.UniteDeMesure', null=True),
),
migrations.AddField(
model_name='observation',
name='idStation',
field=models.ForeignKey(to='hydromet.Station'),
),
migrations.AddField(
model_name='observation',
name='observer',
field=models.ForeignKey(to='base.PersonneContact', unique=True),
),
]
hydromet/migrations/0009_auto_20151004_0920.py
-19
View File
@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0008_auto_20151004_0917'),
]
operations = [
migrations.AlterField(
model_name='observation',
name='observer',
field=models.ForeignKey(to='base.PersonneContact'),
),
]
hydromet/migrations/0010_auto_20151004_1000.py
-54
View File
@@ -1,54 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0009_auto_20151004_0920'),
]
operations = [
migrations.AlterField(
model_name='observation',
name='dateDebut',
field=models.DateField(verbose_name='Date de debut'),
),
migrations.AlterField(
model_name='observation',
name='dateFin',
field=models.DateField(verbose_name='Date de fin'),
),
migrations.AlterField(
model_name='observation',
name='quantitePluie',
field=models.DecimalField(blank=True, decimal_places=2, verbose_name='Quantite de Pluie', max_digits=15),
),
migrations.AlterField(
model_name='station',
name='idSiteSeninnelle',
field=models.ForeignKey(blank=True, null=True, verbose_name='Site Sentinelle', to='base.SiteSentinelle'),
),
migrations.AlterField(
model_name='station',
name='nomStation',
field=models.CharField(verbose_name='Nom de la Station', max_length=45),
),
migrations.AlterField(
model_name='station',
name='typeStation',
field=models.ForeignKey(blank=True, null=True, verbose_name='Type de la Station', to='hydromet.TypeStation'),
),
migrations.AlterField(
model_name='station',
name='uniteMesure',
field=models.ForeignKey(blank=True, null=True, verbose_name='Unite de mesure', to='hydromet.UniteDeMesure'),
),
migrations.AlterField(
model_name='unitedemesure',
name='uniteMesure',
field=models.CharField(unique=True, max_length=7, verbose_name='Unite de mesure'),
),
]
hydromet/migrations/0010_auto_20151004_1214.py
-24
View File
@@ -1,24 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0009_auto_20151004_0920'),
]
operations = [
migrations.AlterField(
model_name='observation',
name='temperatureMax',
field=models.DecimalField(null=True, max_digits=5, decimal_places=3, blank=True),
),
migrations.AlterField(
model_name='observation',
name='temperatureMin',
field=models.DecimalField(null=True, max_digits=5, decimal_places=3, blank=True),
),
]
hydromet/migrations/0011_merge.py
-15
View File
@@ -1,15 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0010_auto_20151004_1000'),
('hydromet', '0010_auto_20151004_1214'),
]
operations = [
]
hydromet/migrations/0012_unitedemesure_formule.py
-20
View File
@@ -1,20 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0011_merge'),
]
operations = [
migrations.AddField(
model_name='unitedemesure',
name='formule',
field=models.CharField(default='', verbose_name='Formule', max_length=20),
preserve_default=False,
),
]
hydromet/migrations/0013_auto_20151007_1152.py
-39
View File
@@ -1,39 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0012_unitedemesure_formule'),
]
operations = [
migrations.AlterField(
model_name='observation',
name='dateDebut',
field=models.DateField(verbose_name='Debut'),
),
migrations.AlterField(
model_name='observation',
name='dateFin',
field=models.DateField(verbose_name='Fin'),
),
migrations.AlterField(
model_name='observation',
name='temperatureMax',
field=models.DecimalField(decimal_places=3, verbose_name='Temperature max', blank=True, null=True, max_digits=5),
),
migrations.AlterField(
model_name='observation',
name='temperatureMin',
field=models.DecimalField(decimal_places=3, verbose_name='Temperature min', blank=True, null=True, max_digits=5),
),
migrations.AlterField(
model_name='unitedemesure',
name='formule',
field=models.TextField(verbose_name='Formule', blank='True'),
),
]
hydromet/migrations/0014_auto_20151007_1845.py
-19
View File
@@ -1,19 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('hydromet', '0013_auto_20151007_1152'),
]
operations = [
migrations.AlterField(
model_name='observation',
name='timestamp',
field=models.DateTimeField(auto_now_add=True),
),
]
hydromet/models.py
+1 -1
View File
@@ -15,7 +15,7 @@ class TypeStation(models.Model):
class UniteDeMesure(models.Model):
uniteMesure = models.CharField(max_length=7, unique=True, verbose_name="Unite de mesure")
description = models.TextField(blank=True)
formule = models.TextField(verbose_name="Formule", blank="True")
formule = models.DecimalField(max_digits=5, decimal_places=3, null=True, blank=True, verbose_name="Formule")
def __str__(self): # __unicode__ on Python 2
return self.uniteMesure
smslapli/templates/admin/base_site.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block title %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
{% block branding %}
<h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1>
<!-- <h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('Django administration') }}</a></h1> -->
{% endblock %}
{% block nav-global %}{% endblock %}
smslapli/templates/admin/change_form.html
+112 -78
View File
@@ -6,32 +6,13 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
{# <h2>Form Des<small>different form elements</small></h2>#}
{% if not is_popup %}
{% block breadcrumbs %}
{#<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>#}
{#link accueil#}
{#&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>#}
<h2>{% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
&rsaquo; <small>{% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}</small></h2>
{% endblock %}
{% endif %}
{# <ul class="nav navbar-right panel_toolbox">#}
{# <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>#}
{# </li>#}
{# <li class="dropdown">#}
{# <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>#}
{# <ul class="dropdown-menu" role="menu">#}
{# <li><a href="#">Settings 1</a>#}
{# </li>#}
{# <li><a href="#">Settings 2</a>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li><a class="close-link"><i class="fa fa-close"></i></a>#}
{# </li>#}
{# </ul>#}
<div class="clearfix"></div>
</div>
<div class="x_content">
@@ -40,7 +21,7 @@
<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
{{ media }}
{% endblock %}
{# {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}#}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
{#{% block coltype %}colM{% endblock %}#}
<div class = "change-style">
@@ -61,8 +42,9 @@
{% endblock %}
<form class = "form-style" {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>{% csrf_token %}{% block form_top %}{% endblock %}
<div>
<form class = "form-style" {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate style="width: 100%;">{% csrf_token %}{% block form_top %}{% endblock %}
<div class="row">
<div class="col-lg-9" style="">
{% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}
{% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %}
{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}
@@ -87,9 +69,12 @@
{% endblock %}
{% block after_related_objects %}{% endblock %}
{% block submit_buttons_bottom %}{% submit_row %}{% endblock %}
</div>
<div class="col-lg-3" >
<!-- <div style="background: #fff; margin-left: 10px; border-radius: 5px; border: 1px solid #dddddd"> -->
{% block submit_buttons_bottom %}{% submit_row %}{% endblock %}
<!-- </div> -->
</div>
{% block admin_change_form_document_ready %}
<script type="text/javascript">
(function($) {
@@ -137,64 +122,13 @@
</script>
{% endblock %}
JavaScript for prepopulated fields
<!-- JavaScript for prepopulated fields -->
{% prepopulated_fields_js %}
</div>
</form></div>
{% endblock %}
</div>
{# <form id="demo-form2" data-parsley-validate class="form-horizontal form-label-left">#}
{##}
{# <div class="form-group">#}
{# <label class="control-label col-md-3 col-sm-3 col-xs-12" for="first-name">First Name <span class="required">*</span>#}
{# </label>#}
{# <div class="col-md-6 col-sm-6 col-xs-12">#}
{# <input type="text" id="first-name" required="required" class="form-control col-md-7 col-xs-12">#}
{# </div>#}
{# </div>#}
{# <div class="form-group">#}
{# <label class="control-label col-md-3 col-sm-3 col-xs-12" for="last-name">Last Name <span class="required">*</span>#}
{# </label>#}
{# <div class="col-md-6 col-sm-6 col-xs-12">#}
{# <input type="text" id="last-name" name="last-name" required="required" class="form-control col-md-7 col-xs-12">#}
{# </div>#}
{# </div>#}
{# <div class="form-group">#}
{# <label for="middle-name" class="control-label col-md-3 col-sm-3 col-xs-12">Middle Name / Initial</label>#}
{# <div class="col-md-6 col-sm-6 col-xs-12">#}
{# <input id="middle-name" class="form-control col-md-7 col-xs-12" type="text" name="middle-name">#}
{# </div>#}
{# </div>#}
{# <div class="form-group">#}
{# <label class="control-label col-md-3 col-sm-3 col-xs-12">Gender</label>#}
{# <div class="col-md-6 col-sm-6 col-xs-12">#}
{# <div id="gender" class="btn-group" data-toggle="buttons">#}
{# <label class="btn btn-default" data-toggle-class="btn-primary" data-toggle-passive-class="btn-default">#}
{# <input type="radio" name="gender" value="male"> &nbsp; Male &nbsp;#}
{# </label>#}
{# <label class="btn btn-primary active" data-toggle-class="btn-primary" data-toggle-passive-class="btn-default">#}
{# <input type="radio" name="gender" value="female" checked=""> Female#}
{# </label>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="form-group">#}
{# <label class="control-label col-md-3 col-sm-3 col-xs-12">Date Of Birth <span class="required">*</span>#}
{# </label>#}
{# <div class="col-md-6 col-sm-6 col-xs-12">#}
{# <input id="birthday" class="date-picker form-control col-md-7 col-xs-12" required="required" type="text">#}
{# </div>#}
{# </div>#}
{# <div class="ln_solid"></div>#}
{# <div class="form-group">#}
{# <div class="col-md-6 col-sm-6 col-xs-12 col-md-offset-3">#}
{# <button type="submit" class="btn btn-primary">Cancel</button>#}
{# <button type="submit" class="btn btn-success">Submit</button>#}
{# </div>#}
{# </div>#}
{##}
{# </form>#}
</div>
</div>
</div>
@@ -211,7 +145,7 @@
{# box-shadow: inset 0 0.5px 0.5px rgba(100, 100, 100, 0.25), 0 0.5px rgba(255, 255, 255, 0.4);#}
{##}
{# }#}
.form-style label{
.form-style label{
width: 100px;
{# background-color: #777;#}
}
@@ -238,6 +172,106 @@
li{
list-style: none;
}
.btn-custom {
display: inline-block;
padding: 4px 12px;
width: 140px;
height: 50px;
margin-bottom: 10px;
font-size: 12px;
line-height: 18px;
white-space: normal;
text-align: center;
vertical-align: middle;
cursor: pointer;
color: #333;
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.75);
background-color: #F5F5F5;
background-image: linear-gradient(to bottom, #FFF, #E6E6E6);
background-repeat: repeat-x;
border-width: 1px;
border-style: solid;
overflow: justify;
border-color: #CCC #CCC #B3B3B3;
-moz-border-top-colors: none;
-moz-border-right-colors: none;
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
border-image: none;
border-radius: 4px;
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.2) inset, 0px 1px 2px rgba(0, 0, 0, 0.05);
}
.btn-info {
color: #FFF;
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.25);
background-color: #49AFCD;
background-image: linear-gradient(to bottom, #5BC0DE, #2F96B4);
background-repeat: repeat-x;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn-default{
padding: 10px;
}
.btn-danger{
color: #FFF;
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.25);
background-color: #49AFCD;
background-image: linear-gradient(to bottom, #5BC0DE, #2F96B4);
background-repeat: repeat-x;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
/*input, button, select, textarea {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
}
label, input, button, select, textarea {
font-size: 12px;
font-weight: normal;
line-height: 18px;
}
label, select, button, input[type="button"], input[type="reset"], input[type="submit"], input[type="radio"], input[type="checkbox"] {
cursor: pointer;
}
button, html input[type="button"], input[type="reset"], input[type="submit"] {
cursor: pointer;
}
button, input {
line-height: normal;
}
button, input, select, textarea {
margin: 0px;
font-size: 100%;
vertical-align: middle;
}
.save-box {
text-align: center;
}
.save-box .btn.btn-high {
width: 150px;
min-height: 40px;
}
.save-box .btn {
width: 150px;
margin-bottom: 10px;
}
.btn:focus {
outline: thin dotted #333;
outline-offset: -2px;
}
.btn:hover, .btn:focus {
color: #333;
text-decoration: none;
background-position: 0px -15px;
transition: background-position 0.1s linear 0s;
}
.btn:hover, .btn:focus, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
color: #333;
background-color: #E6E6E6;
}
button.btn, input.btn[type="submit"] {
}*/
</style>
{% endblock %}
smslapli/templates/admin/change_list_results.html
+2 -2
View File
@@ -39,7 +39,7 @@
<thead>
<tr class="headings">
{% for header in result_headers %}
<th style="border: 1px solid #666" scope="col" {{ header.class_attrib }}>
<th scope="col" {{ header.class_attrib }}>
<table>
<tr>
<td style="borber-left: 1px solid #777; width: 40%;">
@@ -49,7 +49,7 @@
{% if header.sortable %}
{% if header.sort_priority > 0 %}
<td>
<div class="sortoptions" style="margin: 5px; width: 100%; text-align: center">
<div class="sortoptions" style="margin: 1px; width: 70px; text-align: center;">
{% if num_sorted_fields > 1 %}
<span class="sortpriority" title="{% blocktrans with priority_number=header.sort_priority %}Sorting priority: {{ priority_number }}{% endblocktrans %}" style="color: white;">{{ header.sort_priority }}</span>
{% endif %}
smslapli/templates/admin/includes/fieldset.html
+11 -9
View File
@@ -27,6 +27,7 @@
</div>
{% endfor %}
<style>
.fieldset-group div{
display: inline-block;
}
@@ -49,9 +50,9 @@
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 7px #96c7ec;
}
.fieldset-group p input{
/*.fieldset-group p input{
margin-left: 55px;
}
}*/
.fieldset-group input, .fieldset-group textarea{
background: #ffffff;
border: 1px solid #ddd;
@@ -63,22 +64,23 @@
}
.selector div{
width: 510px;
/*.selector div{
width: 100%;
padding: 5px;
}
background: #DDD;
}*/
.selector div select{
width: 500px;
margin-bottom: 20px;
height: 50px;
width: 120px;
}
.fieldset-group{
margin-bottom: 10px;
}
.fieldset-group p input{
/*.fieldset-group p input{
margin-bottom: 10px;
}
}*/
</style>
</fieldset>
smslapli/templates/admin/index.html
+2 -34
View File
@@ -178,7 +178,7 @@
<!-- /sidebar menu -->
<!-- /menu footer buttons -->
<div class="sidebar-footer hidden-small">
<!-- <div class="sidebar-footer hidden-small">
<a data-toggle="tooltip" data-placement="top" title="Settings">
<span class="glyphicon glyphicon-cog" aria-hidden="true"></span>
</a>
@@ -192,7 +192,7 @@
<span class="glyphicon glyphicon-off" aria-hidden="true"></span>
</a>
</div>
<!-- /menu footer buttons -->
--> <!-- /menu footer buttons -->
</div>
</div>
@@ -260,38 +260,6 @@
<div class="right_col" role="main">
{% block content1 %}
{# {{ "nbAgent"|notification }}#}
<!-- top tiles -->
<!-- <div class="row tile_count">
<div class="animated flipInY col-md-2 col-sm-4 col-xs-4 tile_stats_count">
<div class="left"></div>
<div class="right">
<span class="count_top"><i class="fa fa-user"></i> Nombre agent</span>
<div class="count">{{ "nbAgent"|notification }}</div>
<span class="count_bottom"><i class="green">4% </i> From last Week</span>
</div>
</div>
<div class="animated flipInY col-md-2 col-sm-4 col-xs-4 tile_stats_count">
<div class="left"></div>
<div class="right">
<span class="count_top"><i class="fa fa-clock-o"></i> Message non valides</span>
<div class="count">{{ "msgNotValidate"|notification }}</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>3% </i> From last Week</span>
</div>
</div>
<div class="animated flipInY col-md-2 col-sm-4 col-xs-4 tile_stats_count">
<div class="left"></div>
<div class="right">
<span class="count_top"><i class="fa fa-user"></i> Total Males</span>
<div class="count green">2,500</div>
<span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>
</div>
</div>
</div> -->
<!-- /top tiles -->
<div class="row top_tiles">
<div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
<div class="tile-stats">
smslapli/templates/admin/submit_line.html
+5 -5
View File
@@ -1,13 +1,13 @@
{% load i18n admin_urls %}
<div class="submit-row login-content">
{% if show_save %}<input type="submit" value="{% trans 'Save' %}" name="_save" class = "default btn btn-primary"/>{% endif %}
{% if show_save %}<input type="submit" value="{% trans 'Save' %}" name="_save" class = "btn-custom btn-info"/>{% endif %}<br>
{% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new' %}" name="_saveasnew" />{% endif %}<br>
{% if show_save_and_add_another %}<input type="submit" value="{% trans 'Save and add another' %}" name="_addanother" class="btn-custom btn-default"/><br>{% endif %}
{% if show_save_and_continue %}<input type="submit" value="{% trans 'Save and continue editing' %}" name="_continue" class="btn-custom btn-default" />{% endif %}
{% if show_delete_link %}
{% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
<p class="deletelink-box"><a href="{% add_preserved_filters delete_url %}" class="deletelink btn btn-default">{% trans "Delete" %}</a></p>
<p class="deletelink-box"><a href="{% add_preserved_filters delete_url %}" class="deletelink" style="color: #994400; text-align: center;">{% trans "Delete" %}</a></p>
{% endif %}
{% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new' %}" name="_saveasnew" />{% endif %}
{% if show_save_and_add_another %}<input type="submit" value="{% trans 'Save and add another' %}" name="_addanother" class="btn btn-default"/>{% endif %}
{% if show_save_and_continue %}<input type="submit" value="{% trans 'Save and continue editing' %}" name="_continue" class="btn btn-default"/>{% endif %}
</div>
<style>
.submit-row{
smslapli/templates/registration/logged_out.html
+13
View File
@@ -0,0 +1,13 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}<!-- <div class="breadcrumbs"><a href="{% url 'admin:index' %}">{% trans 'Home' %}</a></div> -->{% endblock %}
{% block content %}
<div class="alert alert-success">
<p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
<p style="margin-top: 10px;"><a href="{% url 'admin:index' %}" class="btn-sm btn-primary">{% trans 'Log in again' %}</a></p>
</div>
{% endblock %}
smslapli/templates/registration/password_change_done.html
+15
View File
@@ -0,0 +1,15 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>{% endblock %}
{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; {% trans 'Password change' %}
</div>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}
<p>{% trans 'Your password was changed.' %}</p>
{% endblock %}
smslapli/templates/registration/password_change_form.html
+80
View File
@@ -0,0 +1,80 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}
{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>{% endblock %}
{% block breadcrumbs %}
<div class="breadcrumbs" style="padding: 10px; margin-top: 10px; border-radius: 5px; border: 1px solid #DDD;">
<a href="{% url 'admin:index' %}" style="color: #3899DB;">{% trans 'Home' %}</a>
&rsaquo;&rsaquo; <b>{% trans 'Password change' %}</b>
</div>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}{#<h1>{{ title }}</h1>#}{% endblock %}
{% block content %}<div id="content-main">
<form action="" method="post">{% csrf_token %}
<div>
{% if form.errors %}
<p class="errornote">
{% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
</p>
{% endif %}
<p class="alert alert-info" style="margin-top: 10px;">{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
<fieldset class="module aligned wide">
<div class="form-row">
{{ form.old_password.errors }}
{{ form.old_password.label_tag }} {{ form.old_password }}
</div>
<div class="form-row">
{{ form.new_password1.errors }}
{{ form.new_password1.label_tag }} {{ form.new_password1 }}
{% if form.new_password1.help_text %}
<p class="help">{{ form.new_password1.help_text|safe }}</p>
{% endif %}
</div>
<div class="form-row">
{{ form.new_password2.errors }}
{{ form.new_password2.label_tag }} {{ form.new_password2 }}
{% if form.new_password2.help_text %}
<p class="help">{{ form.new_password2.help_text|safe }}</p>
{% endif %}
</div>
</fieldset>
<div class="submit-row">
<input type="submit" value="{% trans 'Change my password' %}" class="default btn-sm btn-primary" />
</div>
<script type="text/javascript">document.getElementById("id_old_password").focus();</script>
</div>
</form></div>
<style type="text/css">
.form-row input:focus{
outline: none;
color: #525864;
border-color: #84c0ee;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 7px #96c7ec;
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 7px #96c7ec;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15), 0 0 7px #96c7ec;
}
.form-row input{
background: #ffffff;
border: 1px solid #ddd;
width: 200px;
height: 30px;
padding-left: 5px;
-webkit-box-shadow: inset 0 1px 1px rgba(100, 100, 100, 0.25), 0 1px rgba(255, 255, 255, 0.4);
-moz-box-shadow: inset 0 1px 1px rgba(100, 100, 100, 0.25), 0 1px rgba(255, 255, 255, 0.4);
box-shadow: inset 0 1px 1px rgba(100, 100, 100, 0.25), 0 1px rgba(255, 255, 255, 0.4);
}
</style>
{% endblock %}
smslapli/templates/registration/password_reset_complete.html
+20
View File
@@ -0,0 +1,20 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; {% trans 'Password reset' %}
</div>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
{% endblock %}
smslapli/templates/registration/password_reset_confirm.html
+33
View File
@@ -0,0 +1,33 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; {% trans 'Password reset confirmation' %}
</div>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}
{% if validlink %}
<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
<form action="" method="post">{% csrf_token %}
{{ form.new_password1.errors }}
<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
{{ form.new_password2.errors }}
<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
</form>
{% else %}
<p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>
{% endif %}
{% endblock %}
smslapli/templates/registration/password_reset_done.html
+19
View File
@@ -0,0 +1,19 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; {% trans 'Password reset' %}
</div>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}
<p>{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
<p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
{% endblock %}
smslapli/templates/registration/password_reset_email.html
+14
View File
@@ -0,0 +1,14 @@
{% load i18n %}{% autoescape off %}
{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
{% trans "Thanks for using our site!" %}
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
{% endautoescape %}
smslapli/templates/registration/password_reset_form.html
+22
View File
@@ -0,0 +1,22 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
&rsaquo; {% trans 'Password reset' %}
</div>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
{% block content %}
<p>{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</p>
<form action="" method="post">{% csrf_token %}
{{ form.email.errors }}
<p><label for="id_email">{% trans 'Email address:' %}</label> {{ form.email }} <input type="submit" value="{% trans 'Reset my password' %}" /></p>
</form>
{% endblock %}