Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@agent87
agent87 committed Feb 1, 2022
1 parent c386371 commit e1e5fa7
Show file tree
Hide file tree
Showing 6 changed files with 345 additions and 178 deletions.
21 changes: 16 additions & 5 deletions DashboardApp/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ class LoginForm(forms.Form):
password = forms.CharField(label='Password', widget=forms.PasswordInput(attrs={'class': 'form-control', 'id':'password', 'placeholder':'Password'}))


class RegistrationForm:
def __init__(self, *args, **kwargs):
self.AdminForm = UserForm()
self.CustomerForm = CustomerForm()

class CustomerForm(forms.Form):
customer_name = forms.CharField(label='Company Name', widget=forms.TextInput(attrs={'class': 'form-control', 'id':'customer_name', 'placeholder':'Company Name'}))
Expand All @@ -29,6 +25,9 @@ class UserForm(forms.Form):
class Meta:
model = SystemApp.models.Users

def verify_mail(self):
pass

class TarrifForm(forms.Form):
tarrif_id = forms.CharField(widget = forms.HiddenInput(attrs={'id':'TarriffForm-tarrif_id'}), required = False)
from_time = forms.IntegerField(label='From Time', widget=forms.NumberInput(attrs={'class': 'form-control', 'id':'from_time','type':'number','placeholder':'Minutes'}))
Expand All @@ -47,4 +46,16 @@ def update(self):
tarrif.to_time = self.cleaned_data['to_time']
tarrif.cost = float(self.cleaned_data['cost'])
tarrif.save()
return tarrif
return tarrif

class TicketForm:
class CheckinForm(forms.Form):
gate = forms.ChoiceField(label='Gate', choices=SystemApp.models.Gates.objects.all().values_list('gate_id', 'name'))
plate_number = forms.CharField(label='Plate Number', widget=forms.TextInput(attrs={'class': 'form-control', 'id':'plate_number', 'placeholder':'Plate Number'}))
entry_time = forms.DateTimeField(label='Entry Time', widget=forms.DateTimeInput(attrs={'class': 'form-control', 'id':'entry_time', 'placeholder':'Entry Time'}))

def create(self):
pass

class CheckoutForm(forms.Form):
pass
18 changes: 13 additions & 5 deletions DashboardApp/templates/DashboardApp/Base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<link rel="stylesheet" href="{% static 'plugins/fontawesome-free/css/all.min.css' %}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'dist/css/adminlte.min.css' %}">
<!-- Toastr Style -->
<link rel="stylesheet" href="{% static 'plugins/toastr/toastr.min.css' %}">
{% block sources %}
{% endblock %}

Expand Down Expand Up @@ -50,7 +52,7 @@
<li class="nav-item">
<a href="{% url 'parked_page' %}" class="nav-link">
<i class="nav-icon fas fa-car-alt"></i>
<p>Parked Vehicles</p>
<p>Parking</p>
</a>
</li>
<li class="nav-item">
Expand All @@ -75,27 +77,27 @@
{% endif %}
<li class="nav-header">MISCELLANEOUS</li>
<li class="nav-item">
<a href="{% url 'self_profile' %}" class="nav-link">
<a href="{% url 'self_profile' %}" id="profile-link" class="nav-link">
<i class="nav-icon fas fa-user-cog"></i>
<p>My Profile</p>
</a>
</li>
{% if user.is_superuser %}
<li class="nav-item">
<a href="{% url 'settings_page' %}" class="nav-link">
<a href="{% url 'settings_page' %}" id="settings-link" class="nav-link">
<i class="nav-icon fas fa-cog"></i>
<p>Systems Settings</p>
</a>
</li>
{% endif %}
<li class="nav-item">
<a href="{% url 'contact_us_page' %}" class="nav-link">
<a href="{% url 'contact_us_page' %}" id="contact-link" class="nav-link">
<i class="nav-icon fas fa-paper-plane"></i>
<p>Contact us</p>
</a>
</li>
<li class="nav-item">
<a href="{% url 'logout' %}" class="nav-link">
<a href="{% url 'logout' %}" id="logout-link" class="nav-link">
<i class="nav-icon fas fa-sign-out-alt"></i>
<p>Sign Out</p>
</a>
Expand Down Expand Up @@ -132,8 +134,14 @@
<script src="{% static 'plugins/jquery/jquery.min.js' %}"></script>
<!-- Bootstrap 4 -->
<script src="{% static 'plugins/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
<!-- Toastr -->
<script src="{% static 'plugins/toastr/toastr.min.js' %}"></script>
<!-- AdminLTE App -->
<script src="{% static 'dist/js/adminlte.min.js' %}"></script>
<script>

</script>

{% block script %}

{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion DashboardApp/templates/DashboardApp/ParkingLogs/EntranceForm.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% block EntranceForm %}

<!-- Default Size -->
<div class="modal fade" id="EntranceForm" tabindex="-1" role="dialog">
<div class="modal fade" id="CheckinFormModal" tabindex="-1" role="dialog">
<div class="modal-dialog " role="document">
<div class="modal-content">
<div class="modal-header">
Expand Down
185 changes: 21 additions & 164 deletions DashboardApp/templates/DashboardApp/ParkingLogs/ParkedVehicles.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,9 @@ <h4 class="text-center display-4">Parked Vehicles</h4>
<div class="container-fluid">
<div class="row">
<div class="col-md-12 offset-md-0">
{% if EntranceFormContext.gates|length > 0 %}
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#EntranceForm">
<button type="button" class="btn btn-default" id="AddVehicleButton" data-toggle="modal" data-target="#CheckinFormModal">
Add Car
</button>
{% else %}
<button type="button" class="btn btn-default toastsDefaultWarning">
Add Car
</button>
{% endif %}
</div>
</div>
<!-- List of Accounts-->
Expand Down Expand Up @@ -97,11 +91,11 @@ <h3 class="card-title">Parked Vehicles List</h3>
</div>

