xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Fix QMs reports, remove V grade

Browse Source
This commit is contained in:
Philip Sargent 2023-03-17 14:33:30 +00:00
parent 12c7b9b5d1
commit de54576d11
5 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/models/logbooks.py
View File

@ -228,8 +228,8 @@ class QM(TroggleModel):
),
)
# def get_next_by_id(self):
# return QM.objects.get(id=self.id + 1)
def get_next_by_id(self):
return QM.objects.get(id=self.id + 1)
# def get_previous_by_id(self):
# return QM.objects.get(id=self.id - 1)
def get_previous_by_id(self):
return QM.objects.get(id=self.id - 1)

2
core/views/survex.py
View File

@ -105,7 +105,7 @@ survextemplatefile = """; *** THIS IS A TEMPLATE FILE NOT WHAT YOU MIGHT BE EXPE
; QM doesn't go anywhere, set the resolution-station to be the same as the
; nearest-station. Include any relevant details of how to find or push the QM in
; the textual description.
;Serial number grade(A/B/C/D/V/X) nearest-station resolution-station description
;Serial number grade(A/B/C/D/X) nearest-station resolution-station description
;[ QM1 A surveyname.3 - description of QM ]
;[ QM2 B surveyname.5 - description of QM ]

13
media/css/trog3.css
View File

@ -301,9 +301,20 @@ th
a.redtext:link {
color:#F00;
}
a.whitetext:link {
color:#FFF;
}
a.whitetext:visited {
color:#bbb;
}
a.whitetext:hover {
color:#99F;
}
a.whitetext:active {
color:#F00;
}
td.survexnewfile
{
background-color:#f99;

14
templates/core/QMs_json_list.html
View File

@ -4,7 +4,7 @@
"{{qm.blockname}}","QM{{qm.number}}","{{qm.grade}}","{{qm.nearest_station_name}}","{{qm.resolution_station_name}}","{{qm.get_absolute_url}}"]{% if not forloop.last %},{% endif %}
{% endfor %} }
<br /><br />
------------------------------------------------------
------------------------------------------------------<br />
Hacked up list of caves with grade "?"
<br /><br />
@ -16,6 +16,18 @@ Hacked up list of caves with grade "?"
]{% if not forloop.last %},{% endif %}
{% endif %}
{% endfor %} }
<br /><br />
------------------------------------------------------<br />
Hacked up list of caves with grade "V"
<br /><br />
{% for qm in object_list %}
{% if qm.grade == "V" %}<br />
"{{qm.id}}": ["{{qm.expoyear}}","{{qm.cave}}",{% if qm.ticked %}"TICKed",{% else %}"OPEN",{% endif %}
"{{qm.blockname}}","QM{{qm.number}}","{{qm.grade}}","{{qm.nearest_station_name}}","{{qm.resolution_station_name}}",
<a href="{{qm.get_absolute_url}}">"{{qm.get_absolute_url}}"</a>
]{% if not forloop.last %},{% endif %}
{% endif %}
{% endfor %} }
{% endblock %}

9
templates/qm.html
View File

@ -21,9 +21,9 @@
<table id="cavepage">
<tr>
<th id="kat_no"><a href="{{qm.get_previous_by_id.get_absolute_url}}">Previous</a></th>
<th id="name">{{qm|safe}}</th>
<th id="status"><a href="{{qm.get_next_by_id.get_absolute_url}}">Next</a></th>
<th id="kat_no"><a class="whitetext" href="{{qm.get_previous_by_id.get_absolute_url}}">Previous QM</a></th>
<th id="name">QM &nbsp;&nbsp;{{qm|safe}}</th>
<th id="status"><a class="whitetext" href="{{qm.get_next_by_id.get_absolute_url}}">Next QM</a></th>
</tr>
</table>
{% endblock %}
@ -46,7 +46,8 @@
{{qm.number}}
<h3>Grade</h3>
{{qm.grade}}
{{qm.grade}}
<p>Explanation of Grade letters: <a href="/handbook/survey/qm.html">Handbook - QM grades</a>
{% if qm.block %}
<h3>Survexfile</h3>