Merging djreservation with gentelella

Readme.rst

@@ -187,3 +187,11 @@ Here is an example of ``gettext`` implementation:
 .. code:: js
 
     alert(gettext("new_word"))
+
+To fix use vendors files need to update the line 53
+
+.. code:: python
+
+    await asyncio.wait(map(lambda runner: asyncio.create_task(runner.future), running))
+
+in the root ``{venv}/lib/python3.11/site-packages/pylp/cli/cli.py``.

demo/demo/settings.py

@@ -11,6 +11,8 @@
 """
 
 import os
+from django.conf import settings
+from datetime import datetime
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -61,7 +63,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'demo/templates/')],
+        'DIRS': [os.path.join(BASE_DIR, 'demo/templates/', 'djgentelella/reservation/templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -140,3 +142,19 @@
     'use_readonlywidgets': True,
     'use_flags': True
 }
+
+TOKENIZE = getattr(settings, 'DJRESERVATION_TOKENIZE', False)
+
+START_RESERVATION_DATETIME = getattr(
+    settings, 'DJRESERVATION_START_RESERVATION_DATETIME', None)
+
+END_RESERVATION_DATETIME = getattr(
+    settings, 'DJRESERVATION_END_RESERVATION_DATETIME', None)
+
+if START_RESERVATION_DATETIME:
+    START_RESERVATION_DATETIME = datetime.strptime(
+        START_RESERVATION_DATETIME, '%d/%m/%Y %H:%M')
+
+if END_RESERVATION_DATETIME:
+    END_RESERVATION_DATETIME = datetime.strptime(
+        END_RESERVATION_DATETIME, '%d/%m/%Y %H:%M')

djgentelella/reservation/admin.py

@@ -5,7 +5,7 @@
 from django.utils.safestring import mark_safe
 
 from .email import send_reservation_email
-from .models import Reservation, Observation, Product
+from .models import Reservation, Observation, Product, ReservationToken
 from .product_manager import proccess_reservation
 
 # Register your models here.
@@ -101,4 +101,6 @@ def save_model(self, request, obj, form, change):
             proccess_reservation(obj, differ_obj, change_status)
         return dev
 
-admin.site.register(Reservation, ReservationAdmin)
+admin.site.register(Reservation)
+admin.site.register(Product)
+admin.site.register(ReservationToken)

djgentelella/reservation/forms.py

@@ -12,9 +12,12 @@
 from django.utils.translation import gettext_lazy as _
 
 from .models import Product, Reservation
+from ..forms.forms import GTForm
+from ..widgets.core import DateTimeInput
 
 
-class ReservationForm(forms.ModelForm):
+
+class ReservationForm(forms.ModelForm, GTForm):
 
     def clean(self):
         if hasattr(self, 'request'):
@@ -26,10 +29,15 @@ def clean(self):
     class Meta:
         model = Reservation
         fields = '__all__'
+        widgets = {
+            "reserved_start_date": DateTimeInput,
+            "reserved_end_date": DateTimeInput,
+        }
         exclude = ['user', 'status']
 
 
-class ProductForm(forms.ModelForm):
+
+class ProductForm(forms.ModelForm, GTForm):
     model_instance = forms.CharField(widget=forms.HiddenInput)
     available_amount = forms.FloatField(widget=forms.HiddenInput)
 

djgentelella/reservation/middleware.py

@@ -7,7 +7,7 @@
 '''
 
 from __future__ import unicode_literals
-from djreservation.models import Reservation
+from .models import Reservation
 
 
 class ReservationMiddleware(object):

djgentelella/reservation/templates/base.html

@@ -1,8 +1 @@
-
-{% block css%} {%endblock%}
-
-{% block content %}
-{%endblock%}
-
-{% block js %}
-{%endblock%}
+{% extends 'gentelella/base.html' %}

djgentelella/reservation/templates/djreservation/product_form.html

@@ -18,7 +18,7 @@
 {%endfor%}
 <tr>
 	<td></td>
-	<td><input class="btn btn-success" type="submit" value="{% trans 'Reserve'%}"></td>
+	<td><input class="btn btn-outline-success" type="submit" value="{% trans 'Reserve' %}"></td>
 </tr>
 </table>
 </form>

djgentelella/reservation/templates/djreservation/reservation_confirm.html

@@ -3,19 +3,18 @@
 
 {% block content %}
 <div class="row">
-	 <div class="col-md-8 col-md-offset-2">
-	 	
+	 <div class="col-md-8 offset-md-2">
+
 		<form class="form-horizontal" method="post">
-			{% csrf_token %} 
+			{% csrf_token %}
 			<h2>{% trans 'Are you sure? See above the products details' %}</h2>
-
-			<input type="submit"
-			class="btn btn-success" value="{% trans 'Finish this reservation' %}" />
+
+			<input type="submit" class="btn btn-success" value="{% trans 'Finish this reservation' %}" />
 		</form>
 	</div>
 </div>
 <div class="row">
- <div class="col-md-8 col-md-offset-1">
+ <div class="col-md-8 offset-md-2">
  	<h1> {% trans 'Reserved products' %} </h1>
 	<ul class="list-group">
 		{% for product in reservation.product_set.all %}
@@ -28,10 +27,10 @@ <h1> {% trans 'Reserved products' %} </h1>
   			{% empty %}
   			<li class="list-group-item">
   				{% trans "Products are not reserved yet" %}
-  			</li>  			
+  			</li>
   		{% endfor %}
   	</ul>
  </div>
-</div>		
+</div>
 
 {% endblock %}

djgentelella/reservation/templates/djreservation/reservation_finished.html

@@ -3,7 +3,7 @@
 
 {% block content %}
 	<div class="row">
-		 <div class="col-md-6 col-md-offset-3">
+		 <div class="col-md-6 offset-md-3">
 	{% trans 'Thanks, your reservation was processed successfully' %}
 		</div>
 	</div>

djgentelella/reservation/templates/djreservation/reservation_form.html

@@ -1,10 +1,10 @@
 {% extends 'base.html' %}
 {% load static i18n %}
 
-{% block css%} 
+{% block css%}
   <link rel="stylesheet" type="text/css" media="screen"
      href="{% static 'css/bootstrap-datetimepicker.min.css' %}">
-<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" 
+<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css"
 rel="stylesheet">
 
  <style>
@@ -13,7 +13,7 @@
  	width: 270px;
  }
  </style>
- 
+
 {%endblock%}
 
 
@@ -25,15 +25,15 @@ <h1> {% trans "Creating a reservation"%} </h1>
 {% endblock %}
 {{form.errors}}
 <form class="form-horizontal" method="post">
-{% csrf_token %} 
+{% csrf_token %}
+
+{% block form_start %}{% endblock %}
 
-{% block form_start %}{% endblock %}	
-
 <div class="form-group">
 	{{ form.reserved_start_date.errors }}
 	<label id="{{ form.reserved_start_date.id_label_tag }}" class="col-sm-2 control-label" > {% trans 'Reservation start date' %} </label>
 <div id="dtp_reserved_start_date" class="input-append date">
-	<div class="col-sm-2">							
+	<div class="col-sm-2">
 	      {{ form.reserved_start_date }}
     </div>
 
@@ -44,13 +44,13 @@ <h1> {% trans "Creating a reservation"%} </h1>
 	</div>
 </div>
 </div>
-	
+
 
 <div class="form-group">
 	{{ form.reserved_end_date.errors }}
 	<label id="{{ form.reserved_end_date.id_label_tag }}" class="col-sm-2 control-label" > {% trans 'Reservation end date' %} </label>
 <div id="dtp_reserved_end_date" class="input-append date">
-	<div class="col-sm-2">							
+	<div class="col-sm-2">
 	      {{ form.reserved_end_date }}
     </div>
 
@@ -61,27 +61,10 @@ <h1> {% trans "Creating a reservation"%} </h1>
 	</div>
 </div>
 </div>
-{% block form_end %}{% endblock %}	
-	
-<button type="submit" class="btn btn-default">{% trans 'Submit' %}</button>
+{% block form_end %}{% endblock %}
+
+<button type="submit" class="btn btn-outline-success">{% trans 'Submit' %}</button>
 </form>
 
 {% endblock %}
 
-{% block js %}
-<script type="text/javascript"
-     src="{% static 'js/bootstrap-datetimepicker.min.js' %}">
-    </script>
-
-        <script type="text/javascript">
-	      rsd= $('#dtp_reserved_start_date').datetimepicker({
-	        format: 'MM/dd/yyyy hh:mm',
-	        autoclose: true
-	      });
-	      rd= $('#dtp_reserved_end_date').datetimepicker({
-	        format: 'MM/dd/yyyy hh:mm',
-	        autoclose: true
-	      });
-</script>
-
-{% endblock %}

djgentelella/reservation/templates/djreservation/reservation_list.html

@@ -9,7 +9,7 @@
     <div class="panel-heading" role="tab" id="headingOne">
       <h4 class="panel-title">
         <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{reservation.pk}}" aria-expanded="true" aria-controls="collapse{{reservation.pk}}">
- {{reservation}}         
+ {{reservation}}
         </a>
       </h4>
     </div>
@@ -18,21 +18,21 @@ <h4 class="panel-title">
       	<ul class="list-group">
       		{% for product in reservation.product_set.all%}
       			<li class="list-group-item">{{product}}
-{% if product.borrowed %}      				
+{% if product.borrowed %}
 <a href="#" style="position: absolute;right: 15px;" >
   <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
 </a>
 {%else%}
 <a href="#" style="position: absolute;right: 15px;" >
   <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
 </a>
-{% endif %}	
+{% endif %}
 </li>
 		{% endfor%}
 </ul>
 
 {% if reservation.observation_set.count %}
-<div class="alert alert-info">
+<div class="alert alert-info" role="alert">
 	<h2> {% trans 'Observations' %}</h2>
 	{% for observation in reservation.observation_set.all %}
 		{{observation.text}}
@@ -45,7 +45,7 @@ <h2> {% trans 'Observations' %}</h2>
   </div>
 
 	{% empty %}
-		 <h2> {% trans 'No reservations saved yet' %}</h2>
+		 <h2 class="text-center title"> {% trans 'No reservations saved yet' %}</h2>
 	{% endfor %}
 </div>
 
@@ -58,11 +58,11 @@ <h2> {% trans 'No reservations saved yet' %}</h2>
 				<a href="?page={{ page_obj.previous_page_number }}">{% trans 'Previous' %}</a>
 			</li>
 			{% endif %}
-	
+
 			<li>
 				{% trans 'Page' %} {{ page_obj.number }} -- {{ page_obj.paginator.num_pages }}.
 			</li>
-	
+
 			{% if page_obj.has_next %}
 			<li>
 				<a href="?page={{ page_obj.next_page_number }}">{% trans 'Next' %}</a>

djgentelella/reservation/templates/djreservation/simple_reservation.html

@@ -6,14 +6,6 @@
 <h1> {% trans "Creating a reservation of :"%} <br><small >{{object}}</small></h1>
 {% endblock%}
 {% block form_start %}
-{{ product_form.non_field_errors }}
-  <div class="form-group">
-  	{{product_form.amount.errors }}
-    <label for="id_amount" class="col-sm-2 control-label">{{product_form.amount.label}}</label>
-<div class="col-sm-2">
-{{product_form.amount}}
-{{product_form.available_amount}}
-{{product_form.model_instance}}
-</div></div>
-
-{% endblock %}	
+{{ product_form.as_horizontal }}
+
+{% endblock %}

djgentelella/reservation/urls.py

@@ -6,18 +6,18 @@
 
 from django.urls import path, re_path
 from . import views
-from .settings import TOKENIZE
+from django.conf import settings
 
 urlpatterns = [
-    path("reservation/create", views.CreateReservation.as_view(), name="add_user_reservation"),
-    path("reservation/finish", views.finish_reservation, name="finish_reservation"),
-    path("reservation/delete_product_reservation/<int:pk>/", views.deleteProduct, name="delete_product_reservation"),
-    path("reservation/list", views.ReservationList.as_view(), name="reservation_list"),
+    path("create", views.CreateReservation.as_view(), name="add_user_reservation"),
+    path("finish", views.finish_reservation, name="finish_reservation"),
+    path("delete_product_reservation/<int:pk>/", views.deleteProduct, name="delete_product_reservation"),
+    path("list", views.ReservationList.as_view(), name="reservation_list"),
 ]
 
-if TOKENIZE:
+if settings.TOKENIZE:
     urlpatterns += [
-        re_path(r"reservation/token/(?P<pk>\d+)/(?P<token>[0-9a-f-]+)/(?P<status>\d)$",
+        re_path(r"token/(?P<pk>\d+)/(?P<token>[0-9a-f-]+)/(?P<status>\d)$",
             views.update_reservation_by_token,
             name="reservation_token")
     ]