diff --git a/delivery_fee/models.py b/delivery_fee/models.py
index 71a836239075aa6e6e4ecb700e9c42c95c022d91..4f5a576ba60be7f2913c00d448c9a91224611af3 100644
--- a/delivery_fee/models.py
+++ b/delivery_fee/models.py
@@ -1,3 +1,9 @@
from django.db import models
+import datetime
+from django.contrib.auth.models import User
-# Create your models here.
+# class Task(models.Model):
+# user = models.ForeignKey(User,on_delete=models.CASCADE,)
+# province = models.CharField(max_length=255)
+# motorate = models.CharField(max_length=255)
+# carrate = models.CharField(max_length=255)
\ No newline at end of file
diff --git a/delivery_fee/templates/C_delivery_fee.html b/delivery_fee/templates/C_delivery_fee.html
index 7567f469f8ed06c86e48a0e298da3e714212c87d..25304e8d3db0f3ed4649dce473d80e1f743decc9 100644
--- a/delivery_fee/templates/C_delivery_fee.html
+++ b/delivery_fee/templates/C_delivery_fee.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'admin_base.html' %}
{% block content %}
<html>
@@ -14,7 +14,7 @@
<input type="text" id="motorate" name="motorate"><br><br>
<label for="carrate">Car Delivery Rate:</label>
<input type="text" id="carrate" name="carrate"><br><br>
- <button class="btn btn-success my-3" type="submit" id="submitbutton">Save</button>
+ <button class="btn btn-success my-3" type="submitbutton" id="add_fee">Save</button>
</form>
</h1>
</body>
diff --git a/delivery_fee/templates/R_delivery_fee.html b/delivery_fee/templates/R_delivery_fee.html
index d45a23abf5466a5f1319eee923210773acf58c67..6c08745cd6f06c93fc8ee6bc43b24d6154321242 100644
--- a/delivery_fee/templates/R_delivery_fee.html
+++ b/delivery_fee/templates/R_delivery_fee.html
@@ -1,5 +1,5 @@
-{% extends 'base.html' %}
-{% block content %}
+{% extends 'admin_base.html' %}
+ {% block content %}
<html>
<head>
@@ -20,17 +20,19 @@
<th>Actions</th>
</tr>
<tr>
- <td>1</td>
- <td>DKI Jakarta</td>
- <td>10000</td>
- <td>15000</td>
+ {% for item in list_item %}
+ <td>{{item.pk}}</td>
+ <td>{{item.province}}</td>
+ <td>{{item.motorate}}</td>
+ <td>{{item.carrate}}</td>
+ {%endfor%}
<td>
- <button type="submit" id="editbutton">Edit</button><br>
- <button type="submit" id="deletebutton">Delete</button>
+ <button type="submit" id="editbutton"><a href="/delivery_fee/change_fee">Edit</a></button><br>
+ <button type="submit" id="delete_${task.pk}">Delete</button>
</td>
</tr>
</table>
</body>
</html>
-{% endblock content %}
+ {% endblock content %}
diff --git a/delivery_fee/templates/U_delivery_fee.html b/delivery_fee/templates/U_delivery_fee.html
index 8cfa74e039d4f38f7360aac224b0ae38fe77eaef..53b3a73e9668f282fb2dc34694c138d74b9c1ab4 100644
--- a/delivery_fee/templates/U_delivery_fee.html
+++ b/delivery_fee/templates/U_delivery_fee.html
@@ -1,5 +1,4 @@
-{% extends 'base.html' %}
-
+{% extends 'admin_base.html' %}
{% block content %}
<html>
<head>
@@ -8,12 +7,12 @@
<h1>
<h5>Change Delivery Fee per KM</h5>
<form action="/action_page.php">
- <label for="province">Province: DKI Jakarta</label><br>
+ <label for="province">Province:{{item.province}}</label><br>
<label for="motorate">Motorcycle Delivery Rate:</label>
<input type="text" id="motorate" name="motorate"><br><br>
<label for="carrate">Car Delivery Rate:</label>
<input type="text" id="carrate" name="carrate"><br><br>
- <button class="btn btn-success my-3" type="submit" id="submitbutton">Save</button>
+ <button class="btn btn-success my-3" type="submitbutton" id="change_fee">Save</button>
</form>
</h1>
</body>
diff --git a/delivery_fee/urls.py b/delivery_fee/urls.py
index 15eb2e9bb0860d305781d8b10c8e71f3a6b97670..8b5715f2d42027a888685c84660d720685dd0ba9 100644
--- a/delivery_fee/urls.py
+++ b/delivery_fee/urls.py
@@ -7,4 +7,5 @@ urlpatterns = [
path('', show_fee, name='show_fee'),
path('add_fee/', add_fee, name='add_fee'),
path('change_fee/', change_fee, name='change_fee'),
+ path('delete_fee/', delete_fee, name='delete_fee'),
]
\ No newline at end of file
diff --git a/delivery_fee/views.py b/delivery_fee/views.py
index bb0defdc481e248f330f956573ab4e33b32589bf..fc4d472f9b4ef297ec5efe076323c1c156dc292b 100644
--- a/delivery_fee/views.py
+++ b/delivery_fee/views.py
@@ -1,13 +1,62 @@
-from django.shortcuts import render
-from django.http import HttpResponse
+from django.shortcuts import render, redirect
+from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
+from django.urls import reverse
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib import messages
+from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.decorators import login_required
from django.core import serializers
+import datetime
+# from delivery_fee.models import Task
def show_fee(request):
- return render(request, "R_delivery_fee.html")
+ return render(request, "R_delivery_fee.html",)
def add_fee(request):
+# if request.method == "POST":
+# province = request.POST.get("province")
+# motorate = request.POST.get("motorate")
+# carrate = request.POST.get("carrate")
+# Task.objects.create(
+# user=request.user,
+# province=province,
+# motorate=motorate,
+# carrate=carrate,
+# )
+# return HttpResponseRedirect(reverse("delivery_fee:show_fee"))
return render(request, "C_delivery_fee.html")
def change_fee(request):
- return render(request, "U_delivery_fee.html")
\ No newline at end of file
+# if request.method == "PUT":
+# task = Task.objects.get(user=request.user, id=id)
+# task.save()
+# return JsonResponse(
+# {
+# "pk": task.id,
+# "fields": {
+# "province": task.province,
+# "motorate": task.motorate,
+# "carrate": task.carrate,
+# },
+# },
+# status=200,
+# )
+ return render(request, "U_delivery_fee.html")
+
+def delete_fee(request, id):
+# if request.method == "DELETE":
+# task = Task.objects.get(user=request.user, id=id)
+# task.delete()
+# return JsonResponse(
+# {
+# "pk": task.id,
+# "fields": {
+# "province": task.province,
+# "motorate": task.motorate,
+# "carrate": task.carrate,
+# },
+# },
+# status=200,
+# )
+ return render(request, "U_delivery_fee.html")
diff --git a/food/models.py b/food/models.py
index 71a836239075aa6e6e4ecb700e9c42c95c022d91..b42053196313b9d7a7e583f619c46c9a593ca974 100644
--- a/food/models.py
+++ b/food/models.py
@@ -1,3 +1,27 @@
from django.db import models
+import datetime
+from django.contrib.auth.models import User
-# Create your models here.
+# class Task(models.Model):
+# user = models.ForeignKey(User,on_delete=models.CASCADE,)
+# fname = models.CharField(max_length=255)
+# description = models.CharField(max_length=255)
+# stock = models.IntegerField()
+# price = models.IntegerField()
+# fatcat = models.CharField(max_length=255)
+# yngvi = models.CharField(max_length=255)
+
+# class Resto(models.Model):
+# user = models.ForeignKey(User,on_delete=models.CASCADE,)
+# rname = models.CharField(max_length=255)
+# rbranch = models.CharField(max_length=255)
+# rating = models.IntegerField()
+# rphone = models.IntegerField()
+# rstreet = models.CharField(max_length=255)
+# rdistrict = models.CharField(max_length=255)
+# rcity = models.CharField(max_length=255)
+# rprovince = models.CharField(max_length=255)
+# rcat = models.CharField(max_length=255)
+# opday = models.CharField(max_length=255)
+# opstart = models.TimeField
+# opend = models.TimeField
diff --git a/food/templates/C_food_data.html b/food/templates/C_food_data.html
index 3805ffda2cb8728254a0ed9420e17104afbc2fec..a7fed20f6281b3b70a489a8e86a56d0fca3032b5 100644
--- a/food/templates/C_food_data.html
+++ b/food/templates/C_food_data.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'restaurant_base.html' %}
{% block content %}
<html>
@@ -12,7 +12,7 @@
<input type="text" id="fname" name="fname"><br><br>
<label for="desc">Description:</label>
<input type="text" id="desc" name="desc"><br><br>
- <label for="Stock">Stock:</label>
+ <label for="stock">Stock:</label>
<input type="number" id="Stock" name="Stock"><br><br>
<label for="price">Price:</label>
<input type="number" id="price" name="price"><br><br>
@@ -55,7 +55,7 @@
<buttontype="submit" id="addyngvi">+</button>
</form>
<br><br>
- <button class="btn btn-success my-3" type="submit" id="submitbutton">Save</button>
+ <button class="btn btn-success my-3" type="submit" id="add_food">Save</button>
</form>
</h1>
</body>
diff --git a/food/templates/R_food_data.html b/food/templates/R_food_data.html
index a0eae476ceb2b82f77aab3716668802b51ed7346..b24114cf7b1bcf26e56868a03e7b332a35b431f8 100644
--- a/food/templates/R_food_data.html
+++ b/food/templates/R_food_data.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'restaurant_base.html' %}
{% block content %}
<html>
@@ -23,16 +23,18 @@
<th>action</th>
</tr>
<tr>
- <td>1</td>
- <td>Sashimi Platter</td>
- <td>Platter of Mixed Raw Fish</td>
- <td>50</td>
- <td>43000</td>
- <td>Japanese</td>
- <td>Rosette Lichen, Plains Springparsley</td>
+ {% for item in list_item %}
+ <td>{{item.pk}}</td>
+ <td>{{item.fname}}</td>
+ <td>{{item.desc}}</td>
+ <td>{{item.stock}}</td>
+ <td>{{item.price}}</td>
+ <td>{{item.fatcat}}</td>
+ <td>{{item.yngvi}}</td>
+ {%endfor%}
<td>
- <button type="submit" id="editbutton">Edit</button><br>
- <button type="submit" id="deletebutton">Delete</button>
+ <button type="submit" id="editbutton"><a href="/food/change_food">Edit</a></button><br>
+ <button type="submit" id="delete_${task.pk}">Delete</button>
</td>
</tr>
</table>
diff --git a/food/templates/R_resto_detail.html b/food/templates/R_resto_detail.html
index 70f70789e7fcdb70b3f119f36244b3270a2d4897..ace6432cddf050685973e18965859fdf5079cbfd 100644
--- a/food/templates/R_resto_detail.html
+++ b/food/templates/R_resto_detail.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'admin_base.html' %}
{% block content %}
<html>
@@ -21,15 +21,16 @@
<p>Rating: 6</p>
<p>Restaurant Category: Japanese</p>
<p>Operational Hours:
- Tuesday 08:00:00-23:30:00
- </p>
+ <p>Day: Tuesday</p>
+ <p>Start Hours: 08:00:00</p>
+ <p>End Hours: 23:30:00</p>
<p>Ongoing Promos:
IndependenceDay
PESTA41
</p>
</body>
</html>
- <button type="submit" id="back">Back</button>
+ <button type="submit" id="back"><a href="/food/">Back</a></button>
{% endblock content %}
diff --git a/food/templates/R_resto_list.html b/food/templates/R_resto_list.html
index 87197172f5b66472a9652dc7faacd436ab6a7daa..7d9c4c616f83cec7a04b4c5be62746ffa06854e3 100644
--- a/food/templates/R_resto_list.html
+++ b/food/templates/R_resto_list.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'admin_base.html' %}
{% block content %}
<html>
@@ -23,8 +23,8 @@
<td>Sushi Tei Lombok</td>
<td>6</td>
<td>
- <button type="submit" id="showdetail">Details</button><br>
- <button type="submit" id="showmenu">Menu</button>
+ <button type="submit" id="showdetail"><a href="/food/details">Details</a></button><br>
+ <button type="submit" id="showmenu"><a href="/food/menu">Menu</a></button>
</td>
</tr>
</table>
diff --git a/food/templates/U_food_data.html b/food/templates/U_food_data.html
index f5fa7a457af4519f1f5afbe3de8ac4cb5d1e18c2..c401c3852546a1e9519c346baf9306b486ce4e49 100644
--- a/food/templates/U_food_data.html
+++ b/food/templates/U_food_data.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'restaurant_base.html' %}
{% block content %}
<html>
diff --git a/food/views.py b/food/views.py
index a678d689af931365b234f57ec71ac38c54a68843..7b3ed5274cdfa24350174342ab1f9516e1b96f15 100644
--- a/food/views.py
+++ b/food/views.py
@@ -1,7 +1,12 @@
-from django.shortcuts import render
-from django.http import HttpResponse
+from django.shortcuts import render, redirect
+from django.http import HttpResponse, HttpResponseRedirect, JsonResponse
+from django.urls import reverse
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib import messages
+from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.decorators import login_required
from django.core import serializers
-
+import datetime
def show_resto_list(request):
return render(request, "R_resto_list.html")
@@ -13,10 +18,43 @@ def show_food(request):
return render(request, "R_food_data.html")
def add_food(request):
+ # if request.method == "POST":
+ # fname = request.POST.get("fname")
+ # description = request.POST.get("desc")
+ # stock = request.POST.get("stock")
+ # price = request.POST.get("price")
+ # fatcat = request.POST.get("fatcat")
+ # yngvi = request.POST.get("yngvi")
+ # Task.objects.create(
+ # user=request.user,
+ # fname = fname,
+ # description = description,
+ # stock = stock,
+ # price = price,
+ # fatcat = fatcat,
+ # yngvi=yngvi,
+ # )
+ # return HttpResponseRedirect(reverse("delivery_fee:show_food"))
return render(request, "C_food_data.html")
def change_food(request):
+ # if request.method == "PUT":
+ # task = Task.objects.get(user=request.user, id=id)
+ # task.save()
+ # return JsonResponse(
+ # {
+ # "pk": task.id,
+ # "fields": {
+ # "fname" : task.fname,
+ # "description" : task.description,
+ # "stock" : task.stock,
+ # "price" : task.price,
+ # "fatcat":task.fatcat,
+ # "yngvi":task.yngvi,
+ # },
+ # },
+ # status=200,
+ # )
return render(request, "U_food_data.html")
-
diff --git a/food_ingredient/templates/c_food_ingredient.html b/food_ingredient/templates/c_food_ingredient.html
index 975477c03f28a2efbf663e5ea166a9f3e4fd4b2a..2ac3cef1955690ce6509748dccd43aadeb4efe78 100644
--- a/food_ingredient/templates/c_food_ingredient.html
+++ b/food_ingredient/templates/c_food_ingredient.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'restaurant_base.html' %}
{% block content %}
<head>
<meta charset="UTF-8">
diff --git a/food_ingredient/templates/r_food_ingredient.html b/food_ingredient/templates/r_food_ingredient.html
index eef77ce18aef2ea429f4119237f477ed1376e3dc..989259a387ce5c56ec72d36e4d8b909ed2f5d6c8 100644
--- a/food_ingredient/templates/r_food_ingredient.html
+++ b/food_ingredient/templates/r_food_ingredient.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'restaurant_base.html' %}
{% block content %}
<head>
<meta charset="UTF-8">
diff --git a/templates/admin_base.html b/templates/admin_base.html
index 95e458ebe362c2bb598b97c9bd3901328a598304..e35b976f6dc3335eaad444538ef1f441460f0b1f 100644
--- a/templates/admin_base.html
+++ b/templates/admin_base.html
@@ -33,7 +33,7 @@
<li><a class="dropdown-item" href="#">Create Food Category</a></li>
<li><a class="dropdown-item" href="#">Food Ingredient List</a></li>
<li><a class="dropdown-item" href="#">Create Food Ingredient</a></li>
- <li><a class="dropdown-item" href="#">Restaurant and Food List</a></li>
+ <li><a class="dropdown-item" href="{% url 'food:show_resto_list' %}">Restaurant and Food List</a></li>
</ul>
</li>
<li class="nav-item dropdown">
@@ -46,8 +46,8 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="dropdown10" data-bs-toggle="dropdown" aria-expanded="false">Order</a>
<ul class="dropdown-menu" aria-labelledby="dropdown10">
- <li><a class="dropdown-item" href="#">Delivery Fee per KM List</a></li>
- <li><a class="dropdown-item" href="#">Create Delivery Fee per KM</a></li>
+ <li><a class="dropdown-item" href="{% url 'delivery_fee:show_fee' %}">Delivery Fee per KM List</a></li>
+ <li><a class="dropdown-item" href="{% url 'delivery_fee:add_fee' %}">Create Delivery Fee per KM</a></li>
</ul>
</li>
<li class="nav-item">
diff --git a/templates/base.html b/templates/base.html
index 2987a34d370296d3380fbbab07715ee67fb9d503..13a879312385a47fbc6956a6267f8a6e53531d47 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -71,13 +71,13 @@
</ul>
</li>
<li class="nav-item">
- <a class="nav-link active" aria-current="page" href="{% url 'restopay:read_restopay' %}">Restaurant and Food List</a>
+ <a class="nav-link active" aria-current="page" href="#">Restaurant and Food List</a>
</li>
<li class="nav-item">
- <a class="nav-link active" aria-current="page" href="{% url 'restopay:read_restopay' %}">RestoPay</a>
+ <a class="nav-link active" aria-current="page" href="#">RestoPay</a>
</li>
<li class="nav-item">
- <a class="nav-link active" aria-current="page" href="{% url 'restopay:read_restopay' %}">Logout</a>
+ <a class="nav-link active" aria-current="page" href="#">Logout</a>
</li>
</ul>
</div>
diff --git a/templates/restaurant_base.html b/templates/restaurant_base.html
index 22e3af4aa52e65ed02e0d943698513669f6ce78f..00b7daefd17a6bd5f6aba3a2ac6bf59e8a879a76 100644
--- a/templates/restaurant_base.html
+++ b/templates/restaurant_base.html
@@ -34,8 +34,8 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="dropdown10" data-bs-toggle="dropdown" aria-expanded="false">Food</a>
<ul class="dropdown-menu" aria-labelledby="dropdown10">
- <li><a class="dropdown-item" href="#">Food List</a></li>
- <li><a class="dropdown-item" href="#">Create Food</a></li>
+ <li><a class="dropdown-item" href="{% url 'food:show_food' %}">Food List</a></li>
+ <li><a class="dropdown-item" href="{% url 'food:add_food' %}">Create Food</a></li>
</ul>
</li>
<li class="nav-item dropdown">