diff options
4 files changed, 76 insertions, 111 deletions
diff --git a/app/dispatch/templates/dispatch/companies/detail.html b/app/dispatch/templates/dispatch/companies/detail.html index b889055..5c643da 100644 --- a/app/dispatch/templates/dispatch/companies/detail.html +++ b/app/dispatch/templates/dispatch/companies/detail.html @@ -19,38 +19,9 @@ </div> </div> -{% load dynamic_key %} -{% for date in loads %} - <div class="row"> - <div class="col s12 card"> - <div class="card-content"> - <span class="card-title">{{date}}</span> - <table class="striped bordered"> - <thead> - <tr> - <th>Driver</th> - <th>Amount</th> - </tr> - </thead> - <tbody> - {% for load in loads|keyvalue:date %} - <tr class="green lighten-4"> - <td><a href="{% url 'driver_detail' load.user.id %}">{{ load.user.first_name }} {{ load.user.last_name }}</a></td> - <td>{{ load.amount }}</td> - <td class="right-align"> - <a href="{% url 'load_edit' load.id %}" class="btn orange">Edit</a> - <a href="{% url 'load_detail' load.id %}" class="btn blue">View</a> - </td> - </tr> - {% empty %} - <tr class="yellow lighten-4"><td colspan="4">No load.</td></tr> - {% endfor %} - </tbody> - </table> - </div> - </div> - </div> -{% endfor %} +{% load custom_tags %} +{% listForCommaString "Driver,Amount,Description" as load_headers %} +{% include "dispatch/generic_load_listing.html" %} <div class="row"> <div class="col s6 left-align"> diff --git a/app/dispatch/templates/dispatch/drivers/detail.html b/app/dispatch/templates/dispatch/drivers/detail.html index d6e194b..7655470 100644 --- a/app/dispatch/templates/dispatch/drivers/detail.html +++ b/app/dispatch/templates/dispatch/drivers/detail.html @@ -53,43 +53,9 @@ </div> {% endif %} - - -{% load dynamic_key %} -{% for date in loads %} - <div class="row"> - <div class="col s12 card"> - <div class="card-content"> - <span class="card-title">{{date|date:"l F d"}}</span> - <table class="striped bordered"> - <thead> - <tr> - <th>Company</th> - <th>Amount</th> - </tr> - </thead> - <tbody> - {% for load in loads|keyvalue:date %} - <tr class="green lighten-4"> - <td><a href="{% url 'company_detail' load.company.id %}">{{ load.company.name }}</a></td> - {% if load.amount == 0 %} - <td><span class="red-text">{{ load.amount }}</span></td> - {% else %} - <td>{{ load.amount }}</td> - {% endif %} - <td class="right-align"> - <a href="{% url 'load_detail' load.id %}" class="btn blue">View</a> - </td> - </tr> - {% empty %} - <tr class="yellow lighten-4"><td colspan="4">No load.</td></tr> - {% endfor %} - </tbody> - </table> - </div> - </div> - </div> -{% endfor %} +{% load custom_tags %} +{% listForCommaString "Company,Amount,Load Number,Description" as load_headers %} +{% include "dispatch/generic_load_listing.html" %} <div class="row"> <div class="col s6 left-align"> diff --git a/app/dispatch/templates/dispatch/generic_load_listing.html b/app/dispatch/templates/dispatch/generic_load_listing.html new file mode 100644 index 0000000..ed4399b --- /dev/null +++ b/app/dispatch/templates/dispatch/generic_load_listing.html @@ -0,0 +1,66 @@ + +{% load dynamic_key %} +{% for date in loads %} + <div class="row"> + <div class="col s12 card"> + <div class="card-content"> + <span class="card-title">{{date|date:"l F d"}}</span> + <table class="striped bordered"> + <thead> + <tr> + {% for heading in load_headers %} + <th>{{heading}}</th> + {% endfor %} + <!-- + Order is specific here, you're goign going to want to define + the fields beforehand i.e. + + \{\% load custom_tags %} + \{\% listForCommaString "Company,Amount,Load Number,Description" as load_headers %} + --> + <!-- + <th>Company</th> + <th>Driver</th> + <th>Amount</th> + <th>Load Number</th> + <th>Description</th> + --> + </tr> + </thead> + <tbody> + {% for load in loads|keyvalue:date %} + <tr class="green lighten-4"> + {% if "Company" in load_headers %} + <td><a href="{% url 'company_detail' load.company.id %}">{{ load.company.name }}</a></td> + {% endif %} + {% if "Driver" in load_headers %} + <td><a href="{% url 'driver_detail' load.user.id %}">{{ load.user.first_name }} {{ load.user.last_name }}</a></td> + {% endif %} + + {% if "Amount" in load_headers %} + {% if load.amount == 0 %} + <td><span class="red-text">{{ load.amount }}</span></td> + {% else %} + <td>{{ load.amount }}</td> + {% endif %} + {% endif %} + {% if "Load Number" in load_headers %} + <td>{{ load.load_number }}</td> + {% endif %} + {% if "Description" in load_headers %} + <td>{{ load.description }}</td> + {% endif %} + <td class="right-align"> + <!-- <a href="{% url 'load_edit' load.id %}" class="btn orange">Edit</a> --> + <a href="{% url 'load_detail' load.id %}" class="btn blue">View</a> + </td> + </tr> + {% empty %} + <tr class="yellow lighten-4"><td colspan="5">No load.</td></tr> + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +{% endfor %} diff --git a/app/dispatch/templates/dispatch/loads/list.html b/app/dispatch/templates/dispatch/loads/list.html index 0620fba..78cb476 100644 --- a/app/dispatch/templates/dispatch/loads/list.html +++ b/app/dispatch/templates/dispatch/loads/list.html @@ -13,6 +13,7 @@ <a href="{% url 'load_new' %}" class="btn green">Add Load</a> </div> </div> + <div class="row"> <div class="col s6 left-align"> <a href="{% url 'load_list' %}?date={{week_dates.previous_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a> @@ -22,48 +23,9 @@ </div> </div> -{% load dynamic_key %} -{% for date in loads %} - <div class="row"> - <div class="col s12 card"> - <div class="card-content"> - <span class="card-title">{{date|date:"l F d"}}</span> - <table class="striped bordered"> - <thead> - <tr> - <th>Company</th> - <th>Driver</th> - <th>Amount</th> - <th>Load Number</th> - <th>Description</th> - </tr> - </thead> - <tbody> - {% for load in loads|keyvalue:date %} - <tr class="green lighten-4"> - <td><a href="{% url 'company_detail' load.company.id %}">{{ load.company.name }}</a></td> - <td><a href="{% url 'driver_detail' load.user.id %}">{{ load.user.first_name }} {{ load.user.last_name }}</a></td> - {% if load.amount == 0 %} - <td><span class="red-text">{{ load.amount }}</span></td> - {% else %} - <td>{{ load.amount }}</td> - {% endif %} - <td>{{ load.load_number }}</td> - <td>{{ load.description }}</td> - <td class="right-align"> - <!-- <a href="{% url 'load_edit' load.id %}" class="btn orange">Edit</a> --> - <a href="{% url 'load_detail' load.id %}" class="btn blue">View</a> - </td> - </tr> - {% empty %} - <tr class="yellow lighten-4"><td colspan="5">No load.</td></tr> - {% endfor %} - </tbody> - </table> - </div> - </div> - </div> -{% endfor %} +{% load custom_tags %} +{% listForCommaString "Company,Driver,Amount,Description" as load_headers %} +{% include "dispatch/generic_load_listing.html" %} <div class="row"> <div class="col s6 left-align"> |