{% block EntranceForm %}

{% include 'DashboardApp/ParkingLogs/EntranceForm.html' with EntranceFormContext=EntranceFormContext %}

{% if EntranceFormContext.gates|length > 0 %}
{% include 'DashboardApp/ParkingLogs/EntranceForm.html' with EntranceFormContext=EntranceFormContext %}

{% endif %}
{% endblock %}

</section>
</div>

Expand Down Expand Up @@ -151,159 +145,22 @@ <h3 class="card-title">Parked Vehicles List</h3>
$('.select2').select2()
});
</script>
<script>
$(function() {
var Toast = Swal.mixin({
toast: true,
position: 'top-end',
showConfirmButton: false,
timer: 3000
});

$('.swalDefaultSuccess').click(function() {
Toast.fire({
icon: 'success',
title: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.swalDefaultInfo').click(function() {
Toast.fire({
icon: 'info',
title: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.swalDefaultError').click(function() {
Toast.fire({
icon: 'error',
title: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.swalDefaultWarning').click(function() {
Toast.fire({
icon: 'warning',
title: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.swalDefaultQuestion').click(function() {
Toast.fire({
icon: 'question',
title: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});

$('.toastrDefaultSuccess').click(function() {
toastr.success('Lorem ipsum dolor sit amet, consetetur sadipscing elitr.')
});
$('.toastrDefaultInfo').click(function() {
toastr.info('Lorem ipsum dolor sit amet, consetetur sadipscing elitr.')
});
$('.toastrDefaultError').click(function() {
toastr.error('Lorem ipsum dolor sit amet, consetetur sadipscing elitr.')
});
$('.toastrDefaultWarning').click(function() {
toastr.warning('Lorem ipsum dolor sit amet, consetetur sadipscing elitr.')
});

$('.toastsDefaultDefault').click(function() {
$(document).Toasts('create', {
title: 'Toast Title',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultTopLeft').click(function() {
$(document).Toasts('create', {
title: 'Toast Title',
position: 'topLeft',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultBottomRight').click(function() {
$(document).Toasts('create', {
title: 'Toast Title',
position: 'bottomRight',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultBottomLeft').click(function() {
$(document).Toasts('create', {
title: 'Toast Title',
position: 'bottomLeft',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultAutohide').click(function() {
$(document).Toasts('create', {
title: 'Toast Title',
autohide: true,
delay: 750,
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultNotFixed').click(function() {
$(document).Toasts('create', {
title: 'Toast Title',
fixed: false,
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultFull').click(function() {
$(document).Toasts('create', {
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.',
title: 'Toast Title',
subtitle: 'Subtitle',
icon: 'fas fa-envelope fa-lg',
})
});
$('.toastsDefaultFullImage').click(function() {
$(document).Toasts('create', {
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.',
title: 'Toast Title',
subtitle: 'Subtitle',
image: '../../dist/img/user3-128x128.jpg',
imageAlt: 'User Picture',
})
});
$('.toastsDefaultSuccess').click(function() {
$(document).Toasts('create', {
class: 'bg-success',
title: 'Toast Title',
subtitle: 'Subtitle',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultInfo').click(function() {
$(document).Toasts('create', {
class: 'bg-info',
title: 'Toast Title',
subtitle: 'Subtitle',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultWarning').click(function() {
$(document).Toasts('create', {
class: 'bg-warning',
title: 'Toast Title',
subtitle: 'Subtitle',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultDanger').click(function() {
$(document).Toasts('create', {
class: 'bg-danger',
title: 'Toast Title',
subtitle: 'Subtitle',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
$('.toastsDefaultMaroon').click(function() {
$(document).Toasts('create', {
class: 'bg-maroon',
title: 'Toast Title',
subtitle: 'Subtitle',
body: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.'
})
});
});
</script>
{% if EntranceFormContext.gates|length == 0 %}
<script>
$(function () {
$("#AddVehicleButton").click(function(){
toastr.error("No Gates Available","You cannot checkin a vehicle without an entry gate. Please a create an entry gate first.",
{onclick: function(){ window.location.href = "{% url 'settings_page' %}"},
closeButton: true,
progressBar: true,
timeout : 3000,
preventDuplicates: true,
});
});
}
);
</script>
{% endif %}

{% endblock %}
2 changes: 1 addition & 1 deletion SystemApp/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ def count(self):
class Parkinglog(models.Model):
ticket_id = models.BigAutoField(db_column='TicketId', primary_key=True)
customer_id = models.ForeignKey(Customers, on_delete=models.CASCADE, blank=True, null=True)
date = models.DateField(db_column='Date')
date = models.DateField(db_column='Date', default=timezone.now())
plate_number = models.CharField(db_column='PlateNum', max_length=50)
entry_gate = models.ForeignKey(Gates, related_name='entry_gate', on_delete=models.CASCADE, blank=True, null=True)
checkin_method = models.CharField(db_column='CheckInMethod', max_length=10)
Expand Down
Loading

0 comments on commit e1e5fa7

Please sign in to comment.