Result status if disqualified

sportorg · Oct 23, 2023 · ff8bb65 · ff8bb65
1 parent d2b7b49
commit ff8bb65
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/sportorg/gui/tabs/memory_model.py b/sportorg/gui/tabs/memory_model.py
@@ -412,7 +412,7 @@ def get_values_from_object(self, result):
             rented_card,
             time_to_hhmmss(i.get_result_otime_current_day())
             if i.is_status_ok()
-            else '',
+            else i.get_result(),
         ]
         return ret
 

diff --git a/sportorg/models/memory.py b/sportorg/models/memory.py
@@ -552,7 +552,8 @@ def to_dict(self):
             'created_at': self.created_at,  # readonly
             'result': self.get_result(),  # readonly
             'result_relay': self.get_result_relay(),
-            'result_current': self.get_result_otime_current_day().to_str(),
+            'result_current': self.get_result_otime_current_day().to_str() if self.is_status_ok()
+            else self.get_result(),
             'start_msec': self.get_start_time().to_msec(),  # readonly
             'finish_msec': self.get_finish_time().to_msec(),  # readonly
             'result_msec': self.get_result_otime().to_msec(),  # readonly

diff --git a/sportorg/models/result/result_calculation.py b/sportorg/models/result/result_calculation.py
@@ -94,6 +94,8 @@ def set_places(array):
 
                 res.place = last_place
                 current_place += 1
+            else:
+                res.current_result = res.get_result()
 
     def process_relay_results(self, group):
         if group and isinstance(group, Group):

diff --git a/templates/reports/4_результаты_сумма_очков.html b/templates/reports/4_результаты_сумма_очков.html
@@ -123,6 +123,7 @@ <h2>СУММА (ОЧКИ)</h2>
 				sum_places += s
 			}
 
+            ok_count = Math.min(store.best, ok_count);
 			//if(store.best < 99 and store.best > ok_count){
 			//   dsq = true;
 			//}
@@ -158,6 +159,7 @@ <h2>СУММА (ОЧКИ)</h2>
                     sum_time: person.sum_time,
                     sum_places: person.sum_places,
                     sum_scores: person.sum_scores.toFixed(1),
+                    ok_count: person.ok_count,
                     place: '',
                     person: person
                 };
@@ -233,6 +235,7 @@ <h2>СУММА (ОЧКИ)</h2>
             {key: 'qual', title: 'Разряд', size: 7},
             {key: 'bib', title: 'Номер', size: 6},
             {key: 'sum', title: 'Сумма', size: 6},
+            {key: 'ok_count', title: 'Старты', size: 6},
             {key: 'place', title: 'Место', size: 6}
         ],
         active: function (key, val) {