diff --git a/README.MD b/README.MD index 08915ad..07bd2a4 100644 --- a/README.MD +++ b/README.MD @@ -18,3 +18,9 @@ python3 manage.py migrate -- Django calling Rest Services ? python3 manage.py runserver +-- Django DB Initialisation +# creating the model +python3 manage.py makemigrations +# creating the table +python3 manage.py migrate + diff --git a/artemis/artemis-data/bindings/activemq-bindings-2.bindings b/artemis/artemis-data/bindings/activemq-bindings-2.bindings index f2d804e..e0902c4 100644 Binary files a/artemis/artemis-data/bindings/activemq-bindings-2.bindings and b/artemis/artemis-data/bindings/activemq-bindings-2.bindings differ diff --git a/artemis/artemis-data/journal/activemq-data-1.amq b/artemis/artemis-data/journal/activemq-data-1.amq index 6236400..a70473e 100644 Binary files a/artemis/artemis-data/journal/activemq-data-1.amq and b/artemis/artemis-data/journal/activemq-data-1.amq differ diff --git a/artemis/artemis-data/journal/activemq-data-2.amq b/artemis/artemis-data/journal/activemq-data-2.amq index 4fe7f6b..a4df784 100644 Binary files a/artemis/artemis-data/journal/activemq-data-2.amq and b/artemis/artemis-data/journal/activemq-data-2.amq differ diff --git a/app/__pycache__/config.cpython-311.pyc b/demo/app/__pycache__/config.cpython-311.pyc similarity index 100% rename from app/__pycache__/config.cpython-311.pyc rename to demo/app/__pycache__/config.cpython-311.pyc diff --git a/app/address.py b/demo/app/address.py similarity index 100% rename from app/address.py rename to demo/app/address.py diff --git a/app/basic.py b/demo/app/basic.py similarity index 100% rename from app/basic.py rename to demo/app/basic.py diff --git a/app/config.py b/demo/app/config.py similarity index 100% rename from app/config.py rename to demo/app/config.py diff --git a/app/dice.py b/demo/app/dice.py similarity index 100% rename from app/dice.py rename to demo/app/dice.py diff --git a/app/edit.py b/demo/app/edit.py similarity index 100% rename from app/edit.py rename to demo/app/edit.py diff --git a/app/queue/__pycache__/config.cpython-311.pyc b/demo/app/queue/__pycache__/config.cpython-311.pyc similarity index 100% rename from app/queue/__pycache__/config.cpython-311.pyc rename to demo/app/queue/__pycache__/config.cpython-311.pyc diff --git a/app/queue/ampq_client.py b/demo/app/queue/ampq_client.py similarity index 100% rename from app/queue/ampq_client.py rename to demo/app/queue/ampq_client.py diff --git a/app/queue/ampq_receiver.py b/demo/app/queue/ampq_receiver.py similarity index 100% rename from app/queue/ampq_receiver.py rename to demo/app/queue/ampq_receiver.py diff --git a/app/queue/ampq_sender.py b/demo/app/queue/ampq_sender.py similarity index 100% rename from app/queue/ampq_sender.py rename to demo/app/queue/ampq_sender.py diff --git a/app/queue/ampq_server.py b/demo/app/queue/ampq_server.py similarity index 100% rename from app/queue/ampq_server.py rename to demo/app/queue/ampq_server.py diff --git a/app/queue/client_http.py b/demo/app/queue/client_http.py similarity index 100% rename from app/queue/client_http.py rename to demo/app/queue/client_http.py diff --git a/app/queue/config.py b/demo/app/queue/config.py similarity index 100% rename from app/queue/config.py rename to demo/app/queue/config.py diff --git a/app/queue/connect.json b/demo/app/queue/connect.json similarity index 100% rename from app/queue/connect.json rename to demo/app/queue/connect.json diff --git a/app/queue/db_receive.py b/demo/app/queue/db_receive.py similarity index 100% rename from app/queue/db_receive.py rename to demo/app/queue/db_receive.py diff --git a/app/queue/db_send.py b/demo/app/queue/db_send.py similarity index 100% rename from app/queue/db_send.py rename to demo/app/queue/db_send.py diff --git a/app/queue/send.py b/demo/app/queue/send.py similarity index 100% rename from app/queue/send.py rename to demo/app/queue/send.py diff --git a/app/queue/test.py b/demo/app/queue/test.py similarity index 100% rename from app/queue/test.py rename to demo/app/queue/test.py diff --git a/app/temp.py b/demo/app/temp.py similarity index 100% rename from app/temp.py rename to demo/app/temp.py diff --git a/demo/db.sqlite3 b/demo/db.sqlite3 index 8b6b49d..7dbe766 100644 Binary files a/demo/db.sqlite3 and b/demo/db.sqlite3 differ diff --git a/demo/api_client/basic.py b/demo/demo/api-client.py similarity index 100% rename from demo/api_client/basic.py rename to demo/demo/api-client.py diff --git a/demo/migration/__pycache__/admin.cpython-311.pyc b/demo/migration/__pycache__/admin.cpython-311.pyc index d53ef45..0e26eb2 100644 Binary files a/demo/migration/__pycache__/admin.cpython-311.pyc and b/demo/migration/__pycache__/admin.cpython-311.pyc differ diff --git a/demo/migration/__pycache__/models.cpython-311.pyc b/demo/migration/__pycache__/models.cpython-311.pyc index 3189781..5fa2fcb 100644 Binary files a/demo/migration/__pycache__/models.cpython-311.pyc and b/demo/migration/__pycache__/models.cpython-311.pyc differ diff --git a/demo/migration/__pycache__/urls.cpython-311.pyc b/demo/migration/__pycache__/urls.cpython-311.pyc index d55537a..a54cb12 100644 Binary files a/demo/migration/__pycache__/urls.cpython-311.pyc and b/demo/migration/__pycache__/urls.cpython-311.pyc differ diff --git a/demo/migration/__pycache__/views.cpython-311.pyc b/demo/migration/__pycache__/views.cpython-311.pyc index 2d8ec7c..e2cb3c6 100644 Binary files a/demo/migration/__pycache__/views.cpython-311.pyc and b/demo/migration/__pycache__/views.cpython-311.pyc differ diff --git a/demo/migration/admin.py b/demo/migration/admin.py index 8c38f3f..4c5c7f1 100644 --- a/demo/migration/admin.py +++ b/demo/migration/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin +from migration.models import ShoppingItem # Register your models here. +admin.site.register(ShoppingItem) diff --git a/demo/migration/migrations/0001_initial.py b/demo/migration/migrations/0001_initial.py new file mode 100644 index 0000000..c2d1ca5 --- /dev/null +++ b/demo/migration/migrations/0001_initial.py @@ -0,0 +1,33 @@ +# Generated by Django 5.0.2 on 2024-02-23 10:59 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Product', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=120)), + ('content', models.TextField(blank=True, null=True)), + ('price', models.DecimalField(decimal_places=2, default=99.99, max_digits=15)), + ], + ), + migrations.CreateModel( + name='ShoppingItem', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateField(default=datetime.date.today)), + ('name', models.CharField(max_length=120)), + ('done', models.BooleanField(default=False)), + ], + ), + ] diff --git a/demo/migration/migrations/__pycache__/0001_initial.cpython-311.pyc b/demo/migration/migrations/__pycache__/0001_initial.cpython-311.pyc new file mode 100644 index 0000000..1561491 Binary files /dev/null and b/demo/migration/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/demo/migration/models.py b/demo/migration/models.py index 6d7a892..4b27c7e 100644 --- a/demo/migration/models.py +++ b/demo/migration/models.py @@ -1,6 +1,15 @@ from django.db import models +from datetime import date -# Create your models here. + +class ShoppingItem(models.Model): + created_at = models.DateField(default=date.today) + name = models.CharField(max_length=120) + done = models.BooleanField(default=False) + + def __str__(self): + return str(self.id) + ' - ' + self.name + class Product(models.Model): title = models.CharField(max_length=120) content= models.TextField(blank=True, null=True) diff --git a/demo/migration/templates/migration.html b/demo/migration/templates/migration.html index ecd191f..15ab06f 100644 --- a/demo/migration/templates/migration.html +++ b/demo/migration/templates/migration.html @@ -7,26 +7,28 @@ <style> header { background-color: green; + display: flex; + padding-left: 20px; } body { font-family: 'Open Sans', sans-serif; - background-color: #345688; + background-color: white; } button { height: 40px; width: 40 px; + border-radius: 50%; } .list-item { font-size: 32 px; background-color: white; - height: 60px; + height: 30px; + box-shadow: 2px 2px 2px rgba(0,0,0,0.01); display: flex; - alirgn-items: center; - right: 16px; - bottom: 60px; + align-items: center; } </style> </head> @@ -34,14 +36,25 @@ <header> <h1>Migration Apis</h1> </header> + {% for item in all_items %} <div class="list-item"> - <input type="checkbox"> Element 1 + <input type="checkbox"> {{item.name}} </div> - <div class="list-item"> - <input type="checkbox"> Element 2 - </div> - <button> - + - </button> + {% endfor %} + <button onclick="addItem()">+</button> + <script> + function addItem() { + let itemName = prompt('Neues Element hinzufügen'); + let token = '{{csrf_token}}'; + let formData = new FormData(); + formData.append('itemName',itemName); + formData.append('csrfmiddlewaretoken',token); + fetch('/migration/', { + method: 'POST', + body: formData + }); + window.location.reload(); + } + </script> </body> </html> diff --git a/demo/migration/urls.py b/demo/migration/urls.py index bc6fcff..2ca75e4 100644 --- a/demo/migration/urls.py +++ b/demo/migration/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from . import views +from migration import views urlpatterns = [ path("", views.index, name= "index"), diff --git a/demo/migration/views.py b/demo/migration/views.py index b8fcc4f..6dc2440 100644 --- a/demo/migration/views.py +++ b/demo/migration/views.py @@ -1,14 +1,17 @@ from django.shortcuts import render from django.http import HttpResponse, JsonResponse +from migration.models import ShoppingItem def index(response): return HttpResponse("Welcome to siMed Migration") def migration_home(request): - return render(request,'migration.html') + if request.method == 'POST': + print('Received Data',request.POST['itemName']) + ShoppingItem.objects.create(name= request.POST['itemName']) + all_items = ShoppingItem.objects.all() + return render(request,'migration.html',{'all_items': all_items}) - - def api_home(request,endpoint, params={"message": "Your JSON Repsonse"}): body = request.body data = {} diff --git a/app/queue_consumer.py b/demo/queue/queue_consumer.py similarity index 100% rename from app/queue_consumer.py rename to demo/queue/queue_consumer.py diff --git a/app/queue_producer.py b/demo/queue/queue_producer.py similarity index 100% rename from app/queue_producer.py rename to demo/queue/queue_producer.py