Commit 76bb8aa3 by François C.

Merge branch '3972-inventory-custom-lists-sort-by-date' into 'dev_cooperatic'

3972-inventory-custom-lists-sort-by-date

See merge request !211
parents 15d661a0 8a7ae1df
Pipeline #2453 passed with stage
in 1 minute 27 seconds
...@@ -51,7 +51,8 @@ class CagetteInventory(models.Model): ...@@ -51,7 +51,8 @@ class CagetteInventory(models.Model):
with open(os.path.join(r, file)) as json_file: with open(os.path.join(r, file)) as json_file:
file_data = json.load(json_file) file_data = json.load(json_file)
date_time = datetime.fromtimestamp(int(filename)) local_tz = pytz.timezone('Europe/Paris')
date_time = datetime.fromtimestamp(int(filename), local_tz)
d = date_time.strftime("%d/%m/%Y, %H:%M") d = date_time.strftime("%d/%m/%Y, %H:%M")
file_data['id'] = int(filename) file_data['id'] = int(filename)
......
...@@ -18,6 +18,7 @@ function init_datatable() { ...@@ -18,6 +18,7 @@ function init_datatable() {
{data: "id", title:"id", "visible": false}, {data: "id", title:"id", "visible": false},
{ {
data:"datetime_created", data:"datetime_created",
orderData:[0],
title:"Liste", title:"Liste",
render: function (data) { render: function (data) {
return "Liste du " + data; return "Liste du " + data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment