Fakultas Ilmu Komputer UI

Skip to content
Snippets Groups Projects
Commit 506b0b2b authored by Abdul Mughni Wibisono's avatar Abdul Mughni Wibisono
Browse files

Merge branch 'mughni' into 'main' 

Fix table

See merge request !32
parents 37b5b223 08540e8d
No related branches found
No related tags found
1 merge request!32Fix table
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 65 deletions
ingredient/views.py
+ 2
− 2
View file @ 506b0b2b
......@@ -32,8 +32,8 @@ def read_ingredient(request):
FROM INGREDIENT
""")
ingredient = cursor.fetchone()
context["ingredient"] = ingredient[0]
ingredient = cursor.fetchall()
context["ingredient"] = ingredient
return render(request, 'r_ingredient.html', context)
......
order_transaction_courier/templates/r_order_transaction_courier.html
+ 6
− 17
View file @ 506b0b2b
......@@ -20,30 +20,19 @@
<th>Order status</th>
<th>Action</th>
</tr>
<!-- {% for i in transaction_status %}
{% for i in transaction_status %}
<tr>
<td>{{ forloop.counter }}</td>
<td>{{ i.RBranch }}</td>
<td>{{ i.FName }}</td>
<td>{{ i.DateTime }}</td>
<td>{{ i.OrderStatus }}</td>
<td>
<a href = ""><button>Details</button></a>
<a href = ""><button>Complete</button></a>
</td>
</tr>
{% endfor %} -->
<tr>
<td>1</td>
<td>Warung Mantap Depok</td>
<td>Mikayla Putri</td>
<td>2022-11-04 11:30:05</td>
<td>Order Delivery</td>
<td>{{ i.0 }}</td>
<td>{{ i.1 }} + {{ i.2 }}</td>
<td>{{ i.3 }}</td>
<td>{{ i.4 }}</td>
<td>
<a href = ""><button>Details</button></a>
<a href = ""><button>Complete</button></a>
</td>
</tr>
{% endfor %}
</table>
</body>
</html>
......
order_transaction_courier/templates/summary_order_transaction_courier.html
+ 29
− 27
View file @ 506b0b2b
......@@ -6,33 +6,35 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
<h2>Order Summary</h2>
<p>Time of order creation: 2022-11-04 11:30:05</p>
<p>Customer name: Mikayla Putri</p>
<p>Street: Jalan Bahagia nomor 72</p>
<p>District: Cinere</p>
<p>City: Depok</p>
<p>Province: Jawa Barat</p>
<p>Restaurant: Warung Mantap Depok</p>
<p>Street: Jalan Sejahtera nomor 5</p>
<p>District: Bojongsari</p>
<p>City: Depok</p>
<p>Province: Jawa Barat</p>
<p>Food Ordered:</p>
<li>Ayam Goreng (1) - [Notes if any]</li>
<li>Ice Cream (2) - [Notes if any]</li>
<p>Total Food Price: 11000</p>
<p>Total Discount: 0</p>
<p>Delivery Fee: 4000</p>
<p>Total Cost: 15000</p>
<p>Payment Method: RestoPay</p>
<p>Payment Status: Succeed</p>
<p>Order Status: Order Delivery</p>
<p>Courier: Doni Suryana</p>
<p>Number Plate: B 0001 KNN</p>
<p>Vehicle Type: Motor</p>
<p>Vehicle Brand: Honda Vario</p>
<a href = ""><button>Back</button></a>
{% for i in summary_oder %}
<h2>Order Summary</h2>
<p>Time of order creation: 2022-11-04 11:30:05</p>
<p>Customer name: Mikayla Putri</p>
<p>Street: Jalan Bahagia nomor 72</p>
<p>District: Cinere</p>
<p>City: Depok</p>
<p>Province: Jawa Barat</p>
<p>Restaurant: Warung Mantap Depok</p>
<p>Street: Jalan Sejahtera nomor 5</p>
<p>District: Bojongsari</p>
<p>City: Depok</p>
<p>Province: Jawa Barat</p>
<p>Food Ordered:</p>
<li>Ayam Goreng (1) - [Notes if any]</li>
<li>Ice Cream (2) - [Notes if any]</li>
<p>Total Food Price: 11000</p>
<p>Total Discount: 0</p>
<p>Delivery Fee: 4000</p>
<p>Total Cost: 15000</p>
<p>Payment Method: RestoPay</p>
<p>Payment Status: Succeed</p>
<p>Order Status: Order Delivery</p>
<p>Courier: Doni Suryana</p>
<p>Number Plate: B 0001 KNN</p>
<p>Vehicle Type: Motor</p>
<p>Vehicle Brand: Honda Vario</p>
<a href = ""><button>Back</button></a>
{% endfor %}}
</body>
</html>
{% endblock %}
\ No newline at end of file
order_transaction_courier/views.py
+ 30
− 3
View file @ 506b0b2b
from django.shortcuts import render
from django.shortcuts import render, redirect
from django.db import connection
def read_order_transaction_courier(request):
return render(request, 'r_order_transaction_courier.html')
context = {}
with connection.cursor() as cursor:
cursor.execute(f"SET SEARCH_PATH TO SIREST")
cursor.execute(f"""
SELECT TF.RBranch, U.FName, U.LName, TH.Datetime, TS.Name
FROM USER_ACC U, TRANSACTION_FOOD TF, TRANSACTION_HISTORY TH, TRANSACTION_STATUS TS, CUSTOMER C, TRANSACTION_ACTOR TA
WHERE U.Email = TA.Email
AND T.Email = C.Email
AND C.Email = T.Email
AND T.Email = TF.Email
AND TF.Datetime = TH.Datetime
AND TH.TSId = TS.Id
""")
transaction_status = cursor.fetchall()
context["transaction_status"] = transaction_status
return render(request, 'r_order_transaction_courier.html', context)
def summary_order_transaction_courier(request):
return render(request, 'summary_order_transaction_courier.html')
\ No newline at end of file
context = {}
with connection.cursor() as cursor:
cursor.execute(f"SET SEARCH_PATH TO SIREST")
cursor.execute(f"""
SELECT TH.Datetime, U.FName, U.LName, T.Street, T.District, T.City, T.Province,
R.RName, R.Street, R.District, R.City, R.Province,
""")
return render(request, 'summary_order_transaction_courier.html', context)
\ No newline at end of file
project_django/settings.py
+ 3
− 3
View file @ 506b0b2b
......@@ -100,9 +100,9 @@ DATABASES = {
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'nafis.azizi',
'USER': 'nafisaziziriza',
'PASSWORD': '',
'NAME': 'mughni',
'USER': 'postgres',
'PASSWORD': 'mughni26',
'HOST': 'localhost',
'PORT': '5432',
}
......
restaurant_category/templates/r_restaurant_category.html
+ 1
− 8
View file @ 506b0b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<style>
table, th, td {
border: 1px solid black;
border: 1px solid black;
}
</style>
</head>
......@@ -22,13 +22,6 @@
<td>{{ forloop.counter }}</td>
<td>{{ i.0 }}</td>
<td><a href = 'delete_category/{{ i.0 }}'><button>Delete</button></a></td>
<!-- <td>
<form method="POST" action="{% url 'delete_category' i.0 %}">
{% csrf_token %}
<button type="submit">Delete</button>
</form>
</td> -->
</tr>
{% endfor %}
</table>
......
restaurant_category/views.py
+ 2
− 2
View file @ 506b0b2b
......@@ -32,8 +32,8 @@ def read_restaurant_category(request):
FROM RESTAURANT_CATEGORY
""")
category = cursor.fetchone()
context["category"] = category[0]
category = cursor.fetchall()
context["category"] = category
return render(request, "r_restaurant_category.html", context)
......
templates/admin_base.html
+ 3
− 3
View file @ 506b0b2b
......@@ -27,12 +27,12 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="dropdown10" data-bs-toggle="dropdown" aria-expanded="false">Restaurant</a>
<ul class="dropdown-menu" aria-labelledby="dropdown10">
<li><a class="dropdown-item" href="restaurant_category/templates/r_restaurant_category.html/">Restaurant Category List</a></li>
<li><a class="dropdown-item" href="{% url 'restaurant_category:read_restaurant_category'">Restaurant Category List</a></li>
<li><a class="dropdown-item" href="restaurant_category/templates/c_restaurant_category.html/">Create Restaurant Category</a></li>
<li><a class="dropdown-item" href="#">Food Category List</a></li>
<li><a class="dropdown-item" href="#">Create Food Category</a></li>
<li><a class="dropdown-item" href="food_ingredient/templates/r_food_ingredient.html/">Food Ingredient List</a></li>
<li><a class="dropdown-item" href="food_ingredient/templates/c_food_ingredient.html/">Create Food Ingredient</a></li>
<li><a class="dropdown-item" href="food_ingredient/templates/r_ingredient.html/">Food Ingredient List</a></li>
<li><a class="dropdown-item" href="food_ingredient/templates/c_ingredient.html/">Create Food Ingredient</a></li>
<li><a class="dropdown-item" href="#">Restaurant and Food List</a></li>
</ul>
</li>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Excellence In Teamwork