diff --git a/www/web/warpapi/admin.py b/www/web/warpapi/admin.py index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e..08dd63a16324bef75bf300ba3534946b7023f833 100644 --- a/www/web/warpapi/admin.py +++ b/www/web/warpapi/admin.py @@ -1,3 +1,10 @@ from django.contrib import admin +from warpapi.models import * # Register your models here. + +@admin.register(Information) +class InformationAdmin(admin.ModelAdmin): + pass + + diff --git a/www/web/warpapi/migrations/0001_initial.py b/www/web/warpapi/migrations/0001_initial.py new file mode 100644 index 0000000000000000000000000000000000000000..25f4fc39efbbe3705f0978dd7c99a4c527b9fba9 --- /dev/null +++ b/www/web/warpapi/migrations/0001_initial.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-10-12 00:34 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Information', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(max_length=100)), + ('value', models.CharField(max_length=250)), + ], + ), + ] diff --git a/www/web/warpapi/migrations/0002_information_category.py b/www/web/warpapi/migrations/0002_information_category.py new file mode 100644 index 0000000000000000000000000000000000000000..806d34839ee930e8cce78aa2789db12068d58344 --- /dev/null +++ b/www/web/warpapi/migrations/0002_information_category.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-10-12 00:39 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('warpapi', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='information', + name='category', + field=models.CharField(default='', max_length=100), + preserve_default=False, + ), + ] diff --git a/www/web/warpapi/migrations/0003_auto_20161012_0058.py b/www/web/warpapi/migrations/0003_auto_20161012_0058.py new file mode 100644 index 0000000000000000000000000000000000000000..f37335454f2d7365fca59eabaff138c3a3e9ce4f --- /dev/null +++ b/www/web/warpapi/migrations/0003_auto_20161012_0058.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-10-12 00:58 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('warpapi', '0002_information_category'), + ] + + operations = [ + migrations.AlterField( + model_name='information', + name='category', + field=models.CharField(max_length=100, null=True), + ), + ] diff --git a/www/web/warpapi/migrations/0004_auto_20161012_0058.py b/www/web/warpapi/migrations/0004_auto_20161012_0058.py new file mode 100644 index 0000000000000000000000000000000000000000..a547c7e46aa1acc5ef5fc577255c7bed766021ba --- /dev/null +++ b/www/web/warpapi/migrations/0004_auto_20161012_0058.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-10-12 00:58 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('warpapi', '0003_auto_20161012_0058'), + ] + + operations = [ + migrations.AlterField( + model_name='information', + name='value', + field=models.CharField(max_length=250, null=True), + ), + ] diff --git a/www/web/warpapi/migrations/0005_auto_20161012_0059.py b/www/web/warpapi/migrations/0005_auto_20161012_0059.py new file mode 100644 index 0000000000000000000000000000000000000000..633a3bd836011c3349e4d8cb70465ac3edbdf926 --- /dev/null +++ b/www/web/warpapi/migrations/0005_auto_20161012_0059.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-10-12 00:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('warpapi', '0004_auto_20161012_0058'), + ] + + operations = [ + migrations.AlterField( + model_name='information', + name='category', + field=models.CharField(blank=True, max_length=100, null=True), + ), + migrations.AlterField( + model_name='information', + name='value', + field=models.CharField(blank=True, max_length=250, null=True), + ), + ] diff --git a/www/web/warpapi/migrations/__init__.py b/www/web/warpapi/migrations/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/www/web/warpapi/models.py b/www/web/warpapi/models.py index 0d091e53aa86d6c73bc9559e7a97c6dd957098c4..c6131537a9b70ac093c5a8356f57f70afd6cd1b0 100644 --- a/www/web/warpapi/models.py +++ b/www/web/warpapi/models.py @@ -1,3 +1,13 @@ -from __future__ import unicode_literals - from django.db import models + +class Information(models.Model): + key = models.CharField(max_length=100) + value = models.CharField(max_length=250, null=True, blank=True) + category = models.CharField(max_length=100, null=True, blank=True) + + def __str__(self): + if self.category: + return "["+self.category+"] "+ str(self.key) + ": " + str(self.value) + else: + return str(self.key) + ": " + str(self.value) + diff --git a/www/web/warpapi/views.py b/www/web/warpapi/views.py index 3f28217d68b96d34af98c45ec82e47b88776f397..0669ce0630b9d03f046b2044ebb82f0fae313f84 100644 --- a/www/web/warpapi/views.py +++ b/www/web/warpapi/views.py @@ -1,11 +1,29 @@ from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework import status +from warpapi.models import Information @api_view(['GET']) def main(request): - if request.method == 'GET': - test = {"test":"value"} - return Response(test) - return Response() + ret= {} + information = Information.objects.all() + for info in information: + if info.category: + if info.category not in ret: + ret[info.category]={} + if info.value: + try: + ret[info.category][info.key] = float(info.value) + except: + ret[info.category][info.key] = info.value + else: + ret[info.category] = {info.key} + else: + ret[info.key] = info.value + + ret["open"] = False + + ret["state"] = {"open": False, "icon": { "open": str(ret["icon"]["open"]), "closed": str(ret["icon"]["closed"])}} + + return Response(ret)