Skip to content

Commit

Permalink
Semi Testing Update
Browse files Browse the repository at this point in the history
  • Loading branch information
agent87 committed Feb 7, 2022
1 parent 000304b commit 1053e6d
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 261 deletions.
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Django",
"type": "python",
"request": "launch",
"program": "manage.py",
"args": [
"runserver"
],
"django": true
}
]
}
1 change: 1 addition & 0 deletions DashboardApp/templates/DashboardApp/Base.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@

</script>


{% block script %}

{% endblock %}
Expand Down
30 changes: 27 additions & 3 deletions DashboardApp/templates/DashboardApp/ParkingLogs/Parking.html
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,15 @@ <h3 class="card-title">Parked Vehicles List</h3>
$('#CheckoutForm-ticket_id').val(ticket_id);
$('#CheckoutForm-plate_number').val(data.fields.plate_number);

$('#checkout_entry_date').val(data.fields.entry_date).change();
$('#checkout_entry_time').val()
$('#checkout_entry_date').val(data.fields.checkin_date).change();
$('#checkout_entry_time').val(data.fields.checkin_time).change();
$('#checkout_entry_gate').val(data.fields.entry_gate).change();

$('#checkout_exit_date').val(now_datetime.toISOString().split('T')[0]).change();
$('#checkout_exit_time').val(now_datetime.toISOString().split('T')[1].slice(0,5)).change();
$('#checkout_exit_time').val(now_datetime.toLocaleTimeString().split('T')[0].slice(0,4)).change();
$('#checkout_exit_gate').val(data.fields.entry_gate).change();

console.log(data.fields.checkin_time, now_datetime.toLocaleTimeString().split('T')[0].slice(0,4))

$('#checkout_cost').val(parseInt(data.fields.cost));

Expand All @@ -220,7 +221,30 @@ <h3 class="card-title">Parked Vehicles List</h3>
$('#ConfirmForm').attr('action', "{% url 'parking' %}");
});
});
</script>

<script>
function fetch_cost() {
var ticket_id = $('#CheckoutForm-ticket_id').val();
var checkout_date = $('#checkout_exit_date').val();
var checkout_time = $('#checkout_exit_time').val();

$.ajax({
url: '?format=json&ticket_id='+ticket_id + "&checkout_date=" + checkout_date + "&checkout_time=" + checkout_time,
success : function(data) {
var checkin_datetime = new Date(data.checkin_time);
$('#checkout_cost').val(data.fields.cost).change()
$.each(data.alerts,function(index,value){toastr.error(value.message)})
}

})
};

$(function(){
$("checkout_exit_time").change(function(){
console.log($(this).val());
});
});
</script>

{% endblock %}

This file was deleted.

139 changes: 0 additions & 139 deletions DashboardApp/templates/DashboardApp/Subscribers/Subscriptions.html

This file was deleted.

2 changes: 1 addition & 1 deletion DashboardApp/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
###Subcribers
path('subscription', views.subscription.as_view() , name='subscription'),

path('accounts', views.responses.user_page, name='accounts_page'),
path('accounts', views.users.add_user, name='accounts_page'),
path('accounts/add', views.users.add_user, name='add_account'),
path('accounts/profile', views.users.self_profile, name='self_profile'),
path('accounts/<int:user_id>/profile', views.users.user_profile, name='user_profile'),
Expand Down
77 changes: 9 additions & 68 deletions DashboardApp/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from django.core import serializers
from django.contrib.auth.mixins import LoginRequiredMixin
from DashboardApp import forms
from datetime import datetime
import json
import time

Expand Down Expand Up @@ -136,10 +137,12 @@ def get(self, request):
if ticket_obj.exists():
ticket_json = {'fields' :json.loads(serializers.serialize('json', [ticket_obj[0],]))[0]['fields']}
ticket_json['fields']['cost'], ticket_json['alerts'] = models.Tarrif.match_tarrif(time.time(), ticket_json['fields']['checkin_time'])
ticket_json['fields']['checkin_time'] = datetime.utcfromtimestamp(ticket_obj.first().checkin_time).strftime('%H:%M')
ticket_json['fields']['checkin_date'] = datetime.utcfromtimestamp(ticket_obj.first().checkin_time).strftime('%Y-%m-%d')
return JsonResponse(ticket_json, safe=False)
else:
return JsonResponse({'error': 'No such ticket exists'})
elif request.GET.get('ticket_id') and request.GET.get('cost') and request.GET.get('checkout_time') and request.GET.get('checkin_time'):
elif request.GET.get('ticket_id') and request.GET.get('checkout_time') and request.GET.get('checkin_time'):
response = {'fields': {'cost': models.Tarrif.match_tarrif(request.GET.get('checkout_time'), request.GET.get('checkin_time') ) }}

