From c6116b0269c6ec8adee2832f1812d1cf8f8e6e70 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Thu, 23 Jul 2015 15:19:53 +0200 Subject: Printing: add a "Table" template The "Table" template shows a simple table of user dives. The fields shown are: Dive number, Date, Time, Depth, Duration, Master and Location. Other fields can be added by the user. Signed-off-by: Gehad elrobey Signed-off-by: Lubomir I. Ivanov --- printing_templates/table.html | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 printing_templates/table.html (limited to 'printing_templates') diff --git a/printing_templates/table.html b/printing_templates/table.html new file mode 100644 index 000000000..c97267405 --- /dev/null +++ b/printing_templates/table.html @@ -0,0 +1,83 @@ + + + + + +
+ + + + + + + + + + +{% block main_rows %} + {% for dive in dives %} + + + + + + + + + + {% endfor %} +{% endblock %} +
Dive #DateTimeDepthDurationMasterLocation
{{ dive.number }}{{ dive.date }}{{ dive.time }}{{ dive.depth }}{{ dive.duration }}{{ dive.divemaster }}{{ dive.location }}
+
+ + -- cgit v1.2.3-70-g09d2 From 6319f0efba30d0c6a3831f5bb9a072aede4690ab Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sun, 26 Jul 2015 17:43:20 +0200 Subject: Printing: add a "Flow" layout Print dives successively and fit as many as we can in the smallest number of pages. Some dives may be broken between pages. Signed-off-by: Gehad elrobey Signed-off-by: Lubomir I. Ivanov --- printing_templates/flowlayout.html | 204 +++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 printing_templates/flowlayout.html (limited to 'printing_templates') diff --git a/printing_templates/flowlayout.html b/printing_templates/flowlayout.html new file mode 100644 index 000000000..a3f7951d9 --- /dev/null +++ b/printing_templates/flowlayout.html @@ -0,0 +1,204 @@ + + + + + +
+{% block main_rows %} + {% for dive in dives %} +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+

Dive No.

+ 		+

{{ dive.number }}

+
+

Date

+

{{ dive.date }}

+
+

Location

+ 		+

{{ dive.location }}

+
+

Max depth

+ 		+

{{ dive.depth }}

+
+

Duration

+ 		+

{{ dive.duration }}

+
+ + + + + + + + + + + + + + + + + + + + + + +
+

Time.

+ 		+

{{ dive.time }}

+
+

Air Temp.

+

{{ dive.airTemp }}

+
+

Water Temp.

+ 		+

{{ dive.waterTemp }}

+
+

Buddy

+ 		+

{{ dive.buddy }}

+
+

Dive Master

+ 		+

{{ dive.divemaster }}

+
+ + + + + + + + + +
+

Notes

+
+
+

{{ dive.notes }}

+
+
+
+
+
+
+ {% endfor %} +{% endblock %} +
+ + -- cgit v1.2.3-70-g09d2 From ccddcc3952fec5195690c154f736690093e544d2 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Tue, 28 Jul 2015 09:24:24 +0200 Subject: Printing: rename templates to have spaces and capitalization This is easier to have user friendly names for the bundled templates. Signed-off-by: Gehad elrobey Signed-off-by: Lubomir I. Ivanov --- printing_templates/Custom.html | 50 ++++++++ printing_templates/Flowlayout.html | 204 +++++++++++++++++++++++++++++++++ printing_templates/One Dive.html | 216 +++++++++++++++++++++++++++++++++++ printing_templates/Table.html | 83 ++++++++++++++ printing_templates/Two Dives.html | 227 +++++++++++++++++++++++++++++++++++++ printing_templates/custom.html | 50 -------- printing_templates/flowlayout.html | 204 --------------------------------- printing_templates/one_dive.html | 216 ----------------------------------- printing_templates/table.html | 83 -------------- printing_templates/two_dives.html | 227 ------------------------------------- 10 files changed, 780 insertions(+), 780 deletions(-) create mode 100644 printing_templates/Custom.html create mode 100644 printing_templates/Flowlayout.html create mode 100644 printing_templates/One Dive.html create mode 100644 printing_templates/Table.html create mode 100644 printing_templates/Two Dives.html delete mode 100644 printing_templates/custom.html delete mode 100644 printing_templates/flowlayout.html delete mode 100644 printing_templates/one_dive.html delete mode 100644 printing_templates/table.html delete mode 100644 printing_templates/two_dives.html (limited to 'printing_templates') diff --git a/printing_templates/Custom.html b/printing_templates/Custom.html new file mode 100644 index 000000000..52fdb4b49 --- /dev/null +++ b/printing_templates/Custom.html @@ -0,0 +1,50 @@ + + + + + +{% block main_rows %} + {% for dive in dives %} +
+
+

