commit d1e1c1be7dd1f3eb892f2503251df848e69b6595 Author: Fred Date: Thu Aug 4 21:38:31 2016 +0200 first commit (with db data) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..61ab8ba --- /dev/null +++ b/.gitignore @@ -0,0 +1,90 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# IPython Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# dotenv +.env + +# virtualenv +venv/ +ENV/ + +# Spyder project settings +.spyderproject + +# Rope project settings +.ropeproject + diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000..fbc4272 Binary files /dev/null and b/db.sqlite3 differ diff --git a/heima/__init__.py b/heima/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/heima/settings.py b/heima/settings.py new file mode 100644 index 0000000..41c9bae --- /dev/null +++ b/heima/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for heima project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 't_q@94q+_xe=xum*q!og%r-tdp$(m=+hy^m)3+$8%)2nq8-xvv' + +# 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', + 'sherlock' +] + +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 = 'heima.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 = 'heima.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/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/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/heima/urls.py b/heima/urls.py new file mode 100644 index 0000000..9326c61 --- /dev/null +++ b/heima/urls.py @@ -0,0 +1,21 @@ +"""heima URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/heima/wsgi.py b/heima/wsgi.py new file mode 100644 index 0000000..4ed2dff --- /dev/null +++ b/heima/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for heima 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/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "heima.settings") + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..6c743ff --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "heima.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + 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?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/sherlock/__init__.py b/sherlock/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sherlock/admin.py b/sherlock/admin.py new file mode 100644 index 0000000..d07cb6c --- /dev/null +++ b/sherlock/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + +from .models import Category, Gauge, Mesure + +admin.site.register(Category) +admin.site.register(Gauge) +admin.site.register(Mesure) diff --git a/sherlock/apps.py b/sherlock/apps.py new file mode 100644 index 0000000..cfc527a --- /dev/null +++ b/sherlock/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class SherlockConfig(AppConfig): + name = 'sherlock' diff --git a/sherlock/migrations/0001_initial.py b/sherlock/migrations/0001_initial.py new file mode 100644 index 0000000..03086c2 --- /dev/null +++ b/sherlock/migrations/0001_initial.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-08-04 19:10 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, unique=True)), + ], + ), + migrations.CreateModel( + name='Gauge', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('serial_number', models.CharField(max_length=40)), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sherlock.Category')), + ], + ), + migrations.CreateModel( + name='Mesure', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('moment', models.DateTimeField()), + ('value', models.DecimalField(decimal_places=4, max_digits=10)), + ('gauge', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sherlock.Gauge')), + ], + ), + ] diff --git a/sherlock/migrations/__init__.py b/sherlock/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sherlock/models.py b/sherlock/models.py new file mode 100644 index 0000000..1c7c41b --- /dev/null +++ b/sherlock/models.py @@ -0,0 +1,22 @@ +from django.db import models + +class Category(models.Model): + name = models.CharField(max_length=255, unique=True) + + def __str__(self): + return self.name + +class Gauge(models.Model): + serial_number = models.CharField(max_length=40) + category = models.ForeignKey(Category) + + def __str__(self): + return '{} ({})'.format(self.category, self.serial_number) + + class Meta: + ordering = ['category'] + +class Mesure(models.Model): + moment = models.DateTimeField() + value = models.DecimalField(max_digits=10, decimal_places=4) + gauge = models.ForeignKey(Gauge) \ No newline at end of file diff --git a/sherlock/tests.py b/sherlock/tests.py new file mode 100644 index 0000000..b89bace --- /dev/null +++ b/sherlock/tests.py @@ -0,0 +1,35 @@ +from django.test import TestCase + +from .models import Category, Gauge + +class TestCategoryModel(TestCase): + + def test_str(self): + cat = Category(name='test') + + self.assertEqual('test', str(cat)) + +class TestGaugeModel(TestCase): + + def test_str(self): + cat = Category.objects.create(name='eau') + gauge = Gauge.objects.create(serial_number='test', category=cat) + + self.assertEqual('eau (test)', str(gauge)) + + def test_default_ordering(self): + cat_water = Category.objects.create(name='eau') + cat_gaz = Category.objects.create(name='gaz') + + gauge_1 = Gauge.objects.create(serial_number='undefined', category=cat_water) + gauge_2 = Gauge.objects.create(serial_number='undefined', category=cat_gaz) + gauge_3 = Gauge.objects.create(serial_number='undefined', category=cat_gaz) + gauge_4 = Gauge.objects.create(serial_number='undefined', category=cat_water) + + gauges_list = Gauge.objects.all() + + self.assertEqual(gauge_1, gauges_list[0]) + self.assertEqual(gauge_4, gauges_list[1]) + self.assertEqual(gauge_2, gauges_list[2]) + self.assertEqual(gauge_3, gauges_list[3]) + diff --git a/sherlock/views.py b/sherlock/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/sherlock/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.