eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: only show start date for single day batches (#726)

Browse Source
This commit is contained in:
Md Hussain Nagaria
2024-01-22 10:55:36 +05:30
committed by GitHub
parent bac229c731
commit b700013704
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/www/batches/batch.html
View File

@@ -49,11 +49,14 @@
<use href="#icon-calendar"></use> <use href="#icon-calendar"></use>
</svg> </svg>
<span> <span>
{{ frappe.utils.format_date(batch_info.start_date, "long") }} - {{ frappe.utils.format_date(batch_info.start_date, "long") }}
</span> </span>
{% if batch_info.start_date != batch_info.end_date %}
<span> <span>
{{ frappe.utils.format_date(batch_info.end_date, "long") }} - {{ frappe.utils.format_date(batch_info.end_date, "long") }}
</span> </span>
{% endif %}
</div> </div>
<span class="seperator"></span> <span class="seperator"></span>
@@ -646,4 +649,4 @@
<link rel="stylesheet" href="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.css" /> <link rel="stylesheet" href="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.css" />
<script src="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.js"></script> <script src="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.js"></script>
{% endblock %} {% endblock %}

22
lms/www/batches/batch_details.html
View File

@@ -57,11 +57,13 @@
<use href="#icon-calendar"></use> <use href="#icon-calendar"></use>
</svg> </svg>
<span> <span>
{{ frappe.utils.format_date(batch_info.start_date, "long") }} - {{ frappe.utils.format_date(batch_info.start_date, "long") }}
</span>
<span>
{{ frappe.utils.format_date(batch_info.end_date, "long") }}
</span> </span>
{% if batch_info.start_date != batch_info.end_date %}
<span>
- {{ frappe.utils.format_date(batch_info.end_date, "long") }}
</span>
{% endif %}
</div> </div>
{% if batch_info.start_time and batch_info.end_time %} {% if batch_info.start_time and batch_info.end_time %}
@@ -115,11 +117,13 @@
<use href="#icon-calendar"></use> <use href="#icon-calendar"></use>
</svg> </svg>
<span> <span>
{{ frappe.utils.format_date(batch_info.start_date, "long") }} - {{ frappe.utils.format_date(batch_info.start_date, "long") }}
</span>
<span>
{{ frappe.utils.format_date(batch_info.end_date, "long") }}
</span> </span>
{% if batch_info.start_date != batch_info.end_date %}
<span>
- {{ frappe.utils.format_date(batch_info.end_date, "long") }}
</span>
{% endif %}
</div> </div>
{% if batch_info.start_time and batch_info.end_time %} {% if batch_info.start_time and batch_info.end_time %}
@@ -239,4 +243,4 @@
let batch_info = {{ batch_info | json }}; let batch_info = {{ batch_info | json }};
</script> </script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

8
lms/www/batches/index.html
View File

@@ -140,11 +140,13 @@
<use href="#icon-calendar"></use> <use href="#icon-calendar"></use>
</svg> </svg>
<span> <span>
{{ frappe.utils.format_date(batch.start_date, "medium") }} - {{ frappe.utils.format_date(batch.start_date, "medium") }}
</span> </span>
{% if batch.start_date != batch.end_date %}
<span> <span>
{{ frappe.utils.format_date(batch.end_date, "medium") }} - {{ frappe.utils.format_date(batch.end_date, "long") }}
</span> </span>
{% endif %}
</div> </div>
<div class="mb-2"> <div class="mb-2">
@@ -204,4 +206,4 @@
let batch_info = null; let batch_info = null;
</script> </script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}