diff --git a/jauns_projekts/jauns_projekts/urls.py b/jauns_projekts/jauns_projekts/urls.py
index 853dea6..30fefb1 100644
--- a/jauns_projekts/jauns_projekts/urls.py
+++ b/jauns_projekts/jauns_projekts/urls.py
@@ -20,10 +20,10 @@ import uzdevumi.views
urlpatterns = [
path('admin/', admin.site.urls),
- path('university', uzdevumi.views.form),
- path('visitors', uzdevumi.views.form),
- path('add_visit', uzdevumi.views.add_visit),
- path('add_user', uzdevumi.views.add_user),
+ # path('university', uzdevumi.views.form),
+ # path('visitors', uzdevumi.views.form),
+ #path('add_visit', uzdevumi.views.add_visit),
+ path('add-user', uzdevumi.views.adduser),
]
diff --git a/jauns_projekts/templates/adduser.html b/jauns_projekts/templates/adduser.html
new file mode 100644
index 0000000..576c85e
--- /dev/null
+++ b/jauns_projekts/templates/adduser.html
@@ -0,0 +1,14 @@
+
+
+
+
+ Add user
+
+
+
+
+
\ No newline at end of file
diff --git a/jauns_projekts/templates/user.html b/jauns_projekts/templates/user.html
new file mode 100644
index 0000000..be8fce1
--- /dev/null
+++ b/jauns_projekts/templates/user.html
@@ -0,0 +1,11 @@
+
+
+
+
+ Users
+
+
+ {{ user.username }}
+ E-mail: {{ user.e_mail }}
+
+
\ No newline at end of file
diff --git a/jauns_projekts/uzdevumi/form.py b/jauns_projekts/uzdevumi/form.py
new file mode 100644
index 0000000..eb1f02a
--- /dev/null
+++ b/jauns_projekts/uzdevumi/form.py
@@ -0,0 +1,11 @@
+from django.forms import (
+ Form,
+ CharField,
+ EmailField,
+
+)
+
+
+class CreateUserForm(Form):
+ username = CharField()
+ email = EmailField()
diff --git a/jauns_projekts/uzdevumi/models.py b/jauns_projekts/uzdevumi/models.py
index 71a8362..c656c84 100644
--- a/jauns_projekts/uzdevumi/models.py
+++ b/jauns_projekts/uzdevumi/models.py
@@ -1,3 +1,9 @@
from django.db import models
# Create your models here.
+class User:
+
+ def __init__(self, username, email):
+ self.username = username
+ self.email = email
+
diff --git a/jauns_projekts/uzdevumi/views.py b/jauns_projekts/uzdevumi/views.py
index 80cc44d..8fd005b 100644
--- a/jauns_projekts/uzdevumi/views.py
+++ b/jauns_projekts/uzdevumi/views.py
@@ -1,62 +1,98 @@
from django.shortcuts import render
-from django.http import HttpResponse
+# from django.http import HttpResponse
+from .form import CreateUserForm
# Create your views here.
+#
+# def form(request):
+# if request.method == 'POST':
+# fullname = request.POST['fullname']
+# mathematics = int(request.POST['mathematics'])
+# latvian_lng = int(request.POST['latvian_lng'])
+# foreign_lng = int(request.POST['foreign_lng'])
+# if mathematics < 40 or latvian_lng < 40 or foreign_lng < 40:
+# return HttpResponse(f'{fullname} can not apply to university')
+# else:
+# return HttpResponse(f'Hello, {fullname}! You can apply to our university. Your grades: Mathematics: {mathematics}, Latviesu vld: {latvian_lng}, Svesvaloda: {foreign_lng}')
+#
+# return render(
+# request,
+# template_name='form.html',
+# )
+#
+# def add_visit(request):
+#
+# if request.method == 'POST':
+#
+# context = {
+# 'visitor': request.POST['visitor'],
+# 'date_time': request.POST['date_time'],
+# 'reason': request.POST['reason'],
+# }
+#
+# return render(
+# request,
+# template_name='visit.html',
+# context=context,
+# )
+#
+# return render(
+# request,
+# template_name='visit_form.html',
+# )
+#
+# def add_user(request):
+#
+# if request.method == 'POST':
+#
+# context = {
+# 'username': request.POST['username'],
+# 'email': request.POST['email'],
+# }
+#
+# return render(
+# request,
+# template_name='add_user.html',
+# context=context,
+# )
+#
+# return render(
+# request,
+# template_name='add_user_form.html',
+# )
-def form(request):
- if request.method == 'POST':
- fullname = request.POST['fullname']
- mathematics = int(request.POST['mathematics'])
- latvian_lng = int(request.POST['latvian_lng'])
- foreign_lng = int(request.POST['foreign_lng'])
- if mathematics < 40 or latvian_lng < 40 or foreign_lng < 40:
- return HttpResponse(f'{fullname} can not apply to university')
- else:
- return HttpResponse(f'Hello, {fullname}! You can apply to our university. Your grades: Mathematics: {mathematics}, Latviesu vld: {latvian_lng}, Svesvaloda: {foreign_lng}')
-
- return render(
- request,
- template_name='form.html',
- )
+def adduser(request):
-def add_visit(request):
+ form = CreateUserForm(request.POST or None)
if request.method == 'POST':
- context = {
- 'visitor': request.POST['visitor'],
- 'date_time': request.POST['date_time'],
- 'reason': request.POST['reason'],
- }
+ if form.is_valid():
- return render(
- request,
- template_name='visit.html',
- context=context,
- )
+ user = User(
+ username=form.cleaned_data['username'],
+ email=form.cleaned_data['email'],
+ )
- return render(
- request,
- template_name='visit_form.html',
- )
+ users.append(user)
-def add_user(request):
-
- if request.method == 'POST':
+ context = {
+ 'user': user,
+ }
- context = {
- 'username': request.POST['username'],
- 'email': request.POST['email'],
- }
+ return render(
+ request,
+ template_name='user.html',
+ context=context,
+ )
- return render(
- request,
- template_name='add_user.html',
- context=context,
- )
+ context = {
+ 'form': form,
+ }
return render(
request,
- template_name='add_user_form.html',
+ template_name='adduser.html',
+ context=context,
)
\ No newline at end of file