diff --git a/lms/www/batches/batch.html b/lms/www/batches/batch.html index cc501ddc..f368c70c 100644 --- a/lms/www/batches/batch.html +++ b/lms/www/batches/batch.html @@ -49,11 +49,14 @@ - {{ frappe.utils.format_date(batch_info.start_date, "long") }} - + {{ frappe.utils.format_date(batch_info.start_date, "long") }} + + {% if batch_info.start_date != batch_info.end_date %} - {{ frappe.utils.format_date(batch_info.end_date, "long") }} + - {{ frappe.utils.format_date(batch_info.end_date, "long") }} + {% endif %} @@ -646,4 +649,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/lms/www/batches/batch_details.html b/lms/www/batches/batch_details.html index 7c5b5123..ddfbba43 100644 --- a/lms/www/batches/batch_details.html +++ b/lms/www/batches/batch_details.html @@ -57,11 +57,13 @@ - {{ frappe.utils.format_date(batch_info.start_date, "long") }} - - - - {{ frappe.utils.format_date(batch_info.end_date, "long") }} + {{ frappe.utils.format_date(batch_info.start_date, "long") }} + {% if batch_info.start_date != batch_info.end_date %} + + - {{ frappe.utils.format_date(batch_info.end_date, "long") }} + + {% endif %} {% if batch_info.start_time and batch_info.end_time %} @@ -115,11 +117,13 @@ - {{ frappe.utils.format_date(batch_info.start_date, "long") }} - - - - {{ frappe.utils.format_date(batch_info.end_date, "long") }} + {{ frappe.utils.format_date(batch_info.start_date, "long") }} + {% if batch_info.start_date != batch_info.end_date %} + + - {{ frappe.utils.format_date(batch_info.end_date, "long") }} + + {% endif %} {% if batch_info.start_time and batch_info.end_time %} @@ -239,4 +243,4 @@ let batch_info = {{ batch_info | json }}; {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/lms/www/batches/index.html b/lms/www/batches/index.html index 60eaad4f..cdcd56eb 100644 --- a/lms/www/batches/index.html +++ b/lms/www/batches/index.html @@ -140,11 +140,13 @@ - {{ frappe.utils.format_date(batch.start_date, "medium") }} - + {{ frappe.utils.format_date(batch.start_date, "medium") }} + {% if batch.start_date != batch.end_date %} - {{ frappe.utils.format_date(batch.end_date, "medium") }} + - {{ frappe.utils.format_date(batch.end_date, "long") }} + {% endif %}