This template is empty

+ +
+
+ {% endfor %} +{% endblock %} + + diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html new file mode 100644 index 000000000..a3f7951d9 --- /dev/null +++ b/printing_templates/Flowlayout.html @@ -0,0 +1,204 @@ + + + + + +
+{% block main_rows %} + {% for dive in dives %} +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+

Dive No.

+ 		+

{{ dive.number }}

+
+

Date

+

{{ dive.date }}

+
+

Location

+ 		+

{{ dive.location }}

+
+

Max depth

+ 		+

{{ dive.depth }}

+
+

Duration

+ 		+

{{ dive.duration }}

+
+ + + + + + + + + + + + + + + + + + + + + + +
+

Time.

+ 		+

{{ dive.time }}

+
+

Air Temp.

+

{{ dive.airTemp }}

+
+

Water Temp.

+ 		+

{{ dive.waterTemp }}

+
+

Buddy

+ 		+

{{ dive.buddy }}

+
+

Dive Master

+ 		+

{{ dive.divemaster }}

+
+ + + + + + + + + +
+

Notes

+
+
+

{{ dive.notes }}

+
+
+
+
+
+
+ {% endfor %} +{% endblock %} +
+ + diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html new file mode 100644 index 000000000..9f4d30a61 --- /dev/null +++ b/printing_templates/One Dive.html @@ -0,0 +1,216 @@ + + + + + +
+{% block main_rows %} + {% for dive in dives %} +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+

Dive No.

+ 		+

{{ dive.number }}

+
+

Date

+

{{ dive.date }}

+
+

Location

+ 		+

{{ dive.location }}

+
+

Max depth

+ 		+

{{ dive.depth }}

+
+

Duration

+ 		+

{{ dive.duration }}

+
+ + + + + + + + + + + + + + + + + + + + + + +
+

Time.

+ 		+

{{ dive.time }}

+
+

Air Temp.

+

{{ dive.airTemp }}

+
+

Water Temp.

+ 		+

{{ dive.waterTemp }}

+
+

Buddy

+ 		+

{{ dive.buddy }}

+
+

Dive Master

+ 		+

{{ dive.divemaster }}

+
+ + + + + + + + + +
+

Notes

+
+
+

{{ dive.notes }}

+
+
+
+
+
+
+ {% endfor %} +{% endblock %} +
+ + diff --git a/printing_templates/Table.html b/printing_templates/Table.html new file mode 100644 index 000000000..c97267405 --- /dev/null +++ b/printing_templates/Table.html @@ -0,0 +1,83 @@ + + + + + +
+ + + + + + + + + + +{% block main_rows %} + {% for dive in dives %} + + + + + + + + + + {% endfor %} +{% endblock %} +
Dive #DateTimeDepthDurationMasterLocation
{{ dive.number }}{{ dive.date }}{{ dive.time }}{{ dive.depth }}{{ dive.duration }}{{ dive.divemaster }}{{ dive.location }}
+
+ + diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html new file mode 100644 index 000000000..0c8eec14c --- /dev/null +++ b/printing_templates/Two Dives.html @@ -0,0 +1,227 @@ + + + + + +
+{% block main_rows %} + {% for dive in dives %} +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
+

Dive No.

+ 		+

{{ dive.number }}

+
+

Date

+

{{ dive.date }}

+
+

Location

+ 		+

{{ dive.location }}

+
+

Max depth

+ 		+

{{ dive.depth }}

+
+

Duration

+ 		+

{{ dive.duration }}

+
+ + + + + + + + + + + + + + + + + + + + + +
+

Time.

+ 		+

{{ dive.time }}

+
+

Air Temp.

+

{{ dive.airTemp }}

+
+

Water Temp.

+ 		+

{{ dive.waterTemp }}

+
+

Buddy

+ 		+

{{ dive.buddy }}

+
+

Dive Master

+ 		+

{{ dive.divemaster }}

+
+
+
+
+
+ + + + + + + +
+

Notes

+
+
+

{{ dive.notes }}

+
+
+
+
+
+
+ {% endfor %} +{% endblock %} +