return JsonResponse({'error': 'No such ticket exists'})
Expand Down Expand Up @@ -178,6 +181,9 @@ def post(self, request):

elif request.POST.get('action') == 'update':
form = forms.TicketForm.CheckinForm(request.POST)
checkin = forms.TicketForm.CheckinForm()
checkout = forms.TicketForm.CheckoutForm()
ticket = forms.TicketForm.CheckoutForm()
if form.is_valid():
form.update()
self.context['vehicles'] = models.Parkinglog.objects.filter(customer_id=request.user.customer_id.customer_id)
Expand Down Expand Up @@ -206,83 +212,18 @@ def post(self, request):
return HttpResponseBadRequest()

class subscription(LoginRequiredMixin, View):
template_name = "DashboardApp/Subscribers/Subscriptions.html"
template_name = "DashboardApp/Subscription/Subscriptions.html"
context = {'context' : forms.SubscriptionForm }

def get(self, request):
self.context['subscribers'] = models.Subscriptions.objects.filter(customer_id=request.user.customer_id.customer_id)
#self.context['subscribers'] = models.Subscriptions.objects.filter(customer_id=request.user.customer_id.customer_id)
return render(request, self.template_name, self.context)

def post(self, request):
return render(request, self.template_name, self.context)



# Create your views here.
class responses:
def login_page(request, redirect_to=None):
if request.method == "POST":
username = request.POST.get('username')
password = request.POST.get('password')
user = auth.authenticate(request, username=username, password=password)
if user is not None:
return redirect(reverse('history_page'))
else:
return render(request, 'DashboardApp/Authentication/login.html', {'code': 302})
else:
return render(request, 'DashboardApp/Authentication/login.html')


def testing(request):
return render(request, 'Auth/histor.html')



@login_required
def parked_page(request):
context = {'parked_vehicles' : models.Parkinglog.objects.filter(customer_id=request.user.customer_id.customer_id, parked=True)}
context['EntranceFormContext'] = {'gates' : models.Gates.objects.filter(customer_id=request.user.customer_id.customer_id)}
return render(request, 'DashboardApp/ParkingLogs/ParkedVehicles.html', context)

@login_required
def subscribers_page(request):
context = {"subscription" : models.Subscriptions.objects.filter(customer_id = request.user.customer_id.customer_id)}
context['user'] = request.user
return render(request, 'DashboardApp/Subscribers/subscription.html', context)

@login_required
def user_page(request):
context = {'users': models.Users.objects.filter(customer_id = request.user.customer_id.customer_id)}
context['user'] = request.user
return render(request, 'DashboardApp/Accounts/user.html', context)

@login_required
def logout_request(request):
auth.logout(request)
return redirect(reverse('logout_request'))

class Customers:
def RegisterView(request):
return render(request, 'DashboardApp/Accounts/CustomerForm.html')


def register(request):
try:
customer = models.Customers.enroll_customer(company_name=request.POST.get('customer_name'), address = request.POST.get('address'))
if customer[0]:
try:
User = models.Users.add_user(customer[1].customer_id, request.POST.get('first_name'), request.POST.get('last_name'), request.POST.get('email'), request.POST.get('phonenum'), request.POST.get('password'), 'Admin')
if User[0]:
return redirect(reverse('VerifyEmail'))
else:
return redirect(reverse('RegisterView'))
except ObjectDoesNotExist:
return redirect(reverse('RegisterView'))

except ObjectDoesNotExist:
return redirect(reverse('RegisterView'))



class DashboardView:
@login_required
Expand Down
Loading

0 comments on commit 1053e6d

Please sign in to comment.