diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e285cb9d..7d765429 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -19,8 +19,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
 
@@ -33,8 +33,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..0ff91d76
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,41 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        architecture: [x64]
+    name: Build on Windows ${{ matrix.architecture }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Python
+        id: set_up_python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.8'
+          architecture: ${{ matrix.architecture }}
+      - name: Install python dependencies
+        run: pip install poetry && poetry install -E win
+      - name: Build
+        run: poetry run python builder.py build
+      - name: Generate installer
+        run: poetry run python builder.py bdist_msi
+      - name: Upload the artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: dist/*.msi
+          name: ${{ runner.os }}-${{ matrix.architecture }}
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            dist/*.msi
diff --git a/builder.py b/builder.py
index 6a23ac29..3e604742 100644
--- a/builder.py
+++ b/builder.py
@@ -5,42 +5,64 @@
 from sportorg import config
 
 base = None
-if sys.platform == "win32":
-    base = "Win32GUI"
+if sys.platform == 'win32':
+    base = 'Win32GUI'
 
 include_files = [
     config.LOCALE_DIR,
     config.TEMPLATE_DIR,
     config.IMG_DIR,
     config.SOUND_DIR,
-    config.base_dir("LICENSE"),
-    config.base_dir("changelog.md"),
-    config.base_dir("changelog_ru.md"),
-    config.base_dir("configs"),
+    config.base_dir('LICENSE'),
+    config.base_dir('changelog.md'),
+    config.base_dir('changelog_ru.md'),
+    config.base_dir('configs'),
     config.STYLE_DIR,
 ]
 includes = ["atexit", "codecs", "playsound", "pyImpinj"]
 excludes = ["Tkinter", "unittest", "test", "pydoc"]
 
-options = {
-    "build_exe": {
-        "includes": includes,
-        "excludes": excludes,
-        "packages": ["idna", "requests", "encodings", "asyncio", "pywinusb"],
-        "include_files": include_files,
-        "zip_include_packages": ["PySide6"],
-        "optimize": 2,
-        'include_msvcr': True,
-    }
+build_exe_options = {
+    "includes": includes,
+    "excludes": excludes,
+    "packages": ["idna", "requests", "encodings", "asyncio", "pywinusb"],
+    "include_files": include_files,
+    "zip_include_packages": ["PySide6"],
+    "optimize": 2,
+    'include_msvcr': True,
+    'silent': 1,
 }
 
+bdist_msi_options = {
+    'all_users': False,
+    'data': {
+        'Shortcut': [
+            (
+                'DesktopShortcut',  # Shortcut
+                'DesktopFolder',  # Directory
+                config.NAME,  # Name
+                'TARGETDIR',  # Component
+                '[TARGETDIR]SportOrg.exe',  # Target
+                None,  # Arguments
+                None,  # Description
+                None,  # Hotkey
+                None,  # Icon
+                None,  # IconIndex
+                None,  # ShowCmd
+                'TARGETDIR',  # WkDir
+            ),
+        ]
+    },
+}
+
+options = {'build_exe': build_exe_options, 'bdist_msi': bdist_msi_options}
+
 executables = [
     Executable(
-        "SportOrg.pyw",
+        'SportOrg.pyw',
         base=base,
-        icon=config.icon_dir("sportorg.ico"),
-        shortcut_dir=config.NAME.lower(),
-        copyright="GNU GENERAL PUBLIC LICENSE {}".format(config.NAME),
+        icon=config.icon_dir('sportorg.ico'),
+        copyright='GNU GENERAL PUBLIC LICENSE {}'.format(config.NAME),
     )
 ]
 
@@ -50,5 +72,4 @@
     description=config.NAME,
     options=options,
     executables=executables,
-    packages=[],
 )
diff --git a/pyproject.toml b/pyproject.toml
index 7c63264b..4fa1ad60 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,7 +71,7 @@ requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poe.env]
-CODE = "tests sportorg"
+CODE = "tests sportorg builder.py"
 
 [tool.poe.tasks.all]
 help = "Run format lint test"
diff --git a/templates/reports/ENG_1_results.html b/templates/reports/1_results.html
similarity index 98%
rename from templates/reports/ENG_1_results.html
rename to templates/reports/1_results.html
index 6b4942cb..d3a83cc0 100644
--- a/templates/reports/ENG_1_results.html
+++ b/templates/reports/1_results.html
@@ -7,22 +7,6 @@ <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.
     <h2>RESULT LIST</h2>
 </div>
 <div id="results-tables"></div>
-<!--
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Chief referee:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Secretary:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
--->
 {% raw %}
 <style>
     table.table-split {
diff --git "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262.html" "b/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262.html"
deleted file mode 100644
index ba2b5e42..00000000
--- "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262.html"
+++ /dev/null
@@ -1,863 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<style>
-    table.table-split {
-        margin: 0;
-    }
-    table.table-split td{
-        border: 0;
-        padding: 0;
-    }
-</style>
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var isRogaine = race.settings.result_processing_mode === 'scores';
-    var isArdf =  race.settings.result_processing_mode === 'ardf';
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        for (var _i = 0, _a = race.results; _i < _a.length; _i++) {
-            var result = _a[_i];
-            if (result.status !== 13 && result.person && result.person.group && result.person.group.id === group.id && (count ? result.place <= count && result.place > 0 : 1)) {
-                var r = {
-                    index: 0,
-                    name: (result.person.surname + ' ' + result.person.name).slice(0, MAX_PERSON_NAME),
-                    org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[result.person.qual],
-                    bib: result.person.bib,
-                    year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                    penalty_time: toHHMMSS(result.penalty_time),
-                    penalty_laps: result.penalty_laps,
-                    scores_ardf: result.scores_ardf,
-                    rogaine_score: result.rogaine_score,
-                    rogaine_penalty: result.rogaine_penalty,
-                    rogaine_points_earned: result.rogaine_score + result.rogaine_penalty,
-                    result: result.result_current,
-                    result_relay: result.result_relay,
-                    result_msec: result.result_msec,
-                    diff: isRogaine || isArdf ? result.diff_scores : toHHMMSS(result.diff),
-                    place: result.place,
-                    status: result.status,
-                    scores: result.scores,
-                    place_show: result.person.is_out_of_competition ? 'в/к' : result.place === 0 ? '' : result.place === -1 ? '' : result.place,
-                    is_out_of_competition: result.person.is_out_of_competition,
-                    speed: result.speed,
-                    speed_kmh:  group.course ? (group.course.length * 3600 / result.result_msec).toFixed(1) + 'км/ч' : '',
-                    data: result,
-                    order: result.order
-                };
-                if (result.status !== 1) {
-                    r.diff = '';
-                    r.place_show = '';
-                    r.speed = '';
-                    r.speed_kmh = '';
-                    r.scores = '';
-                    r.rogaine_points_earned = '';
-                    r.rogaine_penalty = '';
-                    r.rogaine_score = '';
-                }
-
-                // SPLITS
-                var control_index = 0;
-                if (result.splits) {
-                    var getTrBlock = function (t, p) {
-                        var tr = document.createElement('tr');
-                        var td1 = document.createElement('td');
-                        td1.className = 'result-' + p;
-                        td1.appendChild(document.createTextNode(t));
-                        tr.appendChild(td1);
-                        return tr;
-                    };
-                    var lastSplit = 0;
-                    for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-
-                            var tbl = document.createElement('table');
-                            tbl.className = 'table-split';
-                            tbl.appendChild(getTrBlock(toHHMMSS(split.leg_time) + ' (' + split.leg_place + ')', split.leg_place));
-                            tbl.appendChild(getTrBlock(toHHMMSS(split.relative_time) + ' (' + split.relative_place + ')', split.relative_place));
-                            r[control_index + '_' + split.code] = tbl;
-                            control_index++;
-                            lastSplit = split.relative_time;
-                        }
-                    }
-
-                    var finishMsec = r.result_msec - lastSplit;
-
-                    if (r.status === 1 && finishMsec > 0) {
-                        var tblF = document.createElement('table');
-                        tblF.className = 'table-split';
-                        tblF.appendChild(getTrBlock(toHHMMSS(finishMsec), 0));
-                        var place_str = r.place > 0 ? r.place : 'в/к';
-                        tblF.appendChild(getTrBlock(toHHMMSS(r.result_msec) + ' (' + place_str + ')', r.place));
-                        r.finish_split = tblF;
-                    }
-                }
-
-                var getMultipleTrBlock = function () {
-                    var tr = document.createElement('tr');
-                    for (var i = 0; i < arguments.length; i++) {
-                        var td1 = document.createElement('td');
-                        td1.appendChild(document.createTextNode(arguments[i]));
-                        tr.appendChild(td1);
-                    }
-                    return tr;
-                };
-
-                // ALL PUNCHES
-                var splitTable = document.createElement('table');
-                splitTable.className = 'table-split';
-                var splitTr = document.createElement('tr');
-                splitTable.appendChild(splitTr);
-                var prevTime = result.start_msec;
-                for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                    var split = _c[_b];
-                    var tbl = document.createElement('table');
-                    tbl.className = 'table-split';
-                    tbl.appendChild(getMultipleTrBlock('( ' + split.code + ' )', toHHMMSS(split.time - prevTime)));
-                    tbl.appendChild(getMultipleTrBlock('', toHHMMSS(split.time - result.start_msec)));
-                    var splitTd = document.createElement('td');
-                    splitTd.appendChild(tbl);
-                    splitTr.appendChild(splitTd);
-                    prevTime = split.time;
-                }
-                r.all_splits = splitTable;
-
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay) {
-
-                if (a.order === b.order) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                }
-                return a.order - b.order
-
-            } else {
-                if (a.status !== 1 && b.status !== 1) {
-                    return STATUS_PRIORITY.indexOf(a.status) - STATUS_PRIORITY.indexOf(b.status);
-                }
-                if (a.status !== 1) {
-                    return 1
-                }
-                if (b.status !== 1) {
-                    return -1
-                }
-                if (a.is_out_of_competition || b.is_out_of_competition) {
-                    if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                        return -(a.rogaine_score - b.rogaine_score);
-                    }
-                    if (isArdf && a.scores_ardf != b.scores_ardf) {
-                        return -(a.scores_ardf - b.scores_ardf);
-                    }
-                    return a.result_msec - b.result_msec;
-                }
-                if (a.place < 1) {
-                    return 1
-                }
-                if (b.place < 1) {
-                    return -1
-                }
-                return a.place - b.place
-            }
-        });
-        var index = 0;
-        if (isRelay) {
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        } else {
-            results.forEach(function (elem) {
-                index++;
-                elem.index = index;
-            })
-        }
-        return results;
-    }
-	function getResultsByCourse(group, count) {
-		count = +count || 0;
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        var splits_recalc_times = {};
-        var splits_recalc_times_total = {};
-        group.controls.forEach(function (control, index) {
-            splits_recalc_times[index + '_' + control.code] = [];
-            splits_recalc_times_total[index + '_' + control.code] = [];
-        });
-        for (var _i = 0, _a = race.results; _i < _a.length; _i++) {
-            var result = _a[_i];
-            if (result.status !== 13 && result.person && result.person.group && result.person.group.course && result.person.group.course.id === group.id) { //} && (count ? result.place <= count && result.place > 0 : 1)) {
-                var r = {
-                    index: 0,
-                    name: (result.person.surname + ' ' + result.person.name).slice(0, MAX_PERSON_NAME),
-                    org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[result.person.qual],
-                    bib: result.person.bib,
-                    year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                    penalty_time: toHHMMSS(result.penalty_time),
-                    penalty_laps: result.penalty_laps,
-                    scores_ardf: result.scores_ardf,
-                    rogaine_score: result.rogaine_score,
-                    rogaine_penalty: result.rogaine_penalty,
-                    rogaine_points_earned: result.rogaine_score + result.rogaine_penalty,
-                    result: result.result_current,
-                    result_msec: result.result_msec,
-                    diff: isRogaine || isArdf ? result.diff_scores : toHHMMSS(result.diff),
-                    place: result.place,
-                    status: result.status,
-                    scores: result.scores,
-                    place_show: result.person.is_out_of_competition ? 'в/к' : result.place === 0 ? '' : result.place === -1 ? '' : result.place,
-                    is_out_of_competition: result.person.is_out_of_competition,
-                    speed: result.speed,
-                    speed_kmh:  (result.person.group.course.length * 3600 / result.result_msec).toFixed(1) + 'км/ч',
-					group: result.person.group.name,
-                    data: result
-                };
-                if (result.status !== 1) {
-                    r.diff = '';
-                    r.place_show = '';
-                    r.speed = '';
-                    r.speed_kmh = '';
-                    r.scores = '';
-                    r.rogaine_points_earned = '';
-                    r.rogaine_penalty = '';
-                    r.rogaine_score = '';
-                }
-
-                // SPLITS
-                var control_index = 0;
-                if (result.splits) {
-                    for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-                            if ((control_index + '_' + split.code) in splits_recalc_times){
-                                splits_recalc_times[control_index + '_' + split.code].push(split.leg_time);
-                                splits_recalc_times_total[control_index + '_' + split.code].push(split.relative_time);
-                            }
-                            control_index++;
-                        }
-                    }
-                }
-
-                var getMultipleTrBlock = function () {
-                    var tr = document.createElement('tr');
-                    for (var i = 0; i < arguments.length; i++) {
-                        var td1 = document.createElement('td');
-                        td1.appendChild(document.createTextNode(arguments[i]));
-                        tr.appendChild(td1);
-                    }
-                    return tr;
-                };
-
-                // ALL PUNCHES
-                var splitTable = document.createElement('table');
-                splitTable.className = 'table-split';
-                var splitTr = document.createElement('tr');
-                splitTable.appendChild(splitTr);
-                var prevTime = result.start_msec;
-                for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                    var split = _c[_b];
-                    var tbl = document.createElement('table');
-                    tbl.className = 'table-split';
-                    tbl.appendChild(getMultipleTrBlock('( ' + split.code + ' )', toHHMMSS(split.time - prevTime)));
-                    tbl.appendChild(getMultipleTrBlock('', toHHMMSS(split.time - result.start_msec)));
-                    var splitTd = document.createElement('td');
-                    splitTd.appendChild(tbl);
-                    splitTr.appendChild(splitTd);
-                    prevTime = split.time;
-                }
-                r.all_splits = splitTable;
-
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay) {
-                if (a.order === b.order) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                }
-                return a.order - b.order
-            } else {
-                if (a.status !== 1 && b.status !== 1) {
-                    return STATUS_PRIORITY.indexOf(a.status) - STATUS_PRIORITY.indexOf(b.status);
-                }
-                if (a.status !== 1) {
-                    return 1
-                }
-                if (b.status !== 1) {
-                    return -1
-                }
-                if (a.is_out_of_competition || b.is_out_of_competition) {
-                    if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                        return -(a.rogaine_score - b.rogaine_score);
-                    }
-                    if (isArdf && a.scores_ardf != b.scores_ardf) {
-                        return -(a.scores_ardf - b.scores_ardf);
-                    }
-                    return a.result_msec - b.result_msec;
-                }
-                if (a.place < 1) {
-                    return 1
-                }
-                if (b.place < 1) {
-                    return -1
-                }
-                if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                    return -(a.rogaine_score - b.rogaine_score);
-                }
-                if (isArdf && a.scores_ardf != b.scores_ardf) {
-                    return -(a.scores_ardf - b.scores_ardf);
-                }
-                return a.result_msec - b.result_msec;
-            }
-        });
-        var sort_splits_recalc_fnc = function(a,b){
-            return a-b;
-        }
-        group.controls.forEach(function (control, index) {
-            splits_recalc_times[index + '_' + control.code].sort(sort_splits_recalc_fnc);
-            splits_recalc_times_total[index + '_' + control.code].sort(sort_splits_recalc_fnc);
-        });
-        var index = 0;
-        if (isRelay) {
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        } else {
-            var get_score = function(res){
-                if (isRogaine) return res.rogaine_score;
-                if (isArdf) return res.scores_ardf;
-                return 0
-            }
-			var newplace = 1;
-			var doubleplace = -1;
-			var best_result_msec = results[0] ? results[0].result_msec : 0;
-			var last_result_msec = results[0] ? results[0].result_msec : 0;
-            var best_score = results[0] ? get_score(results[0]) : 0;
-            var binary_search = function(arr,required){
-				if (!arr){
-					return 0;
-				}
-                var l = -1;
-                var r = arr.length-1;
-                while (r-l>1){
-                    var m = Math.floor((l+r)/2);
-                    if (arr[m]>=required){
-                        r = m;
-                    } else {
-                        l = m;
-                    }
-                }
-                if (arr[r]==required){
-                    return r+1;
-                }
-                return 0;
-            }
-            results.forEach(function (elem) {
-                index++;
-                elem.index = index;
-				if (!elem.data.person.is_out_of_competition && elem.place !== 0 && elem.place !== -1) {
-					if (isRogaine || isArdf || last_result_msec < elem.result_msec){
-						newplace += 1 + doubleplace;
-						doubleplace = 0;
-						last_result_msec = elem.result_msec;
-					} else {
-						doubleplace++;
-					}
-					elem.diff = isRogaine || isArdf ? best_score - get_score(elem) : toHHMMSS(elem.result_msec - best_result_msec);
-					elem.place = newplace;
-					elem.place_show = newplace;
-                }
-                var control_index = 0;
-                if (elem.data.splits) {
-                    var getTrBlock = function (t, p) {
-                        var tr = document.createElement('tr');
-                        var td1 = document.createElement('td');
-                        td1.className = 'result-' + p;
-                        td1.appendChild(document.createTextNode(t));
-                        tr.appendChild(td1);
-                        return tr;
-                    };
-                    var lastSplit = 0;
-                    for (var _b = 0, _c = elem.data.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-                            var leg_place = binary_search(splits_recalc_times[control_index + '_' + split.code],split.leg_time);
-                            var relative_place = binary_search(splits_recalc_times_total[control_index + '_' + split.code],split.relative_time);
-                            if (leg_place>0 && relative_place>0){
-                                var tbl = document.createElement('table');
-                                tbl.className = 'table-split';
-                                tbl.appendChild(getTrBlock(toHHMMSS(split.leg_time) + ' (' + leg_place + ')', leg_place));
-                                tbl.appendChild(getTrBlock(toHHMMSS(split.relative_time) + ' (' + relative_place + ')', relative_place));
-                                elem[control_index + '_' + split.code] = tbl;
-                            }
-                            control_index++;
-                            lastSplit = split.relative_time;
-                        }
-                    }
-
-                    var finishMsec = elem.result_msec - lastSplit;
-
-                    if (elem.status === 1 && finishMsec > 0) {
-                        var tblF = document.createElement('table');
-                        tblF.className = 'table-split';
-                        tblF.appendChild(getTrBlock(toHHMMSS(finishMsec), 0));
-                        tblF.appendChild(getTrBlock(toHHMMSS(elem.result_msec) + ' (' + elem.place_show + ')', elem.place));
-                        elem.finish_split = tblF;
-                    }
-                }
-            });
-        }
-        return results;
-    }
-
-    function getRankingByGroup(group) {
-        var rankingBlock = document.createElement('span');
-        var ranking = group.ranking;
-        if (ranking && ranking.is_active && ranking.rank_scores > 0) {
-            var text = 'Квалификационный уровень (баллы): ' + ranking.rank_scores.toFixed(0);
-            rankingBlock.appendChild(document.createTextNode(text));
-
-            for (var _i = 0; _i < ranking.rank.length; _i++) {
-                var rank = ranking.rank[_i];
-                if (rank.is_active) {
-                    if (rank.max_place > 0) {
-                        var text = Qualification[rank.qual] + ' - до ' + rank.max_place + ' места';
-                        rankingBlock.appendChild(document.createElement("br"));
-                        rankingBlock.appendChild(document.createTextNode(text));
-                    }
-                    else {
-                        if (rank.min_scores && rank.min_scores > 0) {
-                            var text = Qualification[rank.qual] + ' - ' + rank.min_scores + ' очк.';
-                            if (rank.percent > 0) {
-                                text += ' (' + rank.percent + '%)';
-                            }
-                            rankingBlock.appendChild(document.createElement("br"));
-                            rankingBlock.appendChild(document.createTextNode(text));
-                        }
-                        else {
-                            if (rank.max_time > 0) {
-                                var text = Qualification[rank.qual] + ' - ' + toHHMMSS(rank.max_time);
-                                if (rank.percent > 0) {
-                                    text += ' (' + rank.percent + '%)';
-                                }
-                                rankingBlock.appendChild(document.createElement("br"));
-                                rankingBlock.appendChild(document.createTextNode(text));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            var text = 'Ранг не подсчитывался';
-            rankingBlock.appendChild(document.createTextNode(text));
-        }
-
-        return rankingBlock;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'group', title: 'Группа', size: 10, active: false},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'penalty_time', title: 'Штраф', size: 9, active: false},
-            {key: 'penalty_laps', title: 'Штраф', size: 9, active: false},
-            {key: 'scores_ardf', title: 'КП', size: 3, active: isArdf},
-            {key: 'rogaine_points_earned', title: 'Очки', size: 4, active: isRogaine},
-            {key: 'rogaine_penalty', title: 'Штр.', size: 4, active: isRogaine},
-            {key: 'rogaine_score', title: 'Итог', size: 4, active: isRogaine},
-            {key: 'result', title: 'Результат', size: 17},
-            {key: 'result_relay', title: 'Ком. рез-т', size: 14},
-            {key: 'diff', title: 'Отставание', size: 11, active: !isArdf && !isRogaine},
-            {key: 'speed', title: 'Темп', size: 8, active: false},
-            {key: 'speed_kmh', title: 'Скорость', size: 8, active: false},
-            {key: 'place_show', title: 'Место', size: 6},
-            {key: 'scores', title: 'Очки', size: 5, active: false},
-            {key: 'all_splits', title: 'Сплиты', active: false}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            try {
-                var isRelay = race.data.race_type === 3
-                this.getField('all_splits').active = location.href.indexOf('all_splits=1') > -1;
-                this.getField('scores').active = location.href.indexOf('scores=1') > -1;
-                this.getField('penalty_time').active = location.href.indexOf('penalty_time=1') > -1;
-                this.getField('penalty_laps').active = location.href.indexOf('penalty_laps=1') > -1;
-                this.getField('result_relay').active = isRelay
-            } catch (e){}
-            return this;
-        }
-    }.init();
-
-    store = {
-        showLinkForGroups: true
-    };
-
-    try {
-        store.splitsShow = (
-            location.href.indexOf('s_splits=1') > -1 ||
-            location.href.indexOf('&splits=1') > -1 ||
-            location.href.indexOf('?splits=1') > -1
-        );
-        store.rankingShow = location.href.indexOf('ranking=1') > -1;
-        store.showProtocolByCourse = location.href.indexOf('by_course=1') > -1;
-    } catch (e) {}
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-        Fields.active('group', store.showProtocolByCourse);
-        if (store.showProtocolByCourse){
-            var _a = race.courses;
-        } else {
-            var _a = race.groups;
-        }
-        for (var _i = 0; _i < _a.length; _i++) {
-            if (store.showProtocolByCourse){
-                var course = _a[_i];
-                var rows = getResultsByCourse(course, store.count);
-                var groupName = course.name;
-            } else {
-                var group = _a[_i];
-                var rows = getResultsByGroup(group, store.count);
-                var course = group.course;
-                var groupName = group.name;
-            }
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = groupName;
-            var groupTitle = groupName;
-            if (course && course.controls && course.controls.length){
-                groupTitle += ', ' + course.controls.length + ' КП';
-            }
-            if (course && course.length){
-                groupTitle += ', ' + course.length / 1000 + ' км';
-            }
-            titleBlock.appendChild(document.createTextNode(groupTitle));
-            resultBlock.appendChild(titleBlock);
-            if (!store.showProtocolByCourse && store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (store.splitsShow && course) {
-                course.controls.forEach(function (control, index) {
-                    fields.push({key: index + '_' + control.code, title: control.code})
-                });
-                fields.push({key: 'finish_split', title: 'F'})
-            }
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            //show ranking information
-            if (!store.showProtocolByCourse && store.rankingShow) {
-                resultBlock.appendChild(getRankingByGroup(group))
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-        var query = {
-            s_splits: store.splitsShow ? 1 : 0,
-            ranking: store.rankingShow ? 1 : 0,
-            by_course: store.showProtocolByCourse ? 1 : 0,
-            all_splits: Fields.isActive('all_splits') ? 1 : 0,
-            scores: Fields.isActive('scores') ? 1 : 0,
-            penalty_time: Fields.isActive('penalty_time') ? 1 : 0,
-            penalty_laps: Fields.isActive('penalty_laps') ? 1 : 0
-        };
-        var queryString = '?';
-        Object.keys(query).forEach(function (key) {
-            if (query[key]) {
-                queryString += key + '=' + query[key] + '&';
-            }
-        });
-        queryString += 'sportorg=1';
-        try {
-            var href = location.href.split('?')[0];
-            history.pushState({}, null, href + queryString);
-        } catch (e) {}
-    }
-
-    render();
-
-    var Scrolling = {
-        direction: 1,
-        enabled: false,
-        lock: false,
-        prev: 0,
-        intervalTimer: 0,
-        init: function () {
-            var _this = this;
-            if (_this.intervalTimer) {
-                clearInterval(_this.intervalTimer)
-            }
-            _this.intervalTimer = setInterval(function () {
-                _this.lock = !_this.lock;
-            }, 5000);
-            window.onscroll = function () {
-                var d = document.documentElement;
-                var offset = d.scrollTop + window.innerHeight;
-                var height = d.offsetHeight;
-
-                if (offset === height) {
-                    _this.direction = -1;
-                }
-                if (offset <= window.innerHeight) {
-                    _this.direction = 1;
-                }
-            };
-            this.pageScroll();
-            return this;
-        },
-        pageScroll: function () {
-            var _this = this;
-            if (_this.enabled && ! _this.lock) {
-                window.scrollBy(10, _this.direction);
-            }
-            setTimeout(function () {
-                _this.pageScroll();
-            }, 10);
-        }
-    }.init();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Протокол по дистанциям',
-            value: !!store.showProtocolByCourse,
-            change: function (checked) {
-                store.showProtocolByCourse = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Штрафное время',
-            value: Fields.isActive('penalty_time'),
-            change: function (checked) {
-                Fields.active('penalty_time', checked);
-                render()
-            }
-        },
-        {
-            title: 'Кол-во штрафных кругов',
-            value: Fields.isActive('penalty_laps'),
-            change: function (checked) {
-                Fields.active('penalty_laps', checked);
-                render()
-            }
-        },
-        {
-            title: 'ARDF КП',
-            value: Fields.isActive('scores_ardf'),
-            change: function (checked) {
-                Fields.active('scores_ardf', checked);
-                render()
-            }
-        },
-        {
-            title: 'Отставание',
-            value: Fields.isActive('diff'),
-            change: function (checked) {
-                Fields.active('diff', checked);
-                render()
-            }
-        },
-        {
-            title: 'Темп',
-            value: Fields.isActive('speed'),
-            change: function (checked) {
-                Fields.active('speed', checked);
-                render()
-            }
-        },
-        {
-            title: 'Скорость км/ч',
-            value: Fields.isActive('speed_kmh'),
-            change: function (checked) {
-                Fields.active('speed_kmh', checked);
-                render()
-            }
-        },
-        {
-            title: 'Сплиты (заданное направление)',
-            value: !!store.splitsShow,
-            change: function (checked) {
-                store.splitsShow = checked;
-                render()
-            }
-        },
-        {
-            title: 'Сплиты (все отметки)',
-            value: Fields.isActive('all_splits'),
-            change: function (checked) {
-                Fields.active('all_splits', checked);
-                render()
-            }
-        },
-        {
-            title: 'Очки',
-            value: Fields.isActive('scores'),
-            change: function (checked) {
-                Fields.active('scores', checked);
-                render()
-            }
-        },
-        {
-            title: 'Выполнение',
-            value: store.rankingShow,
-            change: function (checked) {
-                store.rankingShow = checked;
-                render()
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 0},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        },
-        {
-            title: 'Автоскролл',
-            value: Scrolling.enabled,
-            change: function (checked) {
-                Scrolling.enabled = checked;
-            }
-        },
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\320\275\320\265_\321\204\320\270\320\275\320\270\321\210\320\270\321\200\320\276\320\262\320\260\320\262\321\210\320\270\320\265.html" "b/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\320\275\320\265_\321\204\320\270\320\275\320\270\321\210\320\270\321\200\320\276\320\262\320\260\320\262\321\210\320\270\320\265.html"
deleted file mode 100644
index d0fe4d29..00000000
--- "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\320\275\320\265_\321\204\320\270\320\275\320\270\321\210\320\270\321\200\320\276\320\262\320\260\320\262\321\210\320\270\320\265.html"
+++ /dev/null
@@ -1,317 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="groups-table"></div>
-<div id="not-results-table"></div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{% raw %};
-    var selected = {% endraw %}{{selected|tojson}}{% raw %};
-    racePreparation(race);
-    var RaceData = {
-        race: race,
-        selected: selected,
-        groupFields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Группа'},
-            {key: 'count_person', title: 'Кол-во участников'},
-            {key: 'count_not_finished', title: 'Бегут'}
-        ],
-        didNotFields: [
-            {key: 'group', title: 'Группа'},
-            {key: 'name', title: 'Фамилия, имя'},
-            {key: 'bib', title: 'Номер'},
-            {key: 'start', title: 'Время старта'},
-            {key: 'year', title: 'ГР'},
-            {key: 'qual', title: 'Разряд'},
-            {key: 'org', title: 'Коллектив'},
-            {key: 'contact', title: 'Контактные данные'}
-        ],
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Фамилия, имя'},
-            {key: 'org', title: 'Коллектив'},
-            {key: 'year', title: 'ГР'},
-            {key: 'qual', title: 'Разряд'},
-            {key: 'bib', title: 'Номер'},
-            {key: 'start', title: 'Время старта'},
-            {key: 'result', title: 'Результат'},
-            {key: 'diff', title: 'Отставание'},
-            {key: 'speed', title: 'Темп', active: false},
-            {key: 'place_show', title: 'Место'},
-            {key: 'contact', title: 'Контактные данные'}
-        ],
-        init: function () {
-            var _this = this;
-            var personsMap = {};
-            this.race.results.forEach(function (result) {
-                if (result.person) {
-                    personsMap[result.person.id] = true;
-                }
-            });
-            this.race.persons.forEach(function (person) {
-                if (!personsMap[person.id]) {
-                   _this.race.results.push(_this.newResult(person));
-                }
-            });
-            this.render();
-            return this;
-        },
-        newResult: function (person) {
-            return {
-                assigned_rank: 0,
-                created_at: 0,
-                days: 0,
-                diff: null,
-                finish_msec: 86400000,
-                finish_time: 86400000,
-                id: guid(),
-                object: "ResultSportident",
-                penalty_laps: 0,
-                penalty_time: null,
-                person_id: person && person.id,
-                person: person,
-                place: -2,
-                result: "НЕТ ФИНИША",
-                result_msec: 86400000,
-                scores: 0,
-                speed: "",
-                splits: [],
-                card_number: person && person.card_number,
-                start_msec: person && person.start_time || 0,
-                start_time: person && person.start_time,
-                status: 14,
-                status_comment: "",
-                system_type: 2
-            }
-        },
-        getResults: function (group) {
-            var isRelay = group.__type ? group.__type === 3 : this.race.data.race_type === 3;
-            var results = [];
-            var countDidNotEnter = 0;
-            for (var _i = 0, _a = this.race.results; _i < _a.length; _i++) {
-                var result = _a[_i];
-                if (result.person && result.person.group && result.person.group.id === group.id) {
-                    var r = {
-                        index: 0,
-                        name: result.person.surname + ' ' + result.person.name,
-                        org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                        qual: Qualification[result.person.qual],
-                        bib: result.person.bib,
-                        year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                        penalty_time: toHHMMSS(result.penalty_time),
-                        penalty_laps: result.penalty_laps,
-                        result: result.result,
-                        resultMsec: result.result_msec,
-                        diff: toHHMMSS(result.diff),
-                        place: result.place,
-                        status: result.status,
-                        place_show: result.person.is_out_of_competition ? 'в/к' : result.place === 0 ? '' : result.place <= -1 ? '' : result.place,
-                        speed: result.speed,
-                        contact: result.person.organization && result.person.organization.contact.value,
-                        start: toHHMMSS(result.start_msec),
-                        data: result
-                    };
-                    if (result.status !== 1) {
-                        r.diff = '';
-                        r.place_show = '';
-                        r.speed = '';
-                        r.penalty_time = '';
-                        r.penalty_laps = '';
-                    }
-                    if (result.status === 14) {
-                        countDidNotEnter++;
-                    }
-                    results.push(r);
-                }
-            }
-            results.sort(function(a, b) {
-                if (isRelay) {
-                    if (a.place < 1) {
-                        return 1
-                    }
-                    if (b.place < 1) {
-                        return -1
-                    }
-                    if (isRelay && a.place === b.place) {
-                        return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                    }
-                    return a.place - b.place
-
-                } else {
-                    if (a.status !== 1 && b.status !== 1) {
-                        return STATUS_PRIORITY.indexOf(a.status) - STATUS_PRIORITY.indexOf(b.status);
-                    }
-                    if (a.status !== 1) {
-                        return 1
-                    }
-                    if (b.status !== 1) {
-                        return -1
-                    }
-                    if (a.place < 1) {
-                        return 1
-                    }
-                    if (b.place < 1) {
-                        return -1
-                    }
-                    return a.place - b.place
-                }
-            });
-            var index = 0;
-            if (isRelay) {
-                var prevBib = 0;
-                var resultsList = results.slice();
-                results = [];
-                for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                    var r = resultsList_[_i];
-                    r.index = '';
-                    if (r.bib % 1000 !== prevBib) {
-                        index++;
-                        results.push({ index: index });
-                        prevBib = r.bib % 1000;
-                    }
-                    results.push(r);
-                }
-            } else {
-                results.forEach(function (elem) {
-                    index++;
-                    elem.index = index;
-                })
-            }
-            return {results: results, countDidNotEnter: countDidNotEnter};
-        },
-        getDidNotEnterResults: function () {
-            var results = [];
-            for (var _i = 0, _a = this.race.results; _i < _a.length; _i++) {
-                var result = _a[_i];
-                if (result.status === 14) {
-                    var r = {
-                        name: result.person.surname + ' ' + result.person.name,
-                        group: (result.person.group && result.person.group.name) || '',
-                        org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                        qual: Qualification[result.person.qual],
-                        bib: result.person.bib,
-                        start: toHHMMSS(result.start_msec),
-                        contact: result.person.organization && result.person.organization.contact.value,
-                        year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                        data: result
-                    };
-                    results.push(r);
-                }
-            }
-            results.sort(function (a, b) {
-                var nameA = a.group.toLowerCase() || '';
-                var nameB = b.group.toLowerCase() || '';
-                if (nameA === nameB) {
-                    return a.data.start_msec - b.data.start_msec;
-                }
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            });
-            return results;
-        },
-        countDidNotEnter: function (group) {
-            var count = 0;
-            this.race.results.forEach(function (result) {
-                if ((group && result.person && result.person.group && result.person.group.id === group.id && result.status === 14)|| (!group && result.status === 14)) {
-                    count++;
-                }
-            });
-            return count;
-        },
-        getGroupRows: function () {
-            var _this = this;
-            var rows = [];
-            var countPersons = 0;
-            var countNotFinished = 0;
-            this.race.groups.forEach(function (group, index) {
-                var g = {
-                    index: index+1,
-                    name: group.name,
-                    count_person: group.count_person,
-                    count_not_finished: _this.countDidNotEnter(group)
-                };
-                rows.push(g);
-                countPersons += g.count_person;
-                countNotFinished += g.count_not_finished;
-            });
-            rows.push({
-                name: 'Всего',
-                count_person: countPersons,
-                count_not_finished: countNotFinished
-            });
-
-            return rows;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            var notResultBlock = document.getElementById('not-results-table');
-            notResultBlock.innerHTML = '';
-            var groupBlock = document.getElementById('groups-table');
-            groupBlock.innerHTML = '';
-
-            groupBlock.appendChild(new TableGenerator(this.getGroupRows().map(function (group) {
-                if (group.name !== 'Всего') {
-                    var a = document.createElement('a');
-                    a.href = '#' + group.name;
-                    a.appendChild(document.createTextNode(group.name));
-                    group.name = a;
-                }
-                return group;
-            }), this.groupFields).getTable({ className: 'sportorg-table' }));
-
-            groupBlock.appendChild(document.createElement('hr'));
-
-            notResultBlock.appendChild(new TableGenerator(
-                this.getDidNotEnterResults(),
-                this.didNotFields
-            ).getTable({ className: 'sportorg-table' }));
-
-            notResultBlock.appendChild(document.createElement('hr'));
-
-            for (var _i = 0, _a = this.race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                var r = this.getResults(group);
-
-                var titleBlock = document.createElement('h2');
-                titleBlock.id = group.name;
-                titleBlock.appendChild(document.createTextNode(group.name));
-                if (group.max_time) {
-                    titleBlock.appendChild(document.createTextNode(', Контрольное время: ' + toHHMMSS(group.max_time)));
-                }
-                if (r.countDidNotEnter) {
-                    titleBlock.appendChild(document.createTextNode(', Не финишировали: ' + r.countDidNotEnter));
-                }
-                resultBlock.appendChild(titleBlock);
-                resultBlock.appendChild(getGroupsBlockElement(race));
-                resultBlock.appendChild(new TableGenerator(r.results, this.fields).getTable({ className: 'sportorg-table' }));
-            }
-        }
-    }.init();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\321\201\320\277\320\273\320\270\321\202\321\213.html" "b/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\321\201\320\277\320\273\320\270\321\202\321\213.html"
deleted file mode 100644
index b08295d8..00000000
--- "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\321\201\320\277\320\273\320\270\321\202\321\213.html"
+++ /dev/null
@@ -1,867 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<style>
-    table.table-split {
-        margin: 0;
-    }
-    table.table-split td{
-        border: 0;
-        padding: 0;
-    }
-</style>
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var isRogaine = race.settings.result_processing_mode === 'scores';
-    var isArdf =  race.settings.result_processing_mode === 'ardf';
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        for (var _i = 0, _a = race.results; _i < _a.length; _i++) {
-            var result = _a[_i];
-            if (result.status !== 13 && result.person && result.person.group && result.person.group.id === group.id && (count ? result.place <= count && result.place > 0 : 1)) {
-                var r = {
-                    index: 0,
-                    name: (result.person.surname + ' ' + result.person.name).slice(0, MAX_PERSON_NAME),
-                    org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[result.person.qual],
-                    bib: result.person.bib,
-                    year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                    penalty_time: toHHMMSS(result.penalty_time),
-                    penalty_laps: result.penalty_laps,
-                    scores_ardf: result.scores_ardf,
-                    rogaine_score: result.rogaine_score,
-                    rogaine_penalty: result.rogaine_penalty,
-                    rogaine_points_earned: result.rogaine_score + result.rogaine_penalty,
-                    result: result.result_current,
-                    result_relay: result.result_relay,
-                    result_msec: result.result_msec,
-                    diff: isRogaine || isArdf ? result.diff_scores : toHHMMSS(result.diff),
-                    place: result.place,
-                    status: result.status,
-                    scores: result.scores,
-                    place_show: result.person.is_out_of_competition ? 'в/к' : result.place === 0 ? '' : result.place === -1 ? '' : result.place,
-                    is_out_of_competition: result.person.is_out_of_competition,
-                    speed: result.speed,
-                    speed_kmh:  group.course ? (group.course.length * 3600 / result.result_msec).toFixed(1) + 'км/ч' : '',
-                    data: result,
-                    order: result.order
-                };
-                if (result.status !== 1) {
-                    r.diff = '';
-                    r.place_show = '';
-                    r.speed = '';
-                    r.speed_kmh = '';
-                    r.scores = '';
-                    r.rogaine_points_earned = '';
-                    r.rogaine_penalty = '';
-                    r.rogaine_score = '';
-                }
-
-                // SPLITS
-                var control_index = 0;
-                if (result.splits) {
-                    var getTrBlock = function (t, p) {
-                        var tr = document.createElement('tr');
-                        var td1 = document.createElement('td');
-                        td1.className = 'result-' + p;
-                        td1.appendChild(document.createTextNode(t));
-                        tr.appendChild(td1);
-                        return tr;
-                    };
-                    var lastSplit = 0;
-                    for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-
-                            var tbl = document.createElement('table');
-                            tbl.className = 'table-split';
-                            tbl.appendChild(getTrBlock(toHHMMSS(split.leg_time) + ' (' + split.leg_place + ')', split.leg_place));
-                            tbl.appendChild(getTrBlock(toHHMMSS(split.relative_time) + ' (' + split.relative_place + ')', split.relative_place));
-                            r[control_index + '_' + split.code] = tbl;
-                            control_index++;
-                            lastSplit = split.relative_time;
-                        }
-                    }
-
-                    var finishMsec = r.result_msec - lastSplit;
-
-                    if (r.status === 1 && finishMsec > 0) {
-                        var tblF = document.createElement('table');
-                        tblF.className = 'table-split';
-                        tblF.appendChild(getTrBlock(toHHMMSS(finishMsec), 0));
-                        var place_str = r.place > 0 ? r.place : 'в/к';
-                        tblF.appendChild(getTrBlock(toHHMMSS(r.result_msec) + ' (' + place_str + ')', r.place));
-                        r.finish_split = tblF;
-                    }
-                }
-
-                var getMultipleTrBlock = function () {
-                    var tr = document.createElement('tr');
-                    for (var i = 0; i < arguments.length; i++) {
-                        var td1 = document.createElement('td');
-                        td1.appendChild(document.createTextNode(arguments[i]));
-                        tr.appendChild(td1);
-                    }
-                    return tr;
-                };
-
-                // ALL PUNCHES
-                var splitTable = document.createElement('table');
-                splitTable.className = 'table-split';
-                var splitTr = document.createElement('tr');
-                splitTable.appendChild(splitTr);
-                var prevTime = result.start_msec;
-                for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                    var split = _c[_b];
-                    var tbl = document.createElement('table');
-                    tbl.className = 'table-split';
-                    tbl.appendChild(getMultipleTrBlock('( ' + split.code + ' )', toHHMMSS(split.time - prevTime)));
-                    tbl.appendChild(getMultipleTrBlock('', toHHMMSS(split.time - result.start_msec)));
-                    var splitTd = document.createElement('td');
-                    splitTd.appendChild(tbl);
-                    splitTr.appendChild(splitTd);
-                    prevTime = split.time;
-                }
-                r.all_splits = splitTable;
-
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay) {
-
-                if (a.order === b.order) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                }
-                return a.order - b.order
-
-            } else {
-                if (a.status !== 1 && b.status !== 1) {
-                    return STATUS_PRIORITY.indexOf(a.status) - STATUS_PRIORITY.indexOf(b.status);
-                }
-                if (a.status !== 1) {
-                    return 1
-                }
-                if (b.status !== 1) {
-                    return -1
-                }
-                if (a.is_out_of_competition || b.is_out_of_competition) {
-                    if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                        return -(a.rogaine_score - b.rogaine_score);
-                    }
-                    if (isArdf && a.scores_ardf != b.scores_ardf) {
-                        return -(a.scores_ardf - b.scores_ardf);
-                    }
-                    return a.result_msec - b.result_msec;
-                }
-                if (a.place < 1) {
-                    return 1
-                }
-                if (b.place < 1) {
-                    return -1
-                }
-                return a.place - b.place
-            }
-        });
-        var index = 0;
-        if (isRelay) {
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        } else {
-            results.forEach(function (elem) {
-                index++;
-                elem.index = index;
-            })
-        }
-        return results;
-    }
-	function getResultsByCourse(group, count) {
-		count = +count || 0;
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        var splits_recalc_times = {};
-        var splits_recalc_times_total = {};
-        group.controls.forEach(function (control, index) {
-            splits_recalc_times[index + '_' + control.code] = [];
-            splits_recalc_times_total[index + '_' + control.code] = [];
-        });
-        for (var _i = 0, _a = race.results; _i < _a.length; _i++) {
-            var result = _a[_i];
-            if (result.status !== 13 && result.person && result.person.group && result.person.group.course && result.person.group.course.id === group.id) { //} && (count ? result.place <= count && result.place > 0 : 1)) {
-                var r = {
-                    index: 0,
-                    name: (result.person.surname + ' ' + result.person.name).slice(0, MAX_PERSON_NAME),
-                    org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[result.person.qual],
-                    bib: result.person.bib,
-                    year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                    penalty_time: toHHMMSS(result.penalty_time),
-                    penalty_laps: result.penalty_laps,
-                    scores_ardf: result.scores_ardf,
-                    rogaine_score: result.rogaine_score,
-                    rogaine_penalty: result.rogaine_penalty,
-                    rogaine_points_earned: result.rogaine_score + result.rogaine_penalty,
-                    result: result.result_current,
-                    result_msec: result.result_msec,
-                    diff: isRogaine || isArdf ? result.diff_scores : toHHMMSS(result.diff),
-                    place: result.place,
-                    status: result.status,
-                    scores: result.scores,
-                    place_show: result.person.is_out_of_competition ? 'в/к' : result.place === 0 ? '' : result.place === -1 ? '' : result.place,
-                    is_out_of_competition: result.person.is_out_of_competition,
-                    speed: result.speed,
-                    speed_kmh:  (result.person.group.course.length * 3600 / result.result_msec).toFixed(1) + 'км/ч',
-					group: result.person.group.name,
-                    data: result
-                };
-                if (result.status !== 1) {
-                    r.diff = '';
-                    r.place_show = '';
-                    r.speed = '';
-                    r.speed_kmh = '';
-                    r.scores = '';
-                    r.rogaine_points_earned = '';
-                    r.rogaine_penalty = '';
-                    r.rogaine_score = '';
-                }
-
-                // SPLITS
-                var control_index = 0;
-                if (result.splits) {
-                    for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-                            if ((control_index + '_' + split.code) in splits_recalc_times){
-                                splits_recalc_times[control_index + '_' + split.code].push(split.leg_time);
-                                splits_recalc_times_total[control_index + '_' + split.code].push(split.relative_time);
-                            }
-                            control_index++;
-                        }
-                    }
-                }
-
-                var getMultipleTrBlock = function () {
-                    var tr = document.createElement('tr');
-                    for (var i = 0; i < arguments.length; i++) {
-                        var td1 = document.createElement('td');
-                        td1.appendChild(document.createTextNode(arguments[i]));
-                        tr.appendChild(td1);
-                    }
-                    return tr;
-                };
-
-                // ALL PUNCHES
-                var splitTable = document.createElement('table');
-                splitTable.className = 'table-split';
-                var splitTr = document.createElement('tr');
-                splitTable.appendChild(splitTr);
-                var prevTime = result.start_msec;
-                for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                    var split = _c[_b];
-                    var tbl = document.createElement('table');
-                    tbl.className = 'table-split';
-                    tbl.appendChild(getMultipleTrBlock('( ' + split.code + ' )', toHHMMSS(split.time - prevTime)));
-                    tbl.appendChild(getMultipleTrBlock('', toHHMMSS(split.time - result.start_msec)));
-                    var splitTd = document.createElement('td');
-                    splitTd.appendChild(tbl);
-                    splitTr.appendChild(splitTd);
-                    prevTime = split.time;
-                }
-                r.all_splits = splitTable;
-
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay) {
-                if (a.order === b.order) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                }
-                return a.order - b.order
-            } else {
-                if (a.status !== 1 && b.status !== 1) {
-                    return STATUS_PRIORITY.indexOf(a.status) - STATUS_PRIORITY.indexOf(b.status);
-                }
-                if (a.status !== 1) {
-                    return 1
-                }
-                if (b.status !== 1) {
-                    return -1
-                }
-                if (a.is_out_of_competition || b.is_out_of_competition) {
-                    if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                        return -(a.rogaine_score - b.rogaine_score);
-                    }
-                    if (isArdf && a.scores_ardf != b.scores_ardf) {
-                        return -(a.scores_ardf - b.scores_ardf);
-                    }
-                    return a.result_msec - b.result_msec;
-                }
-                if (a.place < 1) {
-                    return 1
-                }
-                if (b.place < 1) {
-                    return -1
-                }
-                if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                    return -(a.rogaine_score - b.rogaine_score);
-                }
-                if (isArdf && a.scores_ardf != b.scores_ardf) {
-                    return -(a.scores_ardf - b.scores_ardf);
-                }
-                return a.result_msec - b.result_msec;
-            }
-        });
-        var sort_splits_recalc_fnc = function(a,b){
-            return a-b;
-        }
-        group.controls.forEach(function (control, index) {
-            splits_recalc_times[index + '_' + control.code].sort(sort_splits_recalc_fnc);
-            splits_recalc_times_total[index + '_' + control.code].sort(sort_splits_recalc_fnc);
-        });
-        var index = 0;
-        if (isRelay) {
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        } else {
-            var get_score = function(res){
-                if (isRogaine) return res.rogaine_score;
-                if (isArdf) return res.scores_ardf;
-                return 0
-            }
-			var newplace = 1;
-			var doubleplace = -1;
-			var best_result_msec = results[0] ? results[0].result_msec : 0;
-			var last_result_msec = results[0] ? results[0].result_msec : 0;
-            var best_score = results[0] ? get_score(results[0]) : 0;
-            var binary_search = function(arr,required){
-				if (!arr){
-					return 0;
-				}
-                var l = -1;
-                var r = arr.length-1;
-                while (r-l>1){
-                    var m = Math.floor((l+r)/2);
-                    if (arr[m]>=required){
-                        r = m;
-                    } else {
-                        l = m;
-                    }
-                }
-                if (arr[r]==required){
-                    return r+1;
-                }
-                return 0;
-            }
-            results.forEach(function (elem) {
-                index++;
-                elem.index = index;
-				if (!elem.data.person.is_out_of_competition && elem.place !== 0 && elem.place !== -1) {
-					if (isRogaine || isArdf || last_result_msec < elem.result_msec){
-						newplace += 1 + doubleplace;
-						doubleplace = 0;
-						last_result_msec = elem.result_msec;
-					} else {
-						doubleplace++;
-					}
-					elem.diff = isRogaine || isArdf ? best_score - get_score(elem) : toHHMMSS(elem.result_msec - best_result_msec);
-					elem.place = newplace;
-					elem.place_show = newplace;
-                }
-                var control_index = 0;
-                if (elem.data.splits) {
-                    var getTrBlock = function (t, p) {
-                        var tr = document.createElement('tr');
-                        var td1 = document.createElement('td');
-                        td1.className = 'result-' + p;
-                        td1.appendChild(document.createTextNode(t));
-                        tr.appendChild(td1);
-                        return tr;
-                    };
-                    var lastSplit = 0;
-                    for (var _b = 0, _c = elem.data.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-                            var leg_place = binary_search(splits_recalc_times[control_index + '_' + split.code],split.leg_time);
-                            var relative_place = binary_search(splits_recalc_times_total[control_index + '_' + split.code],split.relative_time);
-                            if (leg_place>0 && relative_place>0){
-                                var tbl = document.createElement('table');
-                                tbl.className = 'table-split';
-                                tbl.appendChild(getTrBlock(toHHMMSS(split.leg_time) + ' (' + leg_place + ')', leg_place));
-                                tbl.appendChild(getTrBlock(toHHMMSS(split.relative_time) + ' (' + relative_place + ')', relative_place));
-                                elem[control_index + '_' + split.code] = tbl;
-                            }
-                            control_index++;
-                            lastSplit = split.relative_time;
-                        }
-                    }
-
-                    var finishMsec = elem.result_msec - lastSplit;
-
-                    if (elem.status === 1 && finishMsec > 0) {
-                        var tblF = document.createElement('table');
-                        tblF.className = 'table-split';
-                        tblF.appendChild(getTrBlock(toHHMMSS(finishMsec), 0));
-                        tblF.appendChild(getTrBlock(toHHMMSS(elem.result_msec) + ' (' + elem.place_show + ')', elem.place));
-                        elem.finish_split = tblF;
-                    }
-                }
-            });
-        }
-        return results;
-    }
-
-    function getRankingByGroup(group) {
-        var rankingBlock = document.createElement('span');
-        var ranking = group.ranking;
-        if (ranking && ranking.is_active && ranking.rank_scores > 0) {
-            var text = 'Квалификационный уровень (баллы): ' + ranking.rank_scores.toFixed(0);
-            rankingBlock.appendChild(document.createTextNode(text));
-
-            for (var _i = 0; _i < ranking.rank.length; _i++) {
-                var rank = ranking.rank[_i];
-                if (rank.is_active) {
-                    if (rank.max_place > 0) {
-                        var text = Qualification[rank.qual] + ' - до ' + rank.max_place + ' места';
-                        rankingBlock.appendChild(document.createElement("br"));
-                        rankingBlock.appendChild(document.createTextNode(text));
-                    }
-                    else {
-                        if (rank.min_scores && rank.min_scores > 0) {
-                            var text = Qualification[rank.qual] + ' - ' + rank.min_scores + ' очк.';
-                            if (rank.percent > 0) {
-                                text += ' (' + rank.percent + '%)';
-                            }
-                            rankingBlock.appendChild(document.createElement("br"));
-                            rankingBlock.appendChild(document.createTextNode(text));
-                        }
-                        else {
-                            if (rank.max_time > 0) {
-                                var text = Qualification[rank.qual] + ' - ' + toHHMMSS(rank.max_time);
-                                if (rank.percent > 0) {
-                                    text += ' (' + rank.percent + '%)';
-                                }
-                                rankingBlock.appendChild(document.createElement("br"));
-                                rankingBlock.appendChild(document.createTextNode(text));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            var text = 'Ранг не подсчитывался';
-            rankingBlock.appendChild(document.createTextNode(text));
-        }
-
-        return rankingBlock;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'group', title: 'Группа', size: 10, active: false},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'penalty_time', title: 'Штраф', size: 9, active: false},
-            {key: 'penalty_laps', title: 'Штраф', size: 9, active: false},
-            {key: 'scores_ardf', title: 'КП', size: 3, active: isArdf},
-            {key: 'rogaine_points_earned', title: 'Очки', size: 4, active: isRogaine},
-            {key: 'rogaine_penalty', title: 'Штр.', size: 4, active: isRogaine},
-            {key: 'rogaine_score', title: 'Итог', size: 4, active: isRogaine},
-            {key: 'result', title: 'Результат', size: 17},
-            {key: 'result_relay', title: 'Ком. рез-т', size: 14},
-            {key: 'diff', title: 'Отставание', size: 11, active: !isArdf && !isRogaine},
-            {key: 'speed', title: 'Темп', size: 8, active: false},
-            {key: 'speed_kmh', title: 'Скорость', size: 8, active: false},
-            {key: 'place_show', title: 'Место', size: 6},
-            {key: 'scores', title: 'Очки', size: 5, active: false},
-            {key: 'all_splits', title: 'Сплиты', active: false}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            try {
-                var isRelay = race.data.race_type === 3
-                this.getField('all_splits').active = location.href.indexOf('all_splits=1') > -1;
-                this.getField('scores').active = location.href.indexOf('scores=1') > -1;
-                this.getField('penalty_time').active = location.href.indexOf('penalty_time=1') > -1;
-                this.getField('penalty_laps').active = location.href.indexOf('penalty_laps=1') > -1;
-                this.getField('result_relay').active = isRelay
-            } catch (e){}
-            return this;
-        }
-    }.init();
-
-    store = {
-        showLinkForGroups: true
-    };
-
-    try {
-        store.splitsShow = (
-            location.href.indexOf('s_splits=1') > -1 ||
-            location.href.indexOf('&splits=1') > -1 ||
-            location.href.indexOf('?splits=1') > -1
-        );
-
-        <!--force split showing-->
-        store.splitsShow = 1
-
-        store.rankingShow = location.href.indexOf('ranking=1') > -1;
-        store.showProtocolByCourse = location.href.indexOf('by_course=1') > -1;
-    } catch (e) {}
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-        Fields.active('group', store.showProtocolByCourse);
-        if (store.showProtocolByCourse){
-            var _a = race.courses;
-        } else {
-            var _a = race.groups;
-        }
-        for (var _i = 0; _i < _a.length; _i++) {
-            if (store.showProtocolByCourse){
-                var course = _a[_i];
-                var rows = getResultsByCourse(course, store.count);
-                var groupName = course.name;
-            } else {
-                var group = _a[_i];
-                var rows = getResultsByGroup(group, store.count);
-                var course = group.course;
-                var groupName = group.name;
-            }
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = groupName;
-            var groupTitle = groupName;
-            if (course && course.controls && course.controls.length){
-                groupTitle += ', ' + course.controls.length + ' КП';
-            }
-            if (course && course.length){
-                groupTitle += ', ' + course.length / 1000 + ' км';
-            }
-            titleBlock.appendChild(document.createTextNode(groupTitle));
-            resultBlock.appendChild(titleBlock);
-            if (!store.showProtocolByCourse && store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (store.splitsShow && course) {
-                course.controls.forEach(function (control, index) {
-                    fields.push({key: index + '_' + control.code, title: control.code})
-                });
-                fields.push({key: 'finish_split', title: 'F'})
-            }
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            //show ranking information
-            if (!store.showProtocolByCourse && store.rankingShow) {
-                resultBlock.appendChild(getRankingByGroup(group))
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-        var query = {
-            s_splits: store.splitsShow ? 1 : 0,
-            ranking: store.rankingShow ? 1 : 0,
-            by_course: store.showProtocolByCourse ? 1 : 0,
-            all_splits: Fields.isActive('all_splits') ? 1 : 0,
-            scores: Fields.isActive('scores') ? 1 : 0,
-            penalty_time: Fields.isActive('penalty_time') ? 1 : 0,
-            penalty_laps: Fields.isActive('penalty_laps') ? 1 : 0
-        };
-        var queryString = '?';
-        Object.keys(query).forEach(function (key) {
-            if (query[key]) {
-                queryString += key + '=' + query[key] + '&';
-            }
-        });
-        queryString += 'sportorg=1';
-        try {
-            var href = location.href.split('?')[0];
-            history.pushState({}, null, href + queryString);
-        } catch (e) {}
-    }
-
-    render();
-
-    var Scrolling = {
-        direction: 1,
-        enabled: false,
-        lock: false,
-        prev: 0,
-        intervalTimer: 0,
-        init: function () {
-            var _this = this;
-            if (_this.intervalTimer) {
-                clearInterval(_this.intervalTimer)
-            }
-            _this.intervalTimer = setInterval(function () {
-                _this.lock = !_this.lock;
-            }, 5000);
-            window.onscroll = function () {
-                var d = document.documentElement;
-                var offset = d.scrollTop + window.innerHeight;
-                var height = d.offsetHeight;
-
-                if (offset === height) {
-                    _this.direction = -1;
-                }
-                if (offset <= window.innerHeight) {
-                    _this.direction = 1;
-                }
-            };
-            this.pageScroll();
-            return this;
-        },
-        pageScroll: function () {
-            var _this = this;
-            if (_this.enabled && ! _this.lock) {
-                window.scrollBy(10, _this.direction);
-            }
-            setTimeout(function () {
-                _this.pageScroll();
-            }, 10);
-        }
-    }.init();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Протокол по дистанциям',
-            value: !!store.showProtocolByCourse,
-            change: function (checked) {
-                store.showProtocolByCourse = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Штрафное время',
-            value: Fields.isActive('penalty_time'),
-            change: function (checked) {
-                Fields.active('penalty_time', checked);
-                render()
-            }
-        },
-        {
-            title: 'Кол-во штрафных кругов',
-            value: Fields.isActive('penalty_laps'),
-            change: function (checked) {
-                Fields.active('penalty_laps', checked);
-                render()
-            }
-        },
-        {
-            title: 'ARDF КП',
-            value: Fields.isActive('scores_ardf'),
-            change: function (checked) {
-                Fields.active('scores_ardf', checked);
-                render()
-            }
-        },
-        {
-            title: 'Отставание',
-            value: Fields.isActive('diff'),
-            change: function (checked) {
-                Fields.active('diff', checked);
-                render()
-            }
-        },
-        {
-            title: 'Темп',
-            value: Fields.isActive('speed'),
-            change: function (checked) {
-                Fields.active('speed', checked);
-                render()
-            }
-        },
-        {
-            title: 'Скорость км/ч',
-            value: Fields.isActive('speed_kmh'),
-            change: function (checked) {
-                Fields.active('speed_kmh', checked);
-                render()
-            }
-        },
-        {
-            title: 'Сплиты (заданное направление)',
-            value: !!store.splitsShow,
-            change: function (checked) {
-                store.splitsShow = checked;
-                render()
-            }
-        },
-        {
-            title: 'Сплиты (все отметки)',
-            value: Fields.isActive('all_splits'),
-            change: function (checked) {
-                Fields.active('all_splits', checked);
-                render()
-            }
-        },
-        {
-            title: 'Очки',
-            value: Fields.isActive('scores'),
-            change: function (checked) {
-                Fields.active('scores', checked);
-                render()
-            }
-        },
-        {
-            title: 'Выполнение',
-            value: store.rankingShow,
-            change: function (checked) {
-                store.rankingShow = checked;
-                render()
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 0},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        },
-        {
-            title: 'Автоскролл',
-            value: Scrolling.enabled,
-            change: function (checked) {
-                Scrolling.enabled = checked;
-            }
-        },
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\321\202\320\265\321\200\320\274\320\276\320\277\321\200\320\270\320\275\321\202\320\265\321\200_80_\320\274\320\274.html" "b/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\321\202\320\265\321\200\320\274\320\276\320\277\321\200\320\270\320\275\321\202\320\265\321\200_80_\320\274\320\274.html"
deleted file mode 100644
index 663b9a46..00000000
--- "a/templates/reports/1_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\320\276\320\262_\321\202\320\265\321\200\320\274\320\276\320\277\321\200\320\270\320\275\321\202\320\265\321\200_80_\320\274\320\274.html"
+++ /dev/null
@@ -1,511 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<style>
-    table.table-split {
-        margin: 0;
-    }
-    table.table-split td{
-        border: 0;
-        padding: 0;
-    }
-</style>
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var isRogaine = race.settings.result_processing_mode === 'scores';
-    var isArdf =  race.settings.result_processing_mode === 'ardf';
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        for (var _i = 0, _a = race.results; _i < _a.length; _i++) {
-            var result = _a[_i];
-            if (result.status !== 13 && result.person && result.person.group && result.person.group.id === group.id && (count ? result.place <= count && result.place > 0 : 1)) {
-                var r = {
-                    index: 0,
-                    name: (result.person.surname + ' ' + result.person.name).slice(0, MAX_PERSON_NAME),
-                    org: (result.person.organization && String(result.person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[result.person.qual],
-                    bib: result.person.bib,
-                    year: result.person.birth_date ? (new Date(result.person.birth_date)).getFullYear() : '',
-                    penalty_time: toHHMMSS(result.penalty_time),
-                    penalty_laps: result.penalty_laps,
-                    scores_ardf: result.scores_ardf,
-                    rogaine_score: result.rogaine_score,
-                    rogaine_penalty: result.rogaine_penalty,
-                    rogaine_points_earned: result.rogaine_score + result.rogaine_penalty,
-                    result: result.result_current,
-                    result_msec: result.result_msec,
-                    diff: isRogaine || isArdf ? result.diff_scores : toHHMMSS(result.diff),
-                    place: result.place,
-                    status: result.status,
-                    scores: result.scores,
-                    place_show: result.person.is_out_of_competition ? 'в/к' : result.place === 0 ? '' : result.place === -1 ? '' : result.place,
-                    is_out_of_competition: result.person.is_out_of_competition,
-                    speed: result.speed,
-                    data: result
-                };
-                if (result.status !== 1) {
-                    r.diff = '';
-                    r.place_show = '';
-                    r.speed = '';
-                    r.scores = '';
-                    r.penalty_time = '';
-                    r.penalty_laps = '';
-                    r.rogaine_points_earned = '';
-                    r.rogaine_penalty = '';
-                    r.rogaine_score = '';
-                }
-
-                // SPLITS
-                var control_index = 0;
-                if (result.splits) {
-                    var getTrBlock = function (t, p) {
-                        var tr = document.createElement('tr');
-                        var td1 = document.createElement('td');
-                        td1.className = 'result-' + p;
-                        td1.appendChild(document.createTextNode(t));
-                        tr.appendChild(td1);
-                        return tr;
-                    };
-                    var lastSplit = 0;
-                    for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                        var split = _c[_b];
-                        if (split.is_correct) {
-
-                            var tbl = document.createElement('table');
-                            tbl.className = 'table-split';
-                            tbl.appendChild(getTrBlock(toHHMMSS(split.leg_time) + ' (' + split.leg_place + ')', split.leg_place));
-                            tbl.appendChild(getTrBlock(toHHMMSS(split.relative_time) + ' (' + split.relative_place + ')', split.relative_place));
-                            r[control_index + '_' + split.code] = tbl;
-                            control_index++;
-                            lastSplit = split.relative_time;
-                        }
-                    }
-
-                    var finishMsec = r.result_msec - lastSplit;
-
-                    if (r.status === 1 && finishMsec > 0) {
-                        var tblF = document.createElement('table');
-                        tblF.className = 'table-split';
-                        tblF.appendChild(getTrBlock(toHHMMSS(finishMsec), 0));
-                        var place_str = r.place > 0 ? r.place : 'в/к';
-                        tblF.appendChild(getTrBlock(toHHMMSS(r.result_msec) + ' (' + place_str + ')', r.place));
-                        r.finish_split = tblF;
-                    }
-                }
-
-                var getMultipleTrBlock = function () {
-                    var tr = document.createElement('tr');
-                    for (var i = 0; i < arguments.length; i++) {
-                        var td1 = document.createElement('td');
-                        td1.appendChild(document.createTextNode(arguments[i]));
-                        tr.appendChild(td1);
-                    }
-                    return tr;
-                };
-
-                // ALL PUNCHES
-                var splitTable = document.createElement('table');
-                splitTable.className = 'table-split';
-                var splitTr = document.createElement('tr');
-                splitTable.appendChild(splitTr);
-                var prevTime = result.start_msec;
-                for (var _b = 0, _c = result.splits; _b < _c.length; _b++) {
-                    var split = _c[_b];
-                    var tbl = document.createElement('table');
-                    tbl.className = 'table-split';
-                    tbl.appendChild(getMultipleTrBlock('( ' + split.code + ' )', toHHMMSS(split.time - prevTime)));
-                    tbl.appendChild(getMultipleTrBlock('', toHHMMSS(split.time - result.start_msec)));
-                    var splitTd = document.createElement('td');
-                    splitTd.appendChild(tbl);
-                    splitTr.appendChild(splitTd);
-                    prevTime = split.time;
-                }
-                r.all_splits = splitTable;
-
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay) {
-                if (a.place < 1) {
-                    return 1
-                }
-                if (b.place < 1) {
-                    return -1
-                }
-                if (a.place === b.place) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                }
-                return a.place - b.place
-
-            } else {
-                if (a.status !== 1 && b.status !== 1) {
-                    return STATUS_PRIORITY.indexOf(a.status) - STATUS_PRIORITY.indexOf(b.status);
-                }
-                if (a.status !== 1) {
-                    return 1
-                }
-                if (b.status !== 1) {
-                    return -1
-                }
-                if (a.is_out_of_competition || b.is_out_of_competition) {
-                    if (isRogaine && a.rogaine_score != b.rogaine_score) {
-                        return -(a.rogaine_score - b.rogaine_score);
-                    }
-                    if (isArdf && a.scores_ardf != b.scores_ardf) {
-                        return -(a.scores_ardf - b.scores_ardf);
-                    }
-                    return a.result_msec - b.result_msec;
-                }
-                if (a.place < 1) {
-                    return 1
-                }
-                if (b.place < 1) {
-                    return -1
-                }
-                return a.place - b.place
-            }
-        });
-        var index = 0;
-        if (isRelay) {
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        } else {
-            results.forEach(function (elem) {
-                index++;
-                elem.index = index;
-            })
-        }
-        return results;
-    }
-
-    function getRankingByGroup(group) {
-        var rankingBlock = document.createElement('span');
-        var ranking = group.ranking;
-        if (ranking && ranking.is_active && ranking.rank_scores > 0) {
-            var text = 'Квалификационный уровень (баллы): ' + ranking.rank_scores.toFixed(0);
-            rankingBlock.appendChild(document.createTextNode(text));
-
-            for (var _i = 0; _i < ranking.rank.length; _i++) {
-                var rank = ranking.rank[_i];
-                if (rank.is_active) {
-                    if (rank.max_place > 0) {
-                        var text = Qualification[rank.qual] + ' - до ' + rank.max_place + ' места';
-                        rankingBlock.appendChild(document.createElement("br"));
-                        rankingBlock.appendChild(document.createTextNode(text));
-                    }
-                    else {
-                        if (rank.max_time > 0) {
-                            var text = Qualification[rank.qual] + ' - ' + toHHMMSS(rank.max_time);
-                            if (rank.percent > 0) {
-                                text += ' (' + rank.percent + '%)';
-                            }
-                            rankingBlock.appendChild(document.createElement("br"));
-                            rankingBlock.appendChild(document.createTextNode(text));
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            var text = 'Ранг не подсчитывался';
-            rankingBlock.appendChild(document.createTextNode(text));
-        }
-
-        return rankingBlock;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 3},
-            {key: 'name', title: 'Фамилия, имя', size: 20},
-            {key: 'org', title: 'Коллектив', size: 20, active: false},
-            {key: 'year', title: 'ГР', size: 5, active: false},
-            {key: 'qual', title: 'Разряд', size: 7, active: false},
-            {key: 'bib', title: 'Номер', size: 6, active: false},
-            {key: 'penalty_time', title: 'Штраф', size: 9, active: false},
-            {key: 'penalty_laps', title: 'Штраф', size: 9, active: false},
-            {key: 'scores_ardf', title: 'КП', size: 3, active: isArdf},
-            {key: 'rogaine_points_earned', title: 'Очки', size: 4, active: false},
-            {key: 'rogaine_penalty', title: 'Штр.', size: 4, active: false},
-            {key: 'rogaine_score', title: 'Итог', size: 4, active: isRogaine},
-            {key: 'result', title: 'Результат', size: 10},
-            {key: 'diff', title: 'Отставание', size: 11, active: false},
-            {key: 'speed', title: 'Темп', size: 12, active: false},
-            {key: 'place_show', title: 'Место', size: 3},
-            {key: 'scores', title: 'Очки', size: 5, active: false},
-            {key: 'all_splits', title: 'Сплиты', active: false}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            try {
-                this.getField('all_splits').active = location.href.indexOf('all_splits=1') > -1;
-                this.getField('scores').active = location.href.indexOf('scores=1') > -1;
-                this.getField('penalty_time').active = location.href.indexOf('penalty_time=1') > -1;
-            } catch (e){}
-            return this;
-        }
-    }.init();
-
-    store = {
-        showLinkForGroups: true
-    };
-
-    try {
-        store.splitsShow = location.href.indexOf('s_splits=1') > -1;
-        store.rankingShow = location.href.indexOf('ranking=1') > -1;
-    } catch (e) {}
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            var groupTitle = group.name;
-            if (group.course && group.course.controls && group.course.controls.length){
-                groupTitle += ', ' + group.course.controls.length + ' КП';
-            }
-            if (group.course && group.course.length){
-                groupTitle += ', ' + group.course.length / 1000 + ' км';
-            }
-            titleBlock.appendChild(document.createTextNode(groupTitle));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (store.splitsShow && group.course) {
-                group.course.controls.forEach(function (control, index) {
-                    fields.push({key: index + '_' + control.code, title: control.code})
-                });
-                fields.push({key: 'finish_split', title: 'F'})
-            }
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-
-            //show ranking information
-            if (store.rankingShow) {
-                resultBlock.appendChild(getRankingByGroup(group))
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-        var query = {
-            s_splits: store.splitsShow ? 1 : 0,
-            ranking: store.rankingShow ? 1 : 0,
-            all_splits: Fields.isActive('all_splits') ? 1 : 0,
-            scores: Fields.isActive('scores') ? 1 : 0,
-            penalty_time: Fields.isActive('penalty_time') ? 1 : 0
-        };
-        var queryString = '?';
-        Object.keys(query).forEach(function (key) {
-            queryString += key + '=' + query[key] + '&';
-        });
-        queryString += 'sportorg=1';
-        try {
-            var href = location.href.split('?')[0];
-            history.pushState({}, null, href + queryString);
-        } catch (e) {}
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Штрафное время',
-            value: Fields.isActive('penalty_time'),
-            change: function (checked) {
-                Fields.active('penalty_time', checked);
-                render()
-            }
-        },
-        {
-            title: 'Кол-во штрафных кругов',
-            value: Fields.isActive('penalty_laps'),
-            change: function (checked) {
-                Fields.active('penalty_laps', checked);
-                render()
-            }
-        },
-        {
-            title: 'Отставание',
-            value: Fields.isActive('diff'),
-            change: function (checked) {
-                Fields.active('diff', checked);
-                render()
-            }
-        },
-        {
-            title: 'Темп',
-            value: Fields.isActive('speed'),
-            change: function (checked) {
-                Fields.active('speed', checked);
-                render()
-            }
-        },
-        {
-            title: 'Сплиты (заданное направление)',
-            value: !!store.splitsShow,
-            change: function (checked) {
-                store.splitsShow = checked;
-                render()
-            }
-        },
-        {
-            title: 'Сплиты (все отметки)',
-            value: Fields.isActive('all_splits'),
-            change: function (checked) {
-                Fields.active('all_splits', checked);
-                render()
-            }
-        },
-        {
-            title: 'Очки',
-            value: Fields.isActive('scores'),
-            change: function (checked) {
-                Fields.active('scores', checked);
-                render()
-            }
-        },
-        {
-            title: 'Выполнение',
-            value: store.rankingShow,
-            change: function (checked) {
-                store.rankingShow = checked;
-                render()
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 0},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/reports/ENG_2_start_list.html b/templates/reports/2_start_list.html
similarity index 94%
rename from templates/reports/ENG_2_start_list.html
rename to templates/reports/2_start_list.html
index 57390cdd..1b5deb5c 100644
--- a/templates/reports/ENG_2_start_list.html
+++ b/templates/reports/2_start_list.html
@@ -13,22 +13,6 @@ <h3>{{ race.data.description }} <br>
     <h2>START LIST</h2>
 </div>
 <div id="start-list-tables"></div>
-<!--
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Chief referee:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Secretary:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
--->
 {% raw %}
 <script>
     var race = {% endraw %}{{race|tojson}}{%raw %};
diff --git a/templates/reports/ENG_2_start_list_relay.html b/templates/reports/2_start_list_relay.html
similarity index 94%
rename from templates/reports/ENG_2_start_list_relay.html
rename to templates/reports/2_start_list_relay.html
index e72d4969..df002e02 100644
--- a/templates/reports/ENG_2_start_list_relay.html
+++ b/templates/reports/2_start_list_relay.html
@@ -13,22 +13,6 @@ <h3>{{ race.data.description }} <br>
     <h2>START LIST</h2>
 </div>
 <div id="start-list-tables"></div>
-<!--
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Chief referee:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Secretary:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
--->
 {% raw %}
 <script>
     var race = {% endraw %}{{race|tojson}}{%raw %};
diff --git a/templates/reports/ENG_2_start_team.html b/templates/reports/2_start_team.html
similarity index 100%
rename from templates/reports/ENG_2_start_team.html
rename to templates/reports/2_start_team.html
diff --git "a/templates/reports/2_\320\262\321\213\320\277\320\270\321\201\320\272\320\270_\320\277\320\276_\320\272\320\276\320\274\320\260\320\275\320\264\320\260\320\274.html" "b/templates/reports/2_\320\262\321\213\320\277\320\270\321\201\320\272\320\270_\320\277\320\276_\320\272\320\276\320\274\320\260\320\275\320\264\320\260\320\274.html"
deleted file mode 100644
index 5c1a3067..00000000
--- "a/templates/reports/2_\320\262\321\213\320\277\320\270\321\201\320\272\320\270_\320\277\320\276_\320\272\320\276\320\274\320\260\320\275\320\264\320\260\320\274.html"
+++ /dev/null
@@ -1,262 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Team list{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-
-{% block content %}
-<div id="org-list-tables"></div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{% raw %};
-    var rent_cards = {% endraw %}{{rent_cards|tojson}}{% raw %};
-    var selected = {% endraw %}{{selected|tojson}}{% raw %};
-    racePreparation(race);
-
-    function getStartListByOrg(org, sort) {
-        var results = [];
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (!org || person.organization && person.organization.id === org.id) {
-                if (!selected.persons.length || selected.persons.some(function (elem) {
-                            return elem.id === person.id;
-                        })) {
-                    person.is_rented_card = person.is_rented_card || rent_cards.indexOf(person.card_number) !== -1;
-                    results.push({
-                        name: person.surname + ' ' + person.name + (person.is_out_of_competition ? ' *' : ''),
-                        group: (person.group && person.group.name) || '',
-                        qual: Qualification[person.qual],
-                        bib: person.bib,
-                        card_number: person.card_number + (person.is_rented_card ? ' *' : ''),
-                        year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                        start: toHHMMSS(person.start_time),
-                        start_time: person.start_time,
-                        comment: person.comment,
-                        price: person.group && person.group.price,
-                        price_show: person.group && person.group.price + (person.is_paid ? ' *' : ''),
-                        person: person
-                    });
-                }
-            }
-        }
-        var sortFunc = function (a, b) {
-            var nameA = a.name && a.name.toLowerCase() || '';
-            var nameB = b.name && b.name.toLowerCase() || '';
-            if (nameA < nameB)
-                return -1;
-            if (nameA > nameB)
-                return 1;
-            return 0;
-        };
-        if (sort === 'bib') {
-            sortFunc = function (a, b) {
-                return a.bib - b.bib;
-            }
-        } else if (sort === 'group') {
-            sortFunc = function (a, b) {
-                var nameA = a.group.toLowerCase() || '';
-                var nameB = b.group.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        } else if (sort === 'time') {
-            sortFunc = function (a, b) {
-				if (a.start_time != b.start_time){
-					return a.start_time - b.start_time;
-				}
-				var nameA = a.name && a.name.toLowerCase() || '';
-				var nameB = b.name && b.name.toLowerCase() || '';
-				if (nameA < nameB)
-					return -1;
-				if (nameA > nameB)
-					return 1;
-				return 0;
-            };
-        }
-        results.sort(sortFunc);
-        var index = 0;
-        results.forEach(function (elem) {
-            index++;
-            elem.index = index
-        });
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 32},
-            {key: 'group', title: 'Группа', size: 10},
-            {key: 'year', title: 'ГР', size: 4},
-            {key: 'qual', title: 'Разряд', size: 6},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'card_number', title: 'Номер чипа', size: 11},
-            {key: 'start', title: 'Cтарт', size: 9},
-            {key: 'price_show', title: 'Взнос', size: 6},
-            {key: 'comment', title: 'Прим.', size: 30, active: false}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        init: function () {
-            return this;
-        }
-    }.init();
-
-    var store = {};
-
-    function render(sort, noCombine) {
-        if (sort) {
-            store.sort = sort;
-        }
-        if (typeof noCombine === 'boolean') {
-            store.noCombine = noCombine;
-        }
-
-        var getInfoBlock = function (rows) {
-            var price = 0;
-            var paid = 0;
-            var rentedSportidentCards = 0;
-            rows.forEach(function (row) {
-                price += +row.price;
-                if (row.person.is_rented_card) {
-                    rentedSportidentCards++;
-                }
-                if (row.person.is_paid) {
-                    paid += +row.price;
-                }
-            });
-            var infoBlock = document.createElement('div');
-            if (price && Fields.isActive('price_show')) {
-                infoBlock.appendChild(document.createTextNode('Стартовый взнос: ' + price + (paid ? ' - ' + paid + ' = ' + (price - paid) : '')));
-                infoBlock.appendChild(document.createElement('br'));
-            }
-            if (rentedSportidentCards) {
-                infoBlock.appendChild(document.createTextNode('Арендованных ЧИПов: ' + rentedSportidentCards));
-            }
-            return infoBlock;
-        };
-
-        var resultBlock = document.getElementById('org-list-tables');
-        resultBlock.innerHTML = '';
-        if (store.noCombine) {
-            var rows = getStartListByOrg(null, store.sort);
-            if (store.tableView) {
-                resultBlock.appendChild(new TableGenerator(rows, Fields.fields).getTable({className: 'sportorg-table'}));
-            } else {
-                resultBlock.appendChild(new TableTextGenerator(rows, Fields.fields).getTable());
-            }
-            resultBlock.appendChild(getInfoBlock(rows));
-        } else {
-            var i = 0;
-            for (var _i = 0, _a = race.organizations; _i < _a.length; _i++) {
-                var org = _a[_i];
-                var rows = getStartListByOrg(org, store.sort);
-                if (!rows.length) {
-                    continue;
-                }
-                var titleBlock = document.createElement('h2');
-                titleBlock.id = org.name;
-                titleBlock.appendChild(document.createTextNode(dateFormat(race.data.start_datetime) + ' / ' + org.name + ' / ' + org.contact)); 
-                resultBlock.appendChild(titleBlock);
-                if (store.tableView) {
-                    resultBlock.appendChild(new TableGenerator(rows, Fields.fields).getTable({className: 'sportorg-table'}));
-                } else {
-                    resultBlock.appendChild(new TableTextGenerator(rows, Fields.fields).getTable());
-                }
-                resultBlock.appendChild(getInfoBlock(rows));
-                if (i < race.organizations.length - 1) {
-                    var newPage = document.createElement('div');
-                    newPage.className = 'new-page';
-                    resultBlock.appendChild(newPage);
-                }
-                i++;
-            }
-        }
-    }
-    render();
-    new SettingsGenerator([
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Номер чипа',
-            value: Fields.isActive('card_number'),
-            change: function (checked) {
-                Fields.active('card_number', checked);
-                render()
-            }
-        },
-        {
-            title: 'Стартовый взнос',
-            value: Fields.isActive('price_show'),
-            change: function (checked) {
-                Fields.active('price_show', checked);
-                render()
-            }
-        },
-        {
-            title: 'Комментарий',
-            value: Fields.isActive('comment'),
-            change: function (checked) {
-                Fields.active('comment', checked);
-                render()
-            }
-        },
-        {
-            title: 'Объединить по коллективам',
-            value: true,
-            change: function (checked) {
-                render(null, !checked)
-            }
-        },
-        {
-            title: 'Сортировать участников по: ',
-            value: [
-                {text: 'имени', value: 'name'},
-                {text: 'номеру', value: 'bib'},
-                {text: 'группе', value: 'group'},
-				{text: 'времени', value: 'time'}
-            ],
-            change: function (arr) {
-                render(arr[0]);
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
-{% block footer %}{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/2_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260.html" "b/templates/reports/2_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260.html"
deleted file mode 100644
index d67d1023..00000000
--- "a/templates/reports/2_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260.html"
+++ /dev/null
@@ -1,225 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Start List{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>
-    {{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ СТАРТА</h2>
-</div>
-<div id="start-list-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    racePreparation(race);
-
-    function getStartListByGroup(group) {
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group && person.group.id === group.id) {
-                results.push({
-                    index: 0,
-                    name: person.surname + ' ' + person.name,
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    card_number: person.card_number,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    start: toHHMMSS(person.start_time),
-                    start_time: person.start_time
-                });
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay && a.start_time === b.start_time) {
-                if (a.bib % 1000 === b.bib % 1000) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                } else {
-                    return a.bib % 1000 - b.bib % 1000
-                }
-            }
-            if (a.start_time === b.start_time) {
-                return a.bib - b.bib;
-            }
-            return a.start_time - b.start_time
-        });
-        var index = 0;
-        results.forEach(function (elem) {
-            index++;
-            elem.index = index
-        });
-        if (isRelay) {
-            index = 0;
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        }
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'card_number', title: 'Номер чипа', size: 11},
-            {key: 'start', title: 'Время старта', size: 13}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        init: function () {
-            return this;
-        }
-    }.init();
-
-    var store = {};
-
-    function render() {
-        var resultBlock = document.getElementById('start-list-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            resultBlock.appendChild(getGroupsBlockElement(race));
-            if (store.tableView) {
-                resultBlock.appendChild(new TableGenerator(getStartListByGroup(group), Fields.fields).getTable({className: 'sportorg-table'}));
-            } else {
-                resultBlock.appendChild(new TableTextGenerator(getStartListByGroup(group), Fields.fields).getTable());
-            }
-        }
-    }
-    render();
-
-    var Scrolling = {
-        direction: 1,
-        enabled: false,
-        lock: false,
-        prev: 0,
-        intervalTimer: 0,
-        init: function () {
-            var _this = this;
-            if (_this.intervalTimer) {
-                clearInterval(_this.intervalTimer)
-            }
-            _this.intervalTimer = setInterval(function () {
-                _this.lock = !_this.lock;
-            }, 5000);
-            window.onscroll = function () {
-                var d = document.documentElement;
-                var offset = d.scrollTop + window.innerHeight;
-                var height = d.offsetHeight;
-
-                if (offset === height) {
-                    _this.direction = -1;
-                }
-                if (offset <= window.innerHeight) {
-                    _this.direction = 1;
-                }
-            };
-            this.pageScroll();
-            return this;
-        },
-        pageScroll: function () {
-            var _this = this;
-            if (_this.enabled && ! _this.lock) {
-                window.scrollBy(10, _this.direction);
-            }
-            setTimeout(function () {
-                _this.pageScroll();
-            }, 10);
-        }
-    }.init();
-
-    new SettingsGenerator([
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Номер чипа',
-            value: Fields.isActive('card_number'),
-            change: function (checked) {
-                Fields.active('card_number', checked);
-                render()
-            }
-        },
-        {
-            title: 'Автоскролл',
-            value: Scrolling.enabled,
-            change: function (checked) {
-                Scrolling.enabled = checked;
-            }
-        },
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/2_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260_\320\272\320\276\320\274\320\274\320\265\320\275\321\202\320\260\321\200\320\270\320\271.html" "b/templates/reports/2_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260_\320\272\320\276\320\274\320\274\320\265\320\275\321\202\320\260\321\200\320\270\320\271.html"
deleted file mode 100644
index 22f41676..00000000
--- "a/templates/reports/2_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260_\320\272\320\276\320\274\320\274\320\265\320\275\321\202\320\260\321\200\320\270\320\271.html"
+++ /dev/null
@@ -1,227 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Start List{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>
-    {{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ СТАРТА</h2>
-</div>
-<div id="start-list-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    racePreparation(race);
-
-    function getStartListByGroup(group) {
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group && person.group.id === group.id) {
-                results.push({
-                    index: 0,
-                    name: person.surname + ' ' + person.name,
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    card_number: person.card_number,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    start: toHHMMSS(person.start_time),
-                    start_time: person.start_time,
-					comment: person.comment,
-                });
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay && a.start_time === b.start_time) {
-                if (a.bib % 1000 === b.bib % 1000) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                } else {
-                    return a.bib % 1000 - b.bib % 1000
-                }
-            }
-            if (a.start_time === b.start_time) {
-                return a.bib - b.bib;
-            }
-            return a.start_time - b.start_time
-        });
-        var index = 0;
-        results.forEach(function (elem) {
-            index++;
-            elem.index = index
-        });
-        if (isRelay) {
-            index = 0;
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        }
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'card_number', title: 'Номер чипа', size: 11},
-            {key: 'start', title: 'Время старта', size: 13},
-			{key: 'comment', title: 'Комментарий', size: 10}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        init: function () {
-            return this;
-        }
-    }.init();
-
-    var store = {};
-
-    function render() {
-        var resultBlock = document.getElementById('start-list-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            resultBlock.appendChild(getGroupsBlockElement(race));
-            if (store.tableView) {
-                resultBlock.appendChild(new TableGenerator(getStartListByGroup(group), Fields.fields).getTable({className: 'sportorg-table'}));
-            } else {
-                resultBlock.appendChild(new TableTextGenerator(getStartListByGroup(group), Fields.fields).getTable());
-            }
-        }
-    }
-    render();
-
-    var Scrolling = {
-        direction: 1,
-        enabled: false,
-        lock: false,
-        prev: 0,
-        intervalTimer: 0,
-        init: function () {
-            var _this = this;
-            if (_this.intervalTimer) {
-                clearInterval(_this.intervalTimer)
-            }
-            _this.intervalTimer = setInterval(function () {
-                _this.lock = !_this.lock;
-            }, 5000);
-            window.onscroll = function () {
-                var d = document.documentElement;
-                var offset = d.scrollTop + window.innerHeight;
-                var height = d.offsetHeight;
-
-                if (offset === height) {
-                    _this.direction = -1;
-                }
-                if (offset <= window.innerHeight) {
-                    _this.direction = 1;
-                }
-            };
-            this.pageScroll();
-            return this;
-        },
-        pageScroll: function () {
-            var _this = this;
-            if (_this.enabled && ! _this.lock) {
-                window.scrollBy(10, _this.direction);
-            }
-            setTimeout(function () {
-                _this.pageScroll();
-            }, 10);
-        }
-    }.init();
-
-    new SettingsGenerator([
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Номер чипа',
-            value: Fields.isActive('card_number'),
-            change: function (checked) {
-                Fields.active('card_number', checked);
-                render()
-            }
-        },
-        {
-            title: 'Автоскролл',
-            value: Scrolling.enabled,
-            change: function (checked) {
-                Scrolling.enabled = checked;
-            }
-        },
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/2_\321\201\321\202\320\260\321\200\321\202\320\276\320\262\320\260\321\217_\321\210\320\260\321\205\320\274\320\260\321\202\320\272\320\260.html" "b/templates/reports/2_\321\201\321\202\320\260\321\200\321\202\320\276\320\262\320\260\321\217_\321\210\320\260\321\205\320\274\320\260\321\202\320\272\320\260.html"
deleted file mode 100644
index 8a77af9c..00000000
--- "a/templates/reports/2_\321\201\321\202\320\260\321\200\321\202\320\276\320\262\320\260\321\217_\321\210\320\260\321\205\320\274\320\260\321\202\320\272\320\260.html"
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Start Times{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block content %}
-<div id="start-times-tables"></div>
-{% raw %}
-<style>
-    @media print {
-        table.sportorg-table th {
-            text-align: left;
-        }
-
-        table.sportorg-table td {
-            padding-top: 15px;
-            border-bottom: 1px solid black;
-        }
-    }
-</style>
-<script>
-    var race = {% endraw %}{{race|tojson}}{% raw %};
-    racePreparation(race);
-
-    function getStartTimes() {
-        var times = {};
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (times[person.start_time]) {
-                var val = times[person.start_time][person.group && person.group.start_corridor || 0];
-                if (val) {
-                    val += ' ' + person.bib;
-                }
-                else {
-                    val = person.bib;
-                }
-                times[person.start_time][person.group && person.group.start_corridor || 0] = val;
-            }
-            else {
-                times[person.start_time] = {};
-                times[person.start_time][person.group && person.group.start_corridor || 0] = person.bib;
-            }
-        }
-        var results = [];
-        for (var start_time in times) {
-            times[start_time]['start_time'] = +start_time;
-            times[start_time]['start_time_str'] = toHHMMSS(+start_time);
-            results.push(times[start_time])
-        }
-        results.sort(function (a, b) {
-            return a.start_time - b.start_time;
-        });
-        return results;
-    }
-    var Fields = {
-        fields: [
-            {key: 'start_time_str', title: 'Время'}
-        ],
-        init: function () {
-            var start_corridors = {};
-            for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                start_corridors[group.start_corridor] = group.start_corridor;
-            }
-            for (var c in start_corridors) {
-                this.fields.push({key: c, title: start_corridors[c]})
-            }
-            return this;
-        }
-    }.init();
-    function render() {
-        var resultBlock = document.getElementById('start-times-tables');
-        resultBlock.innerHTML = '';
-        resultBlock.appendChild(new TableGenerator(getStartTimes(), Fields.fields).getTable({className: 'sportorg-table'}));
-    }
-    render();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/2_\321\201\321\202\320\260\321\200\321\202\320\276\320\262\321\213\320\265_\320\275\320\276\320\274\320\265\321\200\320\260.html" "b/templates/reports/2_\321\201\321\202\320\260\321\200\321\202\320\276\320\262\321\213\320\265_\320\275\320\276\320\274\320\265\321\200\320\260.html"
deleted file mode 100644
index 426a7b2d..00000000
--- "a/templates/reports/2_\321\201\321\202\320\260\321\200\321\202\320\276\320\262\321\213\320\265_\320\275\320\276\320\274\320\265\321\200\320\260.html"
+++ /dev/null
@@ -1,382 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Bib</title>
-    {% raw %}
-    <style>
-        table {
-            border-collapse: collapse;
-            border-spacing: 0;
-        }
-
-        p,
-        blockquote,
-        ul,
-        ol,
-        dl,
-        table,
-        pre {
-            margin-top: 0;
-            margin-bottom: 16px;
-        }
-
-        hr {
-            box-sizing: content-box;
-            height: 0;
-        }
-
-        hr {
-            height: 0;
-            margin: 15px 0;
-            overflow: hidden;
-            background: transparent;
-            border: 0;
-            border-bottom: 1px solid #ddd;
-        }
-
-        hr:before {
-            display: table;
-            content: "";
-        }
-
-        hr:after {
-            display: table;
-            clear: both;
-            content: "";
-        }
-
-        hr {
-            height: 4px;
-            padding: 0;
-            margin: 16px 0;
-            background-color: #e7e7e7;
-            border: 0 none;
-        }
-
-        a:not([href]) {
-            color: inherit;
-            text-decoration: none;
-        }
-
-        a {
-            color: #4078c0;
-            text-decoration: none;
-        }
-
-        a:hover,
-        a:active {
-            text-decoration: underline;
-        }
-
-        a {
-            background-color: transparent;
-        }
-
-        a:active,
-        a:hover {
-            outline: 0;
-        }
-
-        .print {
-            display: none;
-        }
-
-        .no-print {
-            display: block;
-        }
-
-        /*=== BIB ===*/
-        .bib-item {
-            width: 26.4cm;
-            float: left;
-            padding: 1cm;
-            border: 1px solid #e7e7e7;
-            background-image: url(bg.jpg);
-            background-repeat: no-repeat;
-            background-size: 100% 100%;
-        }
-        .bib-title {
-            text-align: center;
-            font-size: 1.2cm;
-            height: 4.2cm;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .bib-number {
-            text-align: center;
-            font-size: 9cm;
-            height: 9cm;
-            font-weight: bold;
-        }
-        .bib-info {
-            font-size: 0.8cm;
-        }
-        .bib-info .left-info, .bib-info .right-info {
-            width: 50%;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .bib-info .left-info {
-            float: left;
-        }
-        .bib-info .right-info {
-            float: right;
-        }
-        .info-item {
-            white-space: nowrap;
-        }
-        .rotatable {
-            -webkit-transform: rotate(-180deg); //Chrome, Safari
-        -moz-transform: rotate(-180deg); //Firefox
-        -o-transform: rotate(-180deg); //Opera
-        -ms-transform: rotate(-180deg); //IE
-        transform: rotate(-180deg);
-        }
-        /*=== BIB ===*/
-
-        @page {
-            size: A4 landscape;
-        }
-
-        @media print {
-            @page {
-                margin: 0.5cm;
-            }
-            body {
-                margin: 0;
-                zoom: 50%;
-            }
-            table {
-                display: table;
-                width: 100%;
-            }
-            table th,
-            table td {
-                padding: 1px 10px;
-            }
-            table,
-            pre {
-                margin-bottom: 1px;
-            }
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6 {
-                margin: 1px 0;
-            }
-            section {
-                page-break-before: always;
-            }
-            .new-page:nth-child(4n) {
-                page-break-after: always;
-            }
-            ul {
-                page-break-inside: avoid;
-            }
-            p {
-                widows: 4;
-            }
-            a[href^="http"]:after {
-                content: " (" attr(href) ")";
-            }
-            abbr[title]:after {
-                content: " (" attr(title) ")";
-            }
-            .print {
-                display: block;
-            }
-            .no-print {
-                display: none;
-            }
-        }
-    </style>
-    {% endraw %}
-    {% include 'script.js.html' %}
-</head>
-<body>
-<div class="bib-list" id="bib-list">
-</div>
-{% raw %}
-<script>
-    var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-    var races = {% endraw %}{{races|tojson}}{%raw %};
-    races.forEach(function (race) {
-        racePreparation(race);
-    });
-    var race = races[current_race];
-    var store = {
-        bibDetailedRotatableText: true,
-        isRelayView: false,
-        allDays: races.length > 1,
-    };
-    var data = {};
-    races.forEach(function (race, raceIndex) {
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.bib) {
-                if (!data[person.bib]) {
-                    data[person.bib] = {};
-                }
-                data[person.bib][raceIndex] = person;
-            }
-        }
-    });
-    var persons = [];
-    Object.keys(data).forEach(function (bib) {
-        var person;
-        Object.keys(data[bib]).forEach(function (raceIndex) {
-            var _person = data[bib][raceIndex];
-            if (!_person) {
-                return;
-            }
-            if (!person) {
-                person = _person;
-                person.startTimeByRaceIndex = {};
-            }
-            person.startTimeByRaceIndex[raceIndex] = _person.start_time;
-        });
-        persons.push(person);
-    });
-
-    function render (options) {
-        var sort = options && options.sort;
-        var sortFunc = function (a, b) {
-            return !options.isRelayView ? a.bib - b.bib: a.bib % 1000 - b.bib % 1000;
-        };
-        if (sort === 'name') {
-            sortFunc = function (a, b) {
-                var nameA = a.surname && a.surname.toLowerCase() || '';
-                var nameB = b.surname && b.surname.toLowerCase() || '';
-                if (nameA < nameB) //sort string ascending
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        } else if (sort === 'group') {
-            sortFunc = function (a, b) {
-                var nameA = a.group && a.group.name.toLowerCase() || '';
-                var nameB = b.group && b.group.name.toLowerCase() || '';
-                if (nameA < nameB) //sort string ascending
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        }else if (sort === 'organization') {
-            sortFunc = function (a, b) {
-                var nameA = a.organization && a.organization.name.toLowerCase() || '';
-                var nameB = b.organization && b.organization.name.toLowerCase() || '';
-                if (nameA < nameB) //sort string ascending
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        }
-        persons.sort(sortFunc);
-        var bibListBlock = document.getElementById('bib-list');
-        bibListBlock.innerHTML = '';
-        for (var _i = 0, _a = persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (!options.allDays && !toHHMMSS(person.startTimeByRaceIndex[current_race])) {
-                continue;
-            }
-            var bibItemBlock = document.createElement('div');
-            bibItemBlock.className = 'bib-item';
-            var bibTitleBlock = document.createElement('div');
-            bibTitleBlock.className = 'bib-title';
-            var bibNumberBlock = document.createElement('div');
-            bibNumberBlock.className = 'bib-number';
-            var bibInfoBlock = document.createElement('div');
-            bibInfoBlock.className = 'bib-info';
-            var bibDetailedBlock = document.createElement('div');
-            var detildData = [
-                { title: '', value: person.surname + ' ' + person.name },
-                { title: '', value: options.allDays
-                            ? races.map(function (_, raceIndex) {
-                                return toHHMMSS(person.startTimeByRaceIndex[raceIndex]) || '-';
-                            }).join(' / ')
-                            : toHHMMSS(person.startTimeByRaceIndex[current_race])},
-                { title: 'Номер чипа: ', value: person.card_number || '' },
-                { title: 'Группа: ', value: person.group && person.group.name },
-                { title: 'Коллектив: ', value: person.organization && person.organization.name || '' }
-            ];
-            for (var _b = 0, detildData_ = detildData; _b < detildData_.length; _b++) {
-                var obj = detildData_[_b];
-                var itemSpan = document.createElement('span');
-                itemSpan.className = 'info-item';
-                itemSpan.appendChild(document.createTextNode(obj.title));
-                var strong = document.createElement('strong');
-                strong.appendChild(document.createTextNode(obj.value));
-                itemSpan.appendChild(strong);
-                bibDetailedBlock.appendChild(itemSpan);
-                bibDetailedBlock.appendChild(document.createElement('br'));
-            }
-            var bibDetailedRotatableBlock = bibDetailedBlock.cloneNode(true);
-            bibDetailedBlock.className = 'left-info';
-            bibDetailedRotatableBlock.className = 'right-info rotatable';
-            bibTitleBlock.appendChild(document.createTextNode(race.data.title));
-            bibTitleBlock.appendChild(document.createElement('br'));
-            bibTitleBlock.appendChild(document.createTextNode(''));
-            bibNumberBlock.appendChild(document.createTextNode(!options.isRelayView ? person.bib : person.bib % 1000 + '.' + ~~(person.bib / 1000)));
-            bibInfoBlock.appendChild(bibDetailedBlock);
-            if (options && options.bibDetailedRotatableText) {
-                bibInfoBlock.appendChild(bibDetailedRotatableBlock);
-            }
-            bibItemBlock.appendChild(bibTitleBlock);
-            bibItemBlock.appendChild(bibNumberBlock);
-            bibItemBlock.appendChild(bibInfoBlock);
-            bibListBlock.appendChild(bibItemBlock);
-            var newPageBlock = document.createElement('div');
-            newPageBlock.className = 'new-page';
-            bibListBlock.appendChild(newPageBlock);
-        }
-    }
-    render(store);
-    new SettingsGenerator([
-        {
-            title: 'Сортировать по: ',
-            value: [
-                {text: 'номеру', value: 'bib'},
-                {text: 'имени', value: 'name'},
-                {text: 'группе', value: 'group'},
-                {text: 'коллективу', value: 'organization'}
-            ],
-            change: function (arr) {
-                store.sort = arr[0];
-                render(store);
-            }
-        },
-        {
-            title: 'Отображать перевернутые данные',
-            value: store.bibDetailedRotatableText,
-            change: function (checked) {
-                store.bibDetailedRotatableText = checked;
-                render(store);
-            }
-        },
-        {
-            title: '1002 -> 2.1',
-            value: store.isRelayView,
-            change: function (checked) {
-                store.isRelayView = checked;
-                render(store);
-            }
-        },
-        {
-            title: 'Все дни',
-            value: store.allDays,
-            change: function (checked) {
-                store.allDays = checked;
-                render(store);
-            }
-        }
-    ]).show()
-</script>
-{% endraw %}
-</body>
-</html>
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html"
deleted file mode 100644
index 8941b186..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html"
+++ /dev/null
@@ -1,247 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ (СУММА ВРЕМЕНИ)</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Times = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'time',
-            grouping: 'organizations',
-            sum: 'n_all',
-            nsum: 0
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'time', title: 'Время'},
-            {key: 'count', title: 'Участников'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getTimes: function (org) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var time = 0;
-            var count = 0;
-            var equal = function (organization) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id;
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name;
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.person && result.person.group && result.person.organization && equal(result.person.organization)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-            if (_this.store.sum === 'n_all') {
-                results.sort(function (a, b) {
-                    return a.result_msec - b.result_msec;
-                });
-                if (+_this.store.nsum) {
-                    results = results.slice(0, +_this.store.nsum);
-                }
-            } else if (_this.store.sum === 'n_group') {
-                var groups = {};
-                results.forEach(function (elem) {
-                    if (groups[elem.person.group.id]) {
-                        groups[elem.person.group.id].push(elem);
-                    } else {
-                        groups[elem.person.group.id] = [elem];
-                    }
-                });
-                results = [];
-                Object.keys(groups).forEach(function (value) {
-                    groups[value].sort(function (a, b) {
-                        return a.result_msec - b.result_msec;
-                    });
-                    if (+_this.store.nsum) {
-                        groups[value] = groups[value].slice(0, +_this.store.nsum);
-                    }
-                    results.push.apply(results, groups[value]);
-                });
-            }
-            results.forEach(function (elem) {
-                count++;
-                time += elem.result_msec;
-            });
-            return {time: time, count: count};
-        },
-        getTimesTable: function () {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getTimes(obj);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    time: toHHMMSS(s.time),
-                    count: s.count
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return !!elem.time;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                if (a.count === b.count) {
-                    if (a.time === b.time) {
-                        return sortByName(a, b);
-                    }
-                    if (a.time < b.time)
-                        return -1;
-                    if (a.time > b.time)
-                        return 1;
-                }
-                return b.count - a.count;
-
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            resultBlock.appendChild(new TableGenerator(this.getTimesTable(), this.fields).getTable({className: 'sportorg-table'}));
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '15', value: 15},
-                        {text: '20', value: 20},
-                        {text: '50', value: 50},
-                        {text: '100', value: 100},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'времени', value: 'time'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274.html"
deleted file mode 100644
index c50ae60f..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274.html"
+++ /dev/null
@@ -1,237 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'scores',
-            grouping: 'organizations',
-            sum: 'n_all',
-            nsum: 0
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'scores', title: 'Сумма'},
-            {key: 'count', title: 'Участников'},
-            {key: 'people', title: 'Участники'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org, group) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var scores = 0;
-            var count = 0;
-            var people = "";
-            var equal = function (organization, gr) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id && group.id === gr.id;
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name && group.id === gr.id;
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.status === 1 && result.person && !result.person.is_out_of_competition && result.person.group && result.person.organization && equal(result.person.organization, result.person.group)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-
-            results.sort(function (a, b) {
-                return a.scores - b.scores;
-            });
-            if (+_this.store.nsum) {
-                results = results.slice(0, +_this.store.nsum);
-            }
-
-            results.forEach(function (elem) {
-                count++;
-                scores += elem.result_msec;
-                for (var _i = 0, _a = this.race.persons; _i < _a.length; _i++) {
-                    var person = _a[_i];
-                    if (person.id === elem.person_id){
-                        people += person.surname + " " + person.name + " " + elem.result + "; "
-                        break;
-                    }
-                }
-            });
-
-            return {scores: scores, count: count, people: people};
-        },
-        getScoresTable: function (group) {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj, group);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    scores: toHHMMSS(s.scores),
-                    count: s.count,
-                    scores_int : s.scores,
-                    people: s.people
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return !!elem.scores_int;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                if (a.count === b.count){
-                    if (a.scores_int === b.scores_int) {
-                        return sortByName(a, b);
-                    }
-                    return a.scores_int - b.scores_int;
-                }
-                return b.count - a.count;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            for (var _i = 0, _a = this.race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                var groupTitle = document.createTextNode(group.name);
-                resultBlock.appendChild(groupTitle);
-                resultBlock.appendChild(new TableGenerator(this.getScoresTable(group), this.fields).getTable({className: 'sportorg-table'}));
-            }
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'очкам', value: 'scores'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202.html"
deleted file mode 100644
index fc46127b..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202.html"
+++ /dev/null
@@ -1,237 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'places',
-            grouping: 'organizations',
-            sum: 'n_all',
-            nsum: 0
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'places', title: 'Сумма мест'},
-            {key: 'count', title: 'Участников'},
-            {key: 'people', title: 'Участники'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org, group) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var places = 0;
-            var count = 0;
-            var people = "";
-            var equal = function (organization, gr) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id && group.id === gr.id;
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name && group.id === gr.id;
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.status === 1 && result.person && !result.person.is_out_of_competition && result.person.group && result.person.organization && equal(result.person.organization, result.person.group)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-
-            results.sort(function (a, b) {
-                return a.place - b.place;
-            });
-            if (+_this.store.nsum) {
-                results = results.slice(0, +_this.store.nsum);
-            }
-
-            results.forEach(function (elem) {
-                count++;
-                places += elem.place;
-                for (var _i = 0, _a = this.race.persons; _i < _a.length; _i++) {
-                    var person = _a[_i];
-                    if (person.id === elem.person_id){
-                        people += elem.place + ": " + person.surname + " " + person.name + " " + elem.result + "; "
-                        break;
-                    }
-                }
-            });
-
-            return {places: places, count: count, people: people};
-        },
-        getScoresTable: function (group) {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj, group);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    places: s.places,
-                    count: s.count,
-                    places_int : s.places,
-                    people: s.people
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return !!elem.places_int;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                if (a.count === b.count){
-                    if (a.places_int === b.places_int) {
-                        return sortByName(a, b);
-                    }
-                    return a.places_int - b.places_int;
-                }
-                return b.count - a.count;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            for (var _i = 0, _a = this.race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                var groupTitle = document.createTextNode(group.name);
-                resultBlock.appendChild(groupTitle);
-                resultBlock.appendChild(new TableGenerator(this.getScoresTable(group), this.fields).getTable({className: 'sportorg-table'}));
-            }
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'сумме мест', value: 'places'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202_\320\262\321\201\320\265_\320\263\321\200\321\203\320\277\320\277\321\213.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202_\320\262\321\201\320\265_\320\263\321\200\321\203\320\277\320\277\321\213.html"
deleted file mode 100644
index 985c2136..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202_\320\262\321\201\320\265_\320\263\321\200\321\203\320\277\320\277\321\213.html"
+++ /dev/null
@@ -1,232 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'places',
-            grouping: 'organizations',
-            sum: 'n_all',
-            nsum: 0
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'places', title: 'Сумма мест'},
-            {key: 'count', title: 'Участников'},
-            {key: 'people', title: 'Участники'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var places = 0;
-            var count = 0;
-            var people = "";
-            var equal = function (organization) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id;
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name;
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.status === 1 && result.person && !result.person.is_out_of_competition && result.person.group && result.person.organization && equal(result.person.organization, result.person.group)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-
-            results.sort(function (a, b) {
-                return a.place - b.place;
-            });
-            if (+_this.store.nsum) {
-                results = results.slice(0, +_this.store.nsum);
-            }
-
-            results.forEach(function (elem) {
-                count++;
-                places += elem.place;
-                for (var _i = 0, _a = this.race.persons; _i < _a.length; _i++) {
-                    var person = _a[_i];
-                    if (person.id === elem.person_id){
-                        people += elem.place + ": " + person.surname + " " + person.name + " " + elem.result + "; "
-                        break;
-                    }
-                }
-            });
-
-            return {places: places, count: count, people: people};
-        },
-        getScoresTable: function () {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    places: s.places,
-                    count: s.count,
-                    places_int : s.places,
-                    people: s.people
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return !!elem.places_int;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                if (a.count === b.count){
-                    if (a.places_int === b.places_int) {
-                        return sortByName(a, b);
-                    }
-                    return a.places_int - b.places_int;
-                }
-                return b.count - a.count;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            resultBlock.appendChild(new TableGenerator(this.getScoresTable(), this.fields).getTable({className: 'sportorg-table'}));
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'сумме мест', value: 'places'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262.html"
deleted file mode 100644
index 6895759a..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262.html"
+++ /dev/null
@@ -1,236 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'scores',
-            grouping: 'organizations',
-            sum: 'n_all',
-            nsum: 0
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'scores', title: 'Сумма очков'},
-            {key: 'count', title: 'Участников'},
-            {key: 'people', title: 'Участники'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org, group) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var scores = 0;
-            var count = 0;
-            var people = "";
-            var equal = function (organization, gr) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id && group.id === gr.id;
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name && group.id === gr.id;
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.status === 1 && result.person && !result.person.is_out_of_competition && result.person.group && result.person.organization && equal(result.person.organization, result.person.group)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-
-            results.sort(function (a, b) {
-                return b.scores - a.scores;
-            });
-            if (+_this.store.nsum) {
-                results = results.slice(0, +_this.store.nsum);
-            }
-
-            results.forEach(function (elem) {
-                count++;
-                scores += elem.scores;
-                for (var _i = 0, _a = this.race.persons; _i < _a.length; _i++) {
-                    var person = _a[_i];
-                    if (person.id === elem.person_id){
-                        people += elem.scores.toFixed(1) + ": " + person.surname + " " + person.name + "; "
-                        break;
-                    }
-                }
-            });
-
-            return {scores: scores.toFixed(1), count: count, people: people};
-        },
-        getScoresTable: function (group) {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj, group);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    scores: s.scores,
-                    count: s.count,
-                    people: s.people
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return elem.scores != (0).toFixed(1);
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                if (a.count === b.count){
-                    if (a.scores === b.scores) {
-                        return sortByName(a, b);
-                    }
-                    return b.scores - a.scores;
-                }
-                return b.count - a.count;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            for (var _i = 0, _a = this.race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                var groupTitle = document.createTextNode(group.name);
-                resultBlock.appendChild(groupTitle);
-                resultBlock.appendChild(new TableGenerator(this.getScoresTable(group), this.fields).getTable({className: 'sportorg-table'}));
-            }
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'сумме очков', value: 'scores'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\320\262\321\201\320\265_\320\263\321\200\321\203\320\277\320\277\321\213.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\320\262\321\201\320\265_\320\263\321\200\321\203\320\277\320\277\321\213.html"
deleted file mode 100644
index 63cbb2c4..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\320\262\321\201\320\265_\320\263\321\200\321\203\320\277\320\277\321\213.html"
+++ /dev/null
@@ -1,236 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'scores',
-            grouping: 'organizations',
-            sum: 'n_all',
-            nsum: 0
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'scores', title: 'Очки'},
-            {key: 'count', title: 'Участников'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var scores = 0;
-            var count = 0;
-            var equal = function (organization) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id;
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name;
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.person && result.person.group && result.person.organization && equal(result.person.organization)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-            if (_this.store.sum === 'n_all') {
-                results.sort(function (a, b) {
-                    return b.scores - a.scores;
-                });
-                if (+_this.store.nsum) {
-                    results = results.slice(0, +_this.store.nsum);
-                }
-            } else if (_this.store.sum === 'n_group') {
-                var groups = {};
-                results.forEach(function (elem) {
-                    if (groups[elem.person.group.id]) {
-                        groups[elem.person.group.id].push(elem);
-                    } else {
-                        groups[elem.person.group.id] = [elem];
-                    }
-                });
-                results = [];
-                Object.keys(groups).forEach(function (value) {
-                    groups[value].sort(function (a, b) {
-                        return b.scores - a.scores;
-                    });
-                    if (+_this.store.nsum) {
-                        groups[value] = groups[value].slice(0, +_this.store.nsum);
-                    }
-                    results.push.apply(results, groups[value]);
-                });
-            }
-            results.forEach(function (elem) {
-                count++;
-                scores += elem.scores;
-            });
-            return {scores: scores, count: count};
-        },
-        getScoresTable: function () {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    scores: s.scores,
-                    count: s.count
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return !!elem.scores;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                if (a.scores === b.scores) {
-                    return sortByName(a, b);
-                }
-                return b.scores - a.scores;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-            resultBlock.appendChild(new TableGenerator(this.getScoresTable(), this.fields).getTable({className: 'sportorg-table'}));
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'очкам', value: 'scores'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274.html"
deleted file mode 100644
index 3f26a0bc..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274.html"
+++ /dev/null
@@ -1,237 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'scores',
-            grouping: 'organizations',
-            sum: 'n_all', //n_all (все группы) или n_group (по группам)
-            nsum: 4 // количество лучших участников по умолчанию
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'scores', title: 'Сумма'},
-            {key: 'count', title: 'Участников'},
-            {key: 'people', title: 'Участники'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org, group) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var scores = 0;
-            var count = 0;
-            var people = "";
-            var equal = function (organization, gr) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id && (!group || group.id === gr.id);
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name && (!group || group.id === gr.id);
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.status === 1 && result.person && !result.person.is_out_of_competition && result.person.group && result.person.organization && equal(result.person.organization, result.person.group)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-
-            results.sort(function (a, b) {
-                return b.scores - a.scores;
-            });
-            if (+_this.store.nsum) {
-                results = results.slice(0, +_this.store.nsum);
-            }
-
-            results.forEach(function (elem) {
-                count++;
-                scores += elem.scores;
-                for (var _i = 0, _a = this.race.persons; _i < _a.length; _i++) {
-                    var person = _a[_i];
-                    if (person.id === elem.person_id){
-                        people += person.surname + " " + person.name + " " + elem.scores.toFixed(1) + "; "
-                        break;
-                    }
-                }
-            });
-
-            return {scores: scores.toFixed(1), count: count, people: people};
-        },
-        getScoresTable: function (group) {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj, group);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    scores: s.scores,
-                    count: s.count,
-                    scores_int : s.scores,
-                    people: s.people
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return elem.scores_int > 0;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                return b.scores_int - a.scores_int;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-
-            if (this.store.sum == 'n_all'){
-                resultBlock.appendChild(new TableGenerator(this.getScoresTable(null), this.fields).getTable({className: 'sportorg-table'}));
-            }
-            else{
-                for (var _i = 0, _a = this.race.groups; _i < _a.length; _i++) {
-                    var group = _a[_i];
-                    var groupTitle = document.createTextNode(group.name);
-                    resultBlock.appendChild(groupTitle);
-                    resultBlock.appendChild(new TableGenerator(this.getScoresTable(group), this.fields).getTable({className: 'sportorg-table'}));
-                }
-            }
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'очкам', value: 'scores'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274_\320\261\320\265\320\267_\320\244\320\230\320\236.html" "b/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274_\320\261\320\265\320\267_\320\244\320\230\320\236.html"
deleted file mode 100644
index 2371bb51..00000000
--- "a/templates/reports/3_\320\272\320\276\320\274\320\260\320\275\320\264\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262_\321\201\320\276_\321\201\320\277\320\270\321\201\320\272\320\276\320\274_\320\261\320\265\320\267_\320\244\320\230\320\236.html"
+++ /dev/null
@@ -1,237 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ РЕЗУЛЬТАТОВ</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    var selected = {% endraw %}{{selected|tojson}}{%raw %};
-    racePreparation(race);
-
-    var Scores = {
-        race: race,
-        selected: selected,
-        store: {
-            hideNull: true,
-            sort: 'scores',
-            grouping: 'organizations',
-            sum: 'n_group', //n_all (все группы) или n_group (по группам)
-            nsum: 4 // количество лучших участников по умолчанию
-        },
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'name', title: 'Коллектив'},
-            {key: 'scores', title: 'Сумма'},
-            {key: 'count', title: 'Участников'},
-            {key: 'people', title: 'Участники'}
-        ],
-        init: function () {
-            this.showSettings();
-            this.render();
-            return this;
-        },
-        getScores: function (org, group) {
-            // org is organization or region, interface {id: string, name: string}
-            var _this = this;
-            var scores = 0;
-            var count = 0;
-            var people = "";
-            var equal = function (organization, gr) {
-                if (_this.store.grouping === 'organizations') {
-                    return organization.id === org.id && (!group || group.id === gr.id);
-                } else if (_this.store.grouping === 'regions') {
-                    return organization.address.state === org.name && (!group || group.id === gr.id);
-                }
-            };
-            var results = this.race.results.filter(function (result) {
-                if (result.status === 1 && result.person && !result.person.is_out_of_competition && result.person.group && result.person.organization && equal(result.person.organization, result.person.group)) {
-                    return !_this.selected.groups || !_this.selected.groups.length || _this.selected.groups.some(function (elem) {
-                        return elem.id === result.person.group.id;
-                    })
-                }
-                return false;
-            });
-
-            results.sort(function (a, b) {
-                return b.scores - a.scores;
-            });
-            if (+_this.store.nsum) {
-                results = results.slice(0, +_this.store.nsum);
-            }
-
-            results.forEach(function (elem) {
-                count++;
-                scores += elem.scores;
-                for (var _i = 0, _a = this.race.persons; _i < _a.length; _i++) {
-                    var person = _a[_i];
-                    if (person.id === elem.person_id){
-                        people += elem.scores.toFixed(0) + "; "
-                        break;
-                    }
-                }
-            });
-
-            return {scores: scores.toFixed(1), count: count, people: people};
-        },
-        getScoresTable: function (group) {
-            var ret = [];
-            var data = [];
-            if (this.store.grouping === 'organizations') {
-                data = this.race.organizations;
-            } else if (this.store.grouping === 'regions') {
-                var regions = {};
-                this.race.organizations.forEach(function (elem) {
-                    regions[elem.address.state] = true;
-                });
-                Object.keys(regions).forEach(function (value) {
-                    data.push({
-                        id: guid(),
-                        name: value
-                    });
-                });
-            }
-            for (var _i = 0, _a = data; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                var s = this.getScores(obj, group);
-                ret.push({
-                    index: 0,
-                    name: obj.name,
-                    scores: s.scores,
-                    count: s.count,
-                    scores_int : s.scores,
-                    people: s.people
-                })
-            }
-            if (this.store.hideNull) {
-                ret = ret.filter(function (elem) {
-                    return elem.scores_int > 0;
-                });
-            }
-            var sortByName = function (a, b) {
-                var nameA = a.name && a.name.toLowerCase() || '';
-                var nameB = b.name && b.name.toLowerCase() || '';
-                if (nameA < nameB)
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-            var sortFunc = function (a, b) {
-                return b.scores_int - a.scores_int;
-            };
-            if (this.store.sort === 'name') {
-                sortFunc = sortByName;
-            }
-            ret.sort(sortFunc);
-            var index = 0;
-            ret.forEach(function (elem) {
-                elem.index = ++index;
-            });
-            return ret;
-        },
-        render: function () {
-            var resultBlock = document.getElementById('results-tables');
-            resultBlock.innerHTML = '';
-
-            if (this.store.sum == 'n_all'){
-                resultBlock.appendChild(new TableGenerator(this.getScoresTable(null), this.fields).getTable({className: 'sportorg-table'}));
-            }
-            else{
-                for (var _i = 0, _a = this.race.groups; _i < _a.length; _i++) {
-                    var group = _a[_i];
-                    var groupTitle = document.createTextNode(group.name);
-                    resultBlock.appendChild(groupTitle);
-                    resultBlock.appendChild(new TableGenerator(this.getScoresTable(group), this.fields).getTable({className: 'sportorg-table'}));
-                }
-            }
-        },
-        showSettings: function () {
-            var _this = this;
-            new SettingsGenerator([
-                {
-                    title: 'Объеденить по: ',
-                    value: [
-                        {text: 'коллективам', value: 'organizations'},
-                        {text: 'регионам', value: 'regions'}
-                    ],
-                    change: function (arr) {
-                        _this.store.grouping = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сумма: ',
-                    value: [
-                        {text: 'лучшие n среди всех групп', value: 'n_all'},
-                        {text: 'лучшие n в группе', value: 'n_group'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'n: ',
-                    value: [
-                        {text: 'все участники', value: 0},
-                        {text: '1', value: 1},
-                        {text: '2', value: 2},
-                        {text: '3', value: 3},
-                        {text: '4', value: 4},
-                        {text: '5', value: 5},
-                        {text: '6', value: 6},
-                        {text: '7', value: 7},
-                        {text: '8', value: 8},
-                        {text: '9', value: 9},
-                        {text: '10', value: 10},
-                        {text: '101', value: 101}
-                    ],
-                    change: function (arr) {
-                        _this.store.nsum = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Сортировать по: ',
-                    value: [
-                        {text: 'очкам', value: 'scores'},
-                        {text: 'названию', value: 'name'}
-                    ],
-                    change: function (arr) {
-                        _this.store.sort = arr[0];
-                        _this.render();
-                    }
-                },
-                {
-                    title: 'Скрыть нулевые очки',
-                    value: this.store.hideNull,
-                    change: function (checked) {
-                        _this.store.hideNull = checked;
-                        _this.render()
-                    }
-                }
-            ]).show();
-        }
-    }.init()
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html" "b/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html"
deleted file mode 100644
index 1204ac45..00000000
--- "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html"
+++ /dev/null
@@ -1,322 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>СУММА</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var SUM_STAGES=6; //Quantity of stages to sum - user defined value - Количество этапов для суммы
-
-    var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-    var races = {% endraw %}{{races|tojson}}{%raw %};
-    var race = races[current_race];
-    var persons = {};
-    for (var _i = 0, races_ = races; _i < races_.length; _i++) {
-        var r = races_[_i];
-        racePreparation(r);
-        for (var _a = 0, _b = r.results; _a < _b.length; _a++) {
-            var res = _b[_a];
-            if (res.person && res.person.group && res.person.surname) {
-                index = res.person.group.name + '_' + res.person.surname + '_' + res.person.name;
-                if (!persons[index]) {
-                    persons[index] = res.person;
-                    persons[index].results = {};
-                    persons[index].ok_count = 0;
-                }
-                persons[index].results[r.id] = res;
-                if (!persons[index].is_out_of_competition) {
-                    persons[index].is_out_of_competition = res.person.is_out_of_competition;
-                }
-            }
-        }
-    }
-    var personList = [];
-    for (var p_index in persons) {
-        var sum = 0;
-        var sum_time_ms = 0
-        var r_count = 0;
-        var ok_count = 0;
-        var dsq = false;
-        var score_list = [];
-        for (var race_id in persons[p_index].results) {
-            cur_res = persons[p_index].results[race_id];
-            if (cur_res.status === 1) {
-                score_list.push(cur_res.scores);
-
-                ok_count++;
-                sum_time_ms += cur_res.result_msec;
-            } else {
-                score_list.push(0);
-            }
-            r_count++;
-        }
-        score_list.sort(function (a, b) {
-            return b - a;
-        });
-
-        for (var _i = 0, score_ = score_list; _i < score_.length && _i < SUM_STAGES; _i++) {
-            var s = score_[_i];
-            sum += s
-        }
-
-        //persons[p_index].sumMsec = sum;
-        persons[p_index].sumMsec = sum_time_ms;
-        persons[p_index].ok_count = ok_count;
-        personList.push(persons[p_index]);
-    }
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var results = [];
-        if (group.__type ? group.__type === 3 : race.data.race_type === 3) {
-            console.log(group.name, 'Сумма только для индивидуальных гонок!');
-            return results;
-        }
-        for (var _i = 0, _a = personList; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group.name === group.name) {
-                var r = {
-                    index: 0,
-                    name: (person.surname + ' ' + person.name).slice(0, MAX_PERSON_NAME),
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    resultMsec: person.sumMsec,
-                    result: toHHMMSS(person.sumMsec) + ' (' + person.ok_count + ')',
-                    ok_count: person.ok_count,
-                    place: '',
-                    person: person
-                };
-                for (var _b = 0, races_1 = races; _b < races_1.length; _b++) {
-                    var race_ = races_1[_b];
-                    if (person.results[race_.id]) {
-                        r[race_.id] = person.results[race_.id].result;
-                    }
-                }
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (!a.resultMsec) {
-                return 1;
-            }
-            if (!b.resultMsec) {
-                return -1;
-            }
-            if (a.person.dsq) {
-                return 1;
-            }
-            if (b.person.dsq) {
-                return -1;
-            }
-            if (a.person.ok_count != b.person.ok_count) {
-                return b.person.ok_count - a.person.ok_count;
-            }
-            return a.resultMsec - b.resultMsec;
-        });
-        var prevRes = results[0];
-        var place = 0;
-        var doubleplace = 0;
-        for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
-            var result = results_1[_i];
-            result.index = _i + 1;
-            if (!result.person.dsq && !result.person.is_out_of_competition) {
-               if (result.resultMsec === prevRes.resultMsec && _i != 0) {
-                    doubleplace++;
-                } else {
-                    place = place + 1 + doubleplace;
-                    doubleplace = 0;
-                }
-                result.place = place;
-                if (doubleplace != 0){
-                    result.place = place + ' =';
-                }
-            } else if (!result.person.dsq && result.person.is_out_of_competition) {
-                result.place = 'в/к';
-            }
-            prevRes = result;
-        }
-
-        if (count) {
-            var ret = results.slice();
-            results = [];
-            ret.forEach(function (value) {
-                if (value.index < count + 1) {
-                    results.push(value);
-                }
-            });
-        }
-        
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'result', title: 'Сумма', size: 15},
-            {key: 'place', title: 'Место', size: 6}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            var day = 1;
-            for (var _i = 0, races_1 = races; _i < races_1.length; _i++) {
-                var race_ = races_1[_i];
-                this.fields.push({
-                    key: race_.id,
-                    title: day,
-                    size: 18
-                });
-                day++;
-            }
-            return this;
-        }
-    }.init();
-
-    store = {
-        showLinkForGroups: true
-    };
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 0},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10},
-                {text: '12', value: 12},
-                {text: '15', value: 15},
-                {text: '20', value: 20}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
diff --git "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_\321\200\320\265\320\263\320\270\320\276\320\275.html" "b/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_\321\200\320\265\320\263\320\270\320\276\320\275.html"
deleted file mode 100644
index 1c19c130..00000000
--- "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_\321\200\320\265\320\263\320\270\320\276\320\275.html"
+++ /dev/null
@@ -1,322 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>СУММА</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var SUM_STAGES=6; //Quantity of stages to sum - user defined value - Количество этапов для суммы
-
-    var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-    var races = {% endraw %}{{races|tojson}}{%raw %};
-    var race = races[current_race];
-    var persons = {};
-    for (var _i = 0, races_ = races; _i < races_.length; _i++) {
-        var r = races_[_i];
-        racePreparation(r);
-        for (var _a = 0, _b = r.results; _a < _b.length; _a++) {
-            var res = _b[_a];
-            if (res.person && res.person.group && res.person.surname) {
-                index = res.person.group.name + '_' + res.person.surname + '_' + res.person.name;
-                if (!persons[index]) {
-                    persons[index] = res.person;
-                    persons[index].results = {};
-                    persons[index].ok_count = 0;
-                }
-                persons[index].results[r.id] = res;
-                if (!persons[index].is_out_of_competition) {
-                    persons[index].is_out_of_competition = res.person.is_out_of_competition;
-                }
-            }
-        }
-    }
-    var personList = [];
-    for (var p_index in persons) {
-        var sum = 0;
-        var sum_time_ms = 0
-        var r_count = 0;
-        var ok_count = 0;
-        var dsq = false;
-        var score_list = [];
-        for (var race_id in persons[p_index].results) {
-            cur_res = persons[p_index].results[race_id];
-            if (cur_res.status === 1) {
-                score_list.push(cur_res.scores);
-
-                ok_count++;
-                sum_time_ms += cur_res.result_msec;
-            } else {
-                score_list.push(0);
-            }
-            r_count++;
-        }
-        score_list.sort(function (a, b) {
-            return b - a;
-        });
-
-        for (var _i = 0, score_ = score_list; _i < score_.length && _i < SUM_STAGES; _i++) {
-            var s = score_[_i];
-            sum += s
-        }
-
-        //persons[p_index].sumMsec = sum;
-        persons[p_index].sumMsec = sum_time_ms;
-        persons[p_index].ok_count = ok_count;
-        personList.push(persons[p_index]);
-    }
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var results = [];
-        if (group.__type ? group.__type === 3 : race.data.race_type === 3) {
-            console.log(group.name, 'Сумма только для индивидуальных гонок!');
-            return results;
-        }
-        for (var _i = 0, _a = personList; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group.name === group.name) {
-                var r = {
-                    index: 0,
-                    name: (person.surname + ' ' + person.name).slice(0, MAX_PERSON_NAME),
-                    org: (person.organization && String(person.organization.region).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    resultMsec: person.sumMsec,
-                    result: toHHMMSS(person.sumMsec) + ' (' + person.ok_count + ')',
-                    ok_count: person.ok_count,
-                    place: '',
-                    person: person
-                };
-                for (var _b = 0, races_1 = races; _b < races_1.length; _b++) {
-                    var race_ = races_1[_b];
-                    if (person.results[race_.id]) {
-                        r[race_.id] = person.results[race_.id].result;
-                    }
-                }
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (!a.resultMsec) {
-                return 1;
-            }
-            if (!b.resultMsec) {
-                return -1;
-            }
-            if (a.person.dsq) {
-                return 1;
-            }
-            if (b.person.dsq) {
-                return -1;
-            }
-            if (a.person.ok_count != b.person.ok_count) {
-                return b.person.ok_count - a.person.ok_count;
-            }
-            return a.resultMsec - b.resultMsec;
-        });
-        var prevRes = results[0];
-        var place = 0;
-        var doubleplace = 0;
-        for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
-            var result = results_1[_i];
-            result.index = _i + 1;
-            if (!result.person.dsq && !result.person.is_out_of_competition) {
-               if (result.resultMsec === prevRes.resultMsec && _i != 0) {
-                    doubleplace++;
-                } else {
-                    place = place + 1 + doubleplace;
-                    doubleplace = 0;
-                }
-                result.place = place;
-                if (doubleplace != 0){
-                    result.place = place + ' =';
-                }
-            } else if (!result.person.dsq && result.person.is_out_of_competition) {
-                result.place = 'в/к';
-            }
-            prevRes = result;
-        }
-
-        if (count) {
-            var ret = results.slice();
-            results = [];
-            ret.forEach(function (value) {
-                if (value.index < count + 1) {
-                    results.push(value);
-                }
-            });
-        }
-        
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'result', title: 'Сумма', size: 15},
-            {key: 'place', title: 'Место', size: 6}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            var day = 1;
-            for (var _i = 0, races_1 = races; _i < races_1.length; _i++) {
-                var race_ = races_1[_i];
-                this.fields.push({
-                    key: race_.id,
-                    title: day,
-                    size: 18
-                });
-                day++;
-            }
-            return this;
-        }
-    }.init();
-
-    store = {
-        showLinkForGroups: true
-    };
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 0},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10},
-                {text: '12', value: 12},
-                {text: '15', value: 15},
-                {text: '20', value: 20}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
diff --git "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\272\320\277_\320\270_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_(ardf).html" "b/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\272\320\277_\320\270_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_(ardf).html"
deleted file mode 100644
index 2840a110..00000000
--- "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\272\320\277_\320\270_\320\262\321\200\320\265\320\274\320\265\320\275\320\270_(ardf).html"
+++ /dev/null
@@ -1,335 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>СУММА</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var SUM_STAGES=6; //Quantity of stages to sum - user defined value - Количество этапов для суммы
-
-    var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-    var races = {% endraw %}{{races|tojson}}{%raw %};
-    var race = races[current_race];
-    var persons = {};
-    for (var _i = 0, races_ = races; _i < races_.length; _i++) {
-        var r = races_[_i];
-        racePreparation(r);
-        for (var _a = 0, _b = r.results; _a < _b.length; _a++) {
-            var res = _b[_a];
-            if (res.person && res.person.group && res.person.surname) {
-                index = res.person.group.name + '_' + res.person.surname + '_' + res.person.name;
-                if (!persons[index]) {
-                    persons[index] = res.person;
-                    persons[index].results = {};
-                    persons[index].ok_count = 0;
-                }
-                persons[index].results[r.id] = res;
-                if (!persons[index].is_out_of_competition) {
-                    persons[index].is_out_of_competition = res.person.is_out_of_competition;
-                }
-            }
-        }
-    }
-    var personList = [];
-    for (var p_index in persons) {
-        var sum = 0;
-        var sum_time_ms = 0
-        var sum_scores = 0
-        var r_count = 0;
-        var ok_count = 0;
-        var dsq = false;
-        var score_list = [];
-        for (var race_id in persons[p_index].results) {
-            cur_res = persons[p_index].results[race_id];
-            if (cur_res.status === 1) {
-                score_list.push(cur_res.scores);
-
-                ok_count++;
-                sum_time_ms += cur_res.result_msec;
-                sum_scores += cur_res.scores_ardf;
-            } else {
-                score_list.push(0);
-            }
-            r_count++;
-        }
-        score_list.sort(function (a, b) {
-            return b - a;
-        });
-
-        for (var _i = 0, score_ = score_list; _i < score_.length && _i < SUM_STAGES; _i++) {
-            var s = score_[_i];
-            sum += s
-        }
-
-        //persons[p_index].sumMsec = sum;
-        persons[p_index].sumScores = sum_scores;
-        persons[p_index].sumMsec = sum_time_ms;
-        persons[p_index].ok_count = ok_count;
-        personList.push(persons[p_index]);
-    }
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var results = [];
-        if (group.__type ? group.__type === 3 : race.data.race_type === 3) {
-            console.log(group.name, 'Сумма только для индивидуальных гонок!');
-            return results;
-        }
-        for (var _i = 0, _a = personList; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group.name === group.name) {
-                var r = {
-                    index: 0,
-                    name: (person.surname + ' ' + person.name).slice(0, MAX_PERSON_NAME),
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    resultMsec: person.sumMsec,
-                    resultScores: person.sumScores,
-                    result: person.sumScores + ' очк. ' + toHHMMSS(person.sumMsec) + ' (' + person.ok_count + ')',
-                    ok_count: person.ok_count,
-                    place: '',
-                    person: person
-                };
-                for (var _b = 0, races_1 = races; _b < races_1.length; _b++) {
-                    var race_ = races_1[_b];
-                    if (person.results[race_.id]) {
-                        r[race_.id] = person.results[race_.id].result;
-                    }
-                }
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (!a.resultScores) {
-                return 1;
-            }
-            if (!b.resultScores) {
-                return -1;
-            }
-            if (!a.resultMsec) {
-                return 1;
-            }
-            if (!b.resultMsec) {
-                return -1;
-            }
-            if (a.person.dsq) {
-                return 1;
-            }
-            if (b.person.dsq) {
-                return -1;
-            }
-            if (a.person.ok_count != b.person.ok_count) {
-                return b.person.ok_count - a.person.ok_count;
-            }
-            if (a.resultScores != b.resultScores) {
-                return b.resultScores - a.resultScores;
-            }
-            return a.resultMsec - b.resultMsec;
-        });
-        var prevRes = results[0];
-        var place = 0;
-        var doubleplace = 0;
-        for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
-            var result = results_1[_i];
-            result.index = _i + 1;
-            if (!result.person.dsq && !result.person.is_out_of_competition) {
-               if (result.resultMsec === prevRes.resultMsec && _i != 0) {
-                    doubleplace++;
-                } else {
-                    place = place + 1 + doubleplace;
-                    doubleplace = 0;
-                }
-                result.place = place;
-                if (doubleplace != 0){
-                    result.place = place + ' =';
-                }
-            } else if (!result.person.dsq && result.person.is_out_of_competition) {
-                result.place = 'в/к';
-            }
-            prevRes = result;
-        }
-
-        if (count) {
-            var ret = results.slice();
-            results = [];
-            ret.forEach(function (value) {
-                if (value.index < count + 1) {
-                    results.push(value);
-                }
-            });
-        }
-        
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 25},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'result', title: 'Сумма', size: 21},
-            {key: 'place', title: 'Место', size: 6}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            var day = 1;
-            for (var _i = 0, races_1 = races; _i < races_1.length; _i++) {
-                var race_ = races_1[_i];
-                this.fields.push({
-                    key: race_.id,
-                    title: day,
-                    size: 18
-                });
-                day++;
-            }
-            return this;
-        }
-    }.init();
-
-    store = {
-        showLinkForGroups: true
-    };
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 0},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10},
-                {text: '12', value: 12},
-                {text: '15', value: 15},
-                {text: '20', value: 20}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
diff --git "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202.html" "b/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202.html"
deleted file mode 100644
index c5559469..00000000
--- "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202.html"
+++ /dev/null
@@ -1,433 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>СУММА (МЕСТА)</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-
-	store = {
-        showLinkForGroups: true
-    };
-
-	function get_params_from_href(href){
-		if (href.indexOf('?') < 0){
-			return Array();
-		}
-		var params = Array();
-		var paramstr = href.split('?')[1];        // get what's after '?' in the href
-		if (href.indexOf('&') < 0){
-			var tmparr = paramstr.split('=');
-			params[tmparr[0]] = tmparr[1];
-		}
-		else{
-			var paramsarr = paramstr.split('&');      // get all key-value items
-			for (var i = 0; i < paramsarr.length; i++) {
-				var tmparr = paramsarr[i].split('='); // split key from value
-				params[tmparr[0]] = tmparr[1];        // sort them in a arr[key] = value way
-			}
-		}
-		return params;
-	}
-	store.best=100; //Quantity of stages to sum - user defined value - Количество этапов для суммы
-
-	var params = get_params_from_href(location.href);
-	if (params['best'] != undefined){
-		store.best = params['best'];
-	}
-
-	var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-	var races = {% endraw %}{{races|tojson}}{%raw %};
-	var personList = [];
-	var race = races[current_race];
-	var persons = {};
-
-	function prepareData(){
-		for (var _i = 0, races_ = races; _i < races_.length; _i++) {
-			var r = races_[_i];
-			racePreparation(r);
-			for (var _a = 0, _b = r.results; _a < _b.length; _a++) {
-				var res = _b[_a];
-				if (res.person && res.person.group && res.person.surname) {
-					index = res.person.group.name + '_' + res.person.surname + '_' + res.person.name;
-					if (!persons[index]) {
-						persons[index] = res.person;
-						persons[index].results = {};
-						persons[index].ok_count = 0;
-						persons[index].sum_time = 0;
-						persons[index].sum_places = 0;
-						persons[index].sum_scores = 0;
-					}
-					persons[index].results[r.id] = res;
-					if (!persons[index].is_out_of_competition) {
-						persons[index].is_out_of_competition = res.person.is_out_of_competition;
-					}
-				}
-			}
-		}
-		personList = [];
-		for (var p_index in persons) {
-			var sum_places = 0;
-			var sum_scores = 0;
-			var sum_time_ms = 0;
-			var r_count = 0;
-			var ok_count = 0;
-			var dsq = false;
-			var score_list = [];
-			var place_list = [];
-			var add_empty = true;
-
-			for (var race_id in persons[p_index].results) {
-				cur_res = persons[p_index].results[race_id];
-				if (cur_res.status === 1) {
-					score_list.push(cur_res.scores);
-					place_list.push(cur_res.place);
-					sum_time_ms += cur_res.result_msec;
-					ok_count++;
-				} else {
-					score_list.push(0);
-				}
-				r_count++;
-			}
-			score_list.sort(function (a, b) {
-				return b - a;
-			});
-			place_list.sort(function (a, b) {
-				return a - b;
-			});
-
-			for (var _i = 0, score_ = score_list; _i < score_.length && _i < store.best; _i++) {
-				var s = score_[_i];
-				sum_scores += s
-			}
-			for (var _i = 0, place_ = place_list; _i < place_.length && _i < store.best; _i++) {
-				var s = place_[_i];
-				sum_places += s
-			}
-
-            if(store.best < 100){
-                if(store.best > ok_count){
-                    dsq = true;
-                }
-                else{
-                    ok_count = store.best;
-                }
-			}
-
-			persons[p_index].sum_places = sum_places;
-			persons[p_index].sum_scores = sum_scores;
-			persons[p_index].sum_time = sum_time_ms;
-			persons[p_index].ok_count = ok_count;
-			persons[p_index].dsq = dsq;
-			personList.push(persons[p_index]);
-		}
-	}
-	prepareData();
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var results = [];
-        if (group.__type ? group.__type === 3 : race.data.race_type === 3) {
-            console.log(group.name, 'Сумма только для индивидуальных гонок!');
-            return results;
-        }
-        for (var _i = 0, _a = personList; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group.name === group.name) {
-                var r = {
-                    index: 0,
-                    name: (person.surname + ' ' + person.name).slice(0, MAX_PERSON_NAME),
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    sum: person.sum_places,
-                    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
-                };
-                for (var _b = 0, races_1 = races; _b < races_1.length; _b++) {
-                    var race_ = races_1[_b];
-                    if (person.results[race_.id]) {
-                        var place =  person.results[race_.id].place + "   ";
-                        place = place.substring(0, 3);
-                        if (place == '-1 '){
-                            place = '0  ';
-                        }
-                        r[race_.id] = place + '(' + person.results[race_.id].result + ')';
-                    }
-                }
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (!a.sum) {
-                return 1;
-            }
-            if (!b.sum) {
-                return -1;
-            }
-            if (a.person.ok_count != b.person.ok_count) {
-                return b.ok_count - a.ok_count;
-            }
-            if (a.person.dsq && b.person.dsq) {
-                return b.ok_count - a.ok_count;
-            }
-            if (a.person.dsq) {
-                return 1;
-            }
-            if (b.person.dsq) {
-                return -1;
-            }
-            if (a.sum_places != b.sum_places) {
-                return a.sum_places - b.sum_places;
-            }
-            return a.sum_time - b.sum_time;
-
-        });
-        var prevRes = results[0];
-        var place = 0;
-        var doubleplace = 0;
-        for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
-            var result = results_1[_i];
-            result.index = _i + 1;
-            if (!result.person.dsq && !result.person.is_out_of_competition) {
-               if (result.sum === prevRes.sum && _i != 0) {
-                    doubleplace++;
-                } else {
-                    place = place + 1 + doubleplace;
-                    doubleplace = 0;
-                }
-                result.place = place;
-                if (doubleplace != 0){
-                    result.place = place + ' =';
-                }
-            } else if (!result.person.dsq && result.person.is_out_of_competition) {
-                result.place = 'в/к';
-            }
-            prevRes = result;
-        }
-
-        if (count) {
-            var ret = results.slice();
-            results = [];
-            ret.forEach(function (value) {
-                if (value.index < count + 1) {
-                    results.push(value);
-                }
-            });
-        }
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {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) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            var day = 1;
-            for (var _i = 0, races_1 = races; _i < races_1.length; _i++) {
-                var race_ = races_1[_i];
-                this.fields.push({
-                    key: race_.id,
-                    title: day,
-                    size: 18
-                });
-                day++;
-            }
-            return this;
-        }
-    }.init();
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-
-        if(store.best < 100 && store.best > 0){
-            var commentBlock = document.createElement('h2');
-            commentBlock.appendChild(document.createTextNode('Количество лучших стартов: ' + store.best));
-            resultBlock.appendChild(commentBlock);
-       }
-
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-
-        var queryString = '?';
-        queryString += 'best=' + store.best + '&';
-        queryString += 'sportorg=1';
-        try {
-            var href = location.href.split('?')[0];
-            history.pushState({}, null, href + queryString);
-        } catch (e) {}
-
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-		{
-            title: 'Лучшие старты: ',
-            value: [
-                {text: 'Все старты', value: 100},
-                {text: '1', value: 1},
-				{text: '2', value: 2},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-				{text: '7', value: 7},
-                {text: '8', value: 8},
-                {text: '9', value: 9},
-                {text: '10', value: 10},
-                {text: '11', value: 11},
-                {text: '12', value: 12},
-                {text: '13', value: 13},
-                {text: '14', value: 14},
-				{text: '15', value: 15}
-            ],
-            change: function (arr) {
-                store.best = arr[0];
-				prepareData();
-                render();
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 100},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10},
-                {text: '12', value: 12},
-                {text: '15', value: 15},
-                {text: '20', value: 20}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
diff --git "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202_\321\201_\321\201\321\203\320\274\320\274\320\276\320\271_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html" "b/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202_\321\201_\321\201\321\203\320\274\320\274\320\276\320\271_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html"
deleted file mode 100644
index a14ac1ff..00000000
--- "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\274\320\265\321\201\321\202_\321\201_\321\201\321\203\320\274\320\274\320\276\320\271_\320\262\321\200\320\265\320\274\320\265\320\275\320\270.html"
+++ /dev/null
@@ -1,435 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>СУММА (МЕСТА)</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-
-	store = {
-        showLinkForGroups: true
-    };
-
-	function get_params_from_href(href){
-		if (href.indexOf('?') < 0){
-			return Array();
-		}
-		var params = Array();
-		var paramstr = href.split('?')[1];        // get what's after '?' in the href
-		if (href.indexOf('&') < 0){
-			var tmparr = paramstr.split('=');
-			params[tmparr[0]] = tmparr[1];
-		}
-		else{
-			var paramsarr = paramstr.split('&');      // get all key-value items
-			for (var i = 0; i < paramsarr.length; i++) {
-				var tmparr = paramsarr[i].split('='); // split key from value
-				params[tmparr[0]] = tmparr[1];        // sort them in a arr[key] = value way
-			}
-		}
-		return params;
-	}
-	store.best=100; //Quantity of stages to sum - user defined value - Количество этапов для суммы
-
-	var params = get_params_from_href(location.href);
-	if (params['best'] != undefined){
-		store.best = params['best'];
-	}
-
-	var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-	var races = {% endraw %}{{races|tojson}}{%raw %};
-	var personList = [];
-	var race = races[current_race];
-	var persons = {};
-
-	function prepareData(){
-		for (var _i = 0, races_ = races; _i < races_.length; _i++) {
-			var r = races_[_i];
-			racePreparation(r);
-			for (var _a = 0, _b = r.results; _a < _b.length; _a++) {
-				var res = _b[_a];
-				if (res.person && res.person.group && res.person.surname) {
-					index = res.person.group.name + '_' + res.person.surname + '_' + res.person.name;
-					if (!persons[index]) {
-						persons[index] = res.person;
-						persons[index].results = {};
-						persons[index].ok_count = 0;
-						persons[index].sum_time = 0;
-						persons[index].sum_places = 0;
-						persons[index].sum_scores = 0;
-					}
-					persons[index].results[r.id] = res;
-					if (!persons[index].is_out_of_competition) {
-						persons[index].is_out_of_competition = res.person.is_out_of_competition;
-					}
-				}
-			}
-		}
-		personList = [];
-		for (var p_index in persons) {
-			var sum_places = 0;
-			var sum_scores = 0;
-			var sum_time_ms = 0;
-			var r_count = 0;
-			var ok_count = 0;
-			var dsq = false;
-			var score_list = [];
-			var place_list = [];
-			var add_empty = true;
-
-			for (var race_id in persons[p_index].results) {
-				cur_res = persons[p_index].results[race_id];
-				if (cur_res.status === 1) {
-					score_list.push(cur_res.scores);
-					place_list.push(cur_res.place);
-					sum_time_ms += cur_res.result_msec;
-					ok_count++;
-				} else {
-					score_list.push(0);
-				}
-				r_count++;
-			}
-			score_list.sort(function (a, b) {
-				return b - a;
-			});
-			place_list.sort(function (a, b) {
-				return a - b;
-			});
-
-			for (var _i = 0, score_ = score_list; _i < score_.length && _i < store.best; _i++) {
-				var s = score_[_i];
-				sum_scores += s
-			}
-			for (var _i = 0, place_ = place_list; _i < place_.length && _i < store.best; _i++) {
-				var s = place_[_i];
-				sum_places += s
-			}
-
-            if(store.best < 100){
-                if(store.best > ok_count){
-                    dsq = true;
-                }
-                else{
-                    ok_count = store.best;
-                }
-			}
-
-			persons[p_index].sum_places = sum_places;
-			persons[p_index].sum_scores = sum_scores;
-			persons[p_index].sum_time = sum_time_ms;
-			persons[p_index].ok_count = ok_count;
-			persons[p_index].dsq = dsq;
-			personList.push(persons[p_index]);
-		}
-	}
-	prepareData();
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var results = [];
-        if (group.__type ? group.__type === 3 : race.data.race_type === 3) {
-            console.log(group.name, 'Сумма только для индивидуальных гонок!');
-            return results;
-        }
-        for (var _i = 0, _a = personList; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group.name === group.name) {
-                var r = {
-                    index: 0,
-                    name: (person.surname + ' ' + person.name).slice(0, MAX_PERSON_NAME),
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    sum: person.sum_places,
-                    sum_time: person.sum_time,
-                    sum_time_hhmmss: toHHMMSS(person.sum_time),
-                    sum_places: person.sum_places,
-                    sum_scores: person.sum_scores.toFixed(1),
-                    ok_count: person.ok_count,
-                    place: '',
-                    person: person
-                };
-                for (var _b = 0, races_1 = races; _b < races_1.length; _b++) {
-                    var race_ = races_1[_b];
-                    if (person.results[race_.id]) {
-                        var place =  person.results[race_.id].place + "   ";
-                        place = place.substring(0, 3);
-                        if (place == '-1 '){
-                            place = '0  ';
-                        }
-                        r[race_.id] = place + '(' + person.results[race_.id].result + ')';
-                    }
-                }
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (!a.sum) {
-                return 1;
-            }
-            if (!b.sum) {
-                return -1;
-            }
-            if (a.person.ok_count != b.person.ok_count) {
-                return b.ok_count - a.ok_count;
-            }
-            if (a.person.dsq && b.person.dsq) {
-                return b.ok_count - a.ok_count;
-            }
-            if (a.person.dsq) {
-                return 1;
-            }
-            if (b.person.dsq) {
-                return -1;
-            }
-            if (a.sum_places != b.sum_places) {
-                return a.sum_places - b.sum_places;
-            }
-            return a.sum_time - b.sum_time;
-
-        });
-        var prevRes = results[0];
-        var place = 0;
-        var doubleplace = 0;
-        for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
-            var result = results_1[_i];
-            result.index = _i + 1;
-            if (!result.person.dsq && !result.person.is_out_of_competition) {
-               if (result.sum === prevRes.sum && _i != 0) {
-                    doubleplace++;
-                } else {
-                    place = place + 1 + doubleplace;
-                    doubleplace = 0;
-                }
-                result.place = place;
-                if (doubleplace != 0){
-                    result.place = place + ' =';
-                }
-            } else if (!result.person.dsq && result.person.is_out_of_competition) {
-                result.place = 'в/к';
-            }
-            prevRes = result;
-        }
-
-        if (count) {
-            var ret = results.slice();
-            results = [];
-            ret.forEach(function (value) {
-                if (value.index < count + 1) {
-                    results.push(value);
-                }
-            });
-        }
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'sum', title: 'Сумма', size: 6},
-            {key: 'ok_count', title: 'Старты', size: 6},
-            {key: 'sum_time_hhmmss', title: 'Сумма времени', size: 13},
-            {key: 'place', title: 'Место', size: 6}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            var day = 1;
-            for (var _i = 0, races_1 = races; _i < races_1.length; _i++) {
-                var race_ = races_1[_i];
-                this.fields.push({
-                    key: race_.id,
-                    title: day,
-                    size: 18
-                });
-                day++;
-            }
-            return this;
-        }
-    }.init();
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-
-        if(store.best < 100 && store.best > 0){
-            var commentBlock = document.createElement('h2');
-            commentBlock.appendChild(document.createTextNode('Количество лучших стартов: ' + store.best));
-            resultBlock.appendChild(commentBlock);
-       }
-
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-
-        var queryString = '?';
-        queryString += 'best=' + store.best + '&';
-        queryString += 'sportorg=1';
-        try {
-            var href = location.href.split('?')[0];
-            history.pushState({}, null, href + queryString);
-        } catch (e) {}
-
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-		{
-            title: 'Лучшие старты: ',
-            value: [
-                {text: 'Все старты', value: 100},
-                {text: '1', value: 1},
-				{text: '2', value: 2},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-				{text: '7', value: 7},
-                {text: '8', value: 8},
-                {text: '9', value: 9},
-                {text: '10', value: 10},
-                {text: '11', value: 11},
-                {text: '12', value: 12},
-                {text: '13', value: 13},
-                {text: '14', value: 14},
-				{text: '15', value: 15}
-            ],
-            change: function (arr) {
-                store.best = arr[0];
-				prepareData();
-                render();
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 100},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10},
-                {text: '12', value: 12},
-                {text: '15', value: 15},
-                {text: '20', value: 20}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
diff --git "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262.html" "b/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262.html"
deleted file mode 100644
index 611ed19a..00000000
--- "a/templates/reports/4_\321\200\320\265\320\267\321\203\320\273\321\214\321\202\320\260\321\202\321\213_\321\201\321\203\320\274\320\274\320\260_\320\276\321\207\320\272\320\276\320\262.html"
+++ /dev/null
@@ -1,418 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Results{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>{{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>СУММА (ОЧКИ)</h2>
-</div>
-<div id="results-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-
-	store = {
-        showLinkForGroups: true
-    };
-
-	function get_params_from_href(href){
-		if (href.indexOf('?') < 0){
-			return Array();
-		}
-		var params = Array();
-		var paramstr = href.split('?')[1];        // get what's after '?' in the href
-		if (href.indexOf('&') < 0){
-			var tmparr = paramstr.split('=');
-			params[tmparr[0]] = tmparr[1];
-		}
-		else{
-			var paramsarr = paramstr.split('&');      // get all key-value items
-			for (var i = 0; i < paramsarr.length; i++) {
-				var tmparr = paramsarr[i].split('='); // split key from value
-				params[tmparr[0]] = tmparr[1];        // sort them in a arr[key] = value way
-			}
-		}
-		return params;
-	}
-	store.best=100; //Quantity of stages to sum - user defined value - Количество этапов для суммы
-
-	var params = get_params_from_href(location.href);
-	if (params['best'] != undefined){
-		store.best = params['best'];
-	}
-
-	var current_race =  Number({% endraw %}{{current_race}}{%raw %});
-	var races = {% endraw %}{{races|tojson}}{%raw %};
-	var personList = [];
-	var race = races[current_race];
-	var persons = {};
-
-	function prepareData(){
-		for (var _i = 0, races_ = races; _i < races_.length; _i++) {
-			var r = races_[_i];
-			racePreparation(r);
-			for (var _a = 0, _b = r.results; _a < _b.length; _a++) {
-				var res = _b[_a];
-				if (res.person && res.person.group && res.person.surname) {
-					index = res.person.group.name + '_' + res.person.surname + '_' + res.person.name;
-					if (!persons[index]) {
-						persons[index] = res.person;
-						persons[index].results = {};
-						persons[index].ok_count = 0;
-						persons[index].sum_time = 0;
-						persons[index].sum_places = 0;
-						persons[index].sum_scores = 0;
-					}
-					persons[index].results[r.id] = res;
-					if (!persons[index].is_out_of_competition) {
-						persons[index].is_out_of_competition = res.person.is_out_of_competition;
-					}
-				}
-			}
-		}
-		personList = [];
-		for (var p_index in persons) {
-			var sum_places = 0;
-			var sum_scores = 0;
-			var sum_time_ms = 0;
-			var r_count = 0;
-			var ok_count = 0;
-			var dsq = false;
-			var score_list = [];
-			var place_list = [];
-			var add_empty = true;
-
-			for (var race_id in persons[p_index].results) {
-				cur_res = persons[p_index].results[race_id];
-				if (cur_res.status === 1) {
-					score_list.push(cur_res.scores);
-					place_list.push(cur_res.place);
-					sum_time_ms += cur_res.result_msec;
-					ok_count++;
-				} else {
-					score_list.push(0);
-				}
-				r_count++;
-			}
-			score_list.sort(function (a, b) {
-				return b - a;
-			});
-			place_list.sort(function (a, b) {
-				return a - b;
-			});
-
-			for (var _i = 0, score_ = score_list; _i < score_.length && _i < store.best; _i++) {
-				var s = score_[_i];
-				sum_scores += s
-			}
-			for (var _i = 0, place_ = place_list; _i < place_.length && _i < store.best; _i++) {
-				var s = place_[_i];
-				sum_places += s
-			}
-
-            ok_count = Math.min(store.best, ok_count);
-			//if(store.best < 99 and store.best > ok_count){
-			//   dsq = true;
-			//}
-
-			persons[p_index].sum_places = sum_places;
-			persons[p_index].sum_scores = sum_scores;
-			persons[p_index].sum_time = sum_time_ms;
-			persons[p_index].ok_count = ok_count;
-			persons[p_index].dsq = dsq;
-			personList.push(persons[p_index]);
-		}
-	}
-	prepareData();
-
-    function getResultsByGroup(group, count) {
-        count = +count || 0;
-        var results = [];
-        if (group.__type ? group.__type === 3 : race.data.race_type === 3) {
-            console.log(group.name, 'Сумма только для индивидуальных гонок!');
-            return results;
-        }
-        for (var _i = 0, _a = personList; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group.name === group.name) {
-                var r = {
-                    index: 0,
-                    name: (person.surname + ' ' + person.name).slice(0, MAX_PERSON_NAME),
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    sum: person.sum_scores.toFixed(1),
-                    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
-                };
-                for (var _b = 0, races_1 = races; _b < races_1.length; _b++) {
-                    var race_ = races_1[_b];
-                    if (person.results[race_.id]) {
-                        r[race_.id] = person.results[race_.id].scores.toFixed(1) + '(' + person.results[race_.id].result + ')';
-                    }
-                }
-                results.push(r);
-            }
-        }
-        results.sort(function (a, b) {
-            if (!a.sum_scores) {
-                return 1;
-            }
-            if (!b.sum_scores) {
-                return -1;
-            }
-            if (a.person.dsq && b.person.dsq) {
-                return b.ok_count - a.ok_count;
-            }
-            if (a.person.dsq) {
-                return 1;
-            }
-            if (b.person.dsq) {
-                return -1;
-            }
-            return b.sum_scores - a.sum_scores;
-        });
-        var prevRes = results[0];
-        var place = 0;
-        var doubleplace = 0;
-        for (var _i = 0, results_1 = results; _i < results_1.length; _i++) {
-            var result = results_1[_i];
-            result.index = _i + 1;
-            if (!result.person.dsq && !result.person.is_out_of_competition) {
-               if (result.sum === prevRes.sum && _i != 0) {
-                    doubleplace++;
-                } else {
-                    place = place + 1 + doubleplace;
-                    doubleplace = 0;
-                }
-                result.place = place;
-                if (doubleplace != 0){
-                    result.place = place + ' =';
-                }
-            } else if (!result.person.dsq && result.person.is_out_of_competition) {
-                result.place = 'в/к';
-            }
-            prevRes = result;
-        }
-
-        if (count) {
-            var ret = results.slice();
-            results = [];
-            ret.forEach(function (value) {
-                if (value.index < count + 1) {
-                    results.push(value);
-                }
-            });
-        }
-
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 20},
-            {key: 'year', title: 'ГР', size: 5},
-            {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) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        getField: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    return obj
-                }
-            }
-        },
-        getCopyFields: function () {
-            return JSON.parse(JSON.stringify(this.fields))
-        },
-        init: function () {
-            var day = 1;
-            for (var _i = 0, races_1 = races; _i < races_1.length; _i++) {
-                var race_ = races_1[_i];
-                this.fields.push({
-                    key: race_.id,
-                    title: day,
-                    size: 18
-                });
-                day++;
-            }
-            return this;
-        }
-    }.init();
-
-    function render() {
-        var resultBlock = document.getElementById('results-tables');
-        resultBlock.innerHTML = '';
-
-        if(store.best < 100 && store.best > 0){
-            var commentBlock = document.createElement('h2');
-            commentBlock.appendChild(document.createTextNode('Количество лучших стартов: ' + store.best));
-            resultBlock.appendChild(commentBlock);
-       }
-
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var rows = getResultsByGroup(group, store.count);
-            if (!rows.length) {
-                continue;
-            }
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            if (store.showLinkForGroups) {
-                resultBlock.appendChild(getGroupsBlockElement(race));
-            }
-            var fields = Fields.getCopyFields();
-            if (!store.tableView && !store.splitsShow && !Fields.isActive('all_splits')) {
-                resultBlock.appendChild(new TableTextGenerator(rows, fields).getTable());
-            } else {
-                resultBlock.appendChild(new TableGenerator(rows, fields).getTable({className: 'sportorg-table'}));
-            }
-            if (store.newPage && _i < _a.length - 1) {
-                var newPage = document.createElement('div');
-                newPage.className = 'new-page';
-                resultBlock.appendChild(newPage);
-            }
-        }
-
-        var queryString = '?';
-        queryString += 'best=' + store.best + '&';
-        queryString += 'sportorg=1';
-        try {
-            var href = location.href.split('?')[0];
-            history.pushState({}, null, href + queryString);
-        } catch (e) {}
-
-    }
-
-    render();
-
-    new SettingsGenerator([
-        {
-            title: 'Ссылки на группы',
-            value: !!store.showLinkForGroups,
-            change: function (checked) {
-                store.showLinkForGroups = checked;
-                render()
-            }
-        },
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-		{
-            title: 'Лучшие старты: ',
-            value: [
-                {text: 'Все старты', value: 0},
-                {text: '1', value: 1},
-				{text: '2', value: 2},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-				{text: '7', value: 7},
-                {text: '8', value: 8},
-                {text: '9', value: 9},
-                {text: '10', value: 10},
-                {text: '11', value: 11},
-                {text: '12', value: 12},
-                {text: '13', value: 13},
-                {text: '14', value: 14},
-				{text: '15', value: 15}
-            ],
-            change: function (arr) {
-                store.best = arr[0];
-				prepareData();
-                render();
-            }
-        },
-        {
-            title: 'Показать первые: ',
-            value: [
-                {text: 'Все результаты', value: 100},
-                {text: '1', value: 1},
-                {text: '3', value: 3},
-                {text: '4', value: 4},
-                {text: '5', value: 5},
-                {text: '6', value: 6},
-                {text: '10', value: 10},
-                {text: '12', value: 12},
-                {text: '15', value: 15},
-                {text: '20', value: 20}
-            ],
-            change: function (arr) {
-                store.count = arr[0];
-                render();
-            }
-        },
-        {
-            title: 'Печатать на отдельной странице',
-            value: false,
-            change: function (checked) {
-                store.newPage = checked;
-                render()
-            }
-        }
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_word.docx"
deleted file mode 100644
index 9240e8cb..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\275\320\276\320\263\320\276\320\264\320\275\320\265\320\262\320\275\321\213\320\271_2\320\264\320\275\321\217_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\275\320\276\320\263\320\276\320\264\320\275\320\265\320\262\320\275\321\213\320\271_2\320\264\320\275\321\217_word.docx"
deleted file mode 100644
index a487a8dc..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\275\320\276\320\263\320\276\320\264\320\275\320\265\320\262\320\275\321\213\320\271_2\320\264\320\275\321\217_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\275\320\276\320\263\320\276\320\264\320\275\320\265\320\262\320\275\321\213\320\271_3\320\264\320\275\321\217_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\275\320\276\320\263\320\276\320\264\320\275\320\265\320\262\320\275\321\213\320\271_3\320\264\320\275\321\217_word.docx"
deleted file mode 100644
index 777ff868..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\275\320\276\320\263\320\276\320\264\320\275\320\265\320\262\320\275\321\213\320\271_3\320\264\320\275\321\217_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\261\321\212\320\265\320\272\321\202\321\213_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\261\321\212\320\265\320\272\321\202\321\213_word.docx"
deleted file mode 100644
index 95a42678..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\203\320\261\321\212\320\265\320\272\321\202\321\213_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\210\321\202\321\200\320\260\321\204_\320\272\321\200\321\203\320\263\320\270_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\210\321\202\321\200\320\260\321\204_\320\272\321\200\321\203\320\263\320\270_word.docx"
deleted file mode 100644
index 93dc89f2..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\210\321\202\321\200\320\260\321\204_\320\272\321\200\321\203\320\263\320\270_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\210\321\202\321\200\320\260\321\204_\320\274\320\270\320\275\321\203\321\202\321\213_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\210\321\202\321\200\320\260\321\204_\320\274\320\270\320\275\321\203\321\202\321\213_word.docx"
deleted file mode 100644
index f6db3b6b..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\210\321\202\321\200\320\260\321\204_\320\274\320\270\320\275\321\203\321\202\321\213_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\215\321\201\321\202\320\260\321\204\320\265\321\202\320\260_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\215\321\201\321\202\320\260\321\204\320\265\321\202\320\260_word.docx"
deleted file mode 100644
index fba6039e..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\215\321\201\321\202\320\260\321\204\320\265\321\202\320\260_word.docx" and /dev/null differ
diff --git "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\215\321\201\321\202\320\260\321\204\320\265\321\202\320\260_\321\201_\321\201\321\203\320\261\321\212\320\265\320\272\321\202\320\260\320\274\320\270_word.docx" "b/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\215\321\201\321\202\320\260\321\204\320\265\321\202\320\260_\321\201_\321\201\321\203\320\261\321\212\320\265\320\272\321\202\320\260\320\274\320\270_word.docx"
deleted file mode 100644
index ac2d6bd9..00000000
Binary files "a/templates/reports/9_\320\276\321\204\320\270\321\206\320\270\320\260\320\273\321\214\320\275\321\213\320\271_\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\215\321\201\321\202\320\260\321\204\320\265\321\202\320\260_\321\201_\321\201\321\203\320\261\321\212\320\265\320\272\321\202\320\260\320\274\320\270_word.docx" and /dev/null differ
diff --git "a/templates/reports/\320\264\320\270\320\277\320\273\320\276\320\274_\320\232\321\203\320\261\320\276\320\272_\320\240\320\276\321\201\321\201\320\270\320\270_word.docx" "b/templates/reports/\320\264\320\270\320\277\320\273\320\276\320\274_\320\232\321\203\320\261\320\276\320\272_\320\240\320\276\321\201\321\201\320\270\320\270_word.docx"
deleted file mode 100644
index 083ae9e2..00000000
Binary files "a/templates/reports/\320\264\320\270\320\277\320\273\320\276\320\274_\320\232\321\203\320\261\320\276\320\272_\320\240\320\276\321\201\321\201\320\270\320\270_word.docx" and /dev/null differ
diff --git "a/templates/reports/\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\260\320\275\320\264\320\260\321\202\320\275\320\276\320\271_\320\272\320\276\320\274\320\270\321\201\321\201\320\270\320\270.html" "b/templates/reports/\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\260\320\275\320\264\320\260\321\202\320\275\320\276\320\271_\320\272\320\276\320\274\320\270\321\201\321\201\320\270\320\270.html"
deleted file mode 100644
index e6162184..00000000
--- "a/templates/reports/\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\320\274\320\260\320\275\320\264\320\260\321\202\320\275\320\276\320\271_\320\272\320\276\320\274\320\270\321\201\321\201\320\270\320\270.html"
+++ /dev/null
@@ -1,142 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Entries Statistics List{% endblock %}
-{% block head %}{{ super() }}{% endblock %}
-
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }}</h3>
-    <h2>Протокол комиссии по допуску</h2>
-</div>
-<h3>Информация о коллективах</h3>
-<div id="org-group"></div>
-
-<h3>Информация о квалификации спортсменов</h3>
-<div id="qual-group"></div>
-
-<div>
-    <h2>
-        <br>&nbsp;<br>_______________________________
-        <br>&nbsp;<br>_______________________________
-        <br>&nbsp;<br>_______________________________
-    </h2>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{% raw %};
-    racePreparation(race);
-    // команда группа
-    function getCountPersonOrg(org, group) {
-        var count = 0;
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group && person.organization) {
-                if (person.group.id === group.id && person.organization.id === org.id) {
-                    count++;
-                }
-            }
-        }
-        return count;
-    }
-    function getOrgGroupRows() {
-        var arr = [];
-        var index = 0;
-        var groupTotal = {
-            index: index,
-            org: 'Всего'
-        };
-        for (var _i = 0, _a = race.organizations; _i < _a.length; _i++) {
-            var org = _a[_i];
-            index++;
-            var row = {
-                index: index,
-                org: org.name,
-                total: 0
-            };
-            for (var _b = 0, _c = race.groups; _b < _c.length; _b++) {
-                var group = _c[_b];
-                var count = getCountPersonOrg(org, group);
-                row[group.id] = count;
-                row.total += count;
-                groupTotal[group.id] = (groupTotal[group.id] || 0) + count;
-            }
-            arr.push(row);
-        }
-        arr.push(groupTotal);
-        return arr;
-    }
-    // разряд группа
-    function getCountPersonQual(qual, group) {
-        var count = 0;
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group) {
-                if (person.group.id === group.id && Number(person.qual) === Number(qual)) {
-                    count++;
-                }
-            }
-        }
-        return count;
-    }
-    function getQualGroupRows() {
-        var arr = [];
-        var index = 0;
-        var groupTotal = {
-            index: index,
-            qual: 'Всего'
-        };
-        for (var _i = 0, _a = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; _i < _a.length; _i++) {
-            var qual = _a[_i];
-            index++;
-            var row = {
-                index: index,
-                qual: Qualification[qual],
-                total: 0
-            };
-            for (var _b = 0, _c = race.groups; _b < _c.length; _b++) {
-                var group = _c[_b];
-                var count = getCountPersonQual(qual, group);
-                row[group.id] = count;
-                row.total += count;
-                groupTotal[group.id] = (groupTotal[group.id] || 0) + count;
-            }
-            arr.push(row);
-        }
-        arr.push(groupTotal);
-        return arr;
-    }
-
-    var OrgFields = {
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'org', title: 'Коллектив'}
-        ],
-        init: function () {
-            for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                this.fields.push({ key: group.id, title: group.name });
-            }
-            this.fields.push({key: 'total', title: 'Всего'});
-            return this;
-        }
-    }.init();
-
-    var QualFields = {
-        fields: [
-            {key: 'index', title: '№'},
-            {key: 'qual', title: 'Квалификационный разряд'}
-        ],
-        init: function () {
-            for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                this.fields.push({ key: group.id, title: group.name });
-            }
-            this.fields.push({key: 'total', title: 'Всего'});
-            return this;
-        }
-    }.init();
-
-    document.getElementById('org-group').appendChild(new TableGenerator(getOrgGroupRows(), OrgFields.fields).getTable({className: 'sportorg-table'}));
-    document.getElementById('qual-group').appendChild(new TableGenerator(getQualGroupRows(), QualFields.fields).getTable({className: 'sportorg-table'}));
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260_\320\264\320\273\320\270\320\275\320\275\321\213\320\271_\320\272\320\276\320\273\320\273\320\265\320\272\321\202\320\270\320\262.html" "b/templates/reports/\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260_\320\264\320\273\320\270\320\275\320\275\321\213\320\271_\320\272\320\276\320\273\320\273\320\265\320\272\321\202\320\270\320\262.html"
deleted file mode 100644
index 634e30db..00000000
--- "a/templates/reports/\320\277\321\200\320\276\321\202\320\276\320\272\320\276\320\273_\321\201\321\202\320\260\321\200\321\202\320\260_\320\264\320\273\320\270\320\275\320\275\321\213\320\271_\320\272\320\276\320\273\320\273\320\265\320\272\321\202\320\270\320\262.html"
+++ /dev/null
@@ -1,225 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Start List{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block content %}
-<div class="text-center">
-    <h3>{{ race.data.description }} <br>
-    {{ race.data.start_datetime|date }} {{ race.data.location }}</h3>
-    <h2>ПРОТОКОЛ СТАРТА</h2>
-</div>
-<div id="start-list-tables"></div>
-<div>
-    <table class="empty-table">
-        <tr>
-            <td><b>Главный судья:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.chief_referee }}</b></td>
-        </tr>
-        <tr>
-            <td><b>Главный секретарь:</b></td>
-            <td width="150px"></td>
-            <td><b>{{ race.data.secretary }}</b></td>
-        </tr>
-    </table>
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{%raw %};
-    racePreparation(race);
-
-    function getStartListByGroup(group) {
-        var isRelay = group.__type ? group.__type === 3 : race.data.race_type === 3;
-        var results = [];
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            if (person.group && person.group.id === group.id) {
-                results.push({
-                    index: 0,
-                    name: person.surname + ' ' + person.name,
-                    org: (person.organization && String(person.organization.name).slice(0, MAX_ORG_NAME)) || '',
-                    qual: Qualification[person.qual],
-                    bib: person.bib,
-                    card_number: person.card_number,
-                    year: person.birth_date ? (new Date(person.birth_date)).getFullYear() : '',
-                    start: toHHMMSS(person.start_time),
-                    start_time: person.start_time
-                });
-            }
-        }
-        results.sort(function (a, b) {
-            if (isRelay && a.start_time === b.start_time) {
-                if (a.bib % 1000 === b.bib % 1000) {
-                    return ~~(a.bib / 1000) - ~~(b.bib / 1000)
-                } else {
-                    return a.bib % 1000 - b.bib % 1000
-                }
-            }
-            if (a.start_time === b.start_time) {
-                return a.bib - b.bib;
-            }
-            return a.start_time - b.start_time
-        });
-        var index = 0;
-        results.forEach(function (elem) {
-            index++;
-            elem.index = index
-        });
-        if (isRelay) {
-            index = 0;
-            var prevBib = 0;
-            var resultsList = results.slice();
-            results = [];
-            for (var _i = 0, resultsList_ = resultsList; _i < resultsList_.length; _i++) {
-                var r = resultsList_[_i];
-                r.index = '';
-                if (r.bib % 1000 !== prevBib) {
-                    index++;
-                    results.push({index: index});
-                    prevBib = r.bib % 1000;
-                }
-                results.push(r);
-            }
-        }
-        return results;
-    }
-
-    var Fields = {
-        fields: [
-            {key: 'index', title: '№', size: 4},
-            {key: 'name', title: 'Фамилия, имя', size: 30},
-            {key: 'org', title: 'Коллектив', size: 60},
-            {key: 'year', title: 'ГР', size: 5},
-            {key: 'qual', title: 'Разряд', size: 7},
-            {key: 'bib', title: 'Номер', size: 6},
-            {key: 'card_number', title: 'Номер чипа', size: 11},
-            {key: 'start', title: 'Время старта', size: 13}
-        ],
-        active: function (key, val) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    obj.active = val;
-                }
-            }
-        },
-        isActive: function (key) {
-            for (var _i = 0, _a = this.fields; _i < _a.length; _i++) {
-                var obj = _a[_i];
-                if (key === obj.key) {
-                    if (obj.active === void 0) {
-                        return true;
-                    }
-                    else {
-                        return !!obj.active;
-                    }
-                }
-            }
-            return false;
-        },
-        init: function () {
-            return this;
-        }
-    }.init();
-
-    var store = {};
-
-    function render() {
-        var resultBlock = document.getElementById('start-list-tables');
-        resultBlock.innerHTML = '';
-        for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-            var group = _a[_i];
-            var titleBlock = document.createElement('h2');
-            titleBlock.id = group.name;
-            titleBlock.appendChild(document.createTextNode(group.name));
-            resultBlock.appendChild(titleBlock);
-            resultBlock.appendChild(getGroupsBlockElement(race));
-            if (store.tableView) {
-                resultBlock.appendChild(new TableGenerator(getStartListByGroup(group), Fields.fields).getTable({className: 'sportorg-table'}));
-            } else {
-                resultBlock.appendChild(new TableTextGenerator(getStartListByGroup(group), Fields.fields).getTable());
-            }
-        }
-    }
-    render();
-
-    var Scrolling = {
-        direction: 1,
-        enabled: false,
-        lock: false,
-        prev: 0,
-        intervalTimer: 0,
-        init: function () {
-            var _this = this;
-            if (_this.intervalTimer) {
-                clearInterval(_this.intervalTimer)
-            }
-            _this.intervalTimer = setInterval(function () {
-                _this.lock = !_this.lock;
-            }, 5000);
-            window.onscroll = function () {
-                var d = document.documentElement;
-                var offset = d.scrollTop + window.innerHeight;
-                var height = d.offsetHeight;
-
-                if (offset === height) {
-                    _this.direction = -1;
-                }
-                if (offset <= window.innerHeight) {
-                    _this.direction = 1;
-                }
-            };
-            this.pageScroll();
-            return this;
-        },
-        pageScroll: function () {
-            var _this = this;
-            if (_this.enabled && ! _this.lock) {
-                window.scrollBy(10, _this.direction);
-            }
-            setTimeout(function () {
-                _this.pageScroll();
-            }, 10);
-        }
-    }.init();
-
-    new SettingsGenerator([
-        {
-            title: 'Табличный вид',
-            value: !!store.tableView,
-            change: function (checked) {
-                store.tableView = checked;
-                render()
-            }
-        },
-        {
-            title: 'Номер',
-            value: Fields.isActive('bib'),
-            change: function (checked) {
-                Fields.active('bib', checked);
-                render()
-            }
-        },
-        {
-            title: 'Номер чипа',
-            value: Fields.isActive('card_number'),
-            change: function (checked) {
-                Fields.active('card_number', checked);
-                render()
-            }
-        },
-        {
-            title: 'Автоскролл',
-            value: Scrolling.enabled,
-            change: function (checked) {
-                Scrolling.enabled = checked;
-            }
-        },
-    ]).show();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/\320\277\321\200\320\276\321\207\320\265\320\265_\321\201\320\277\321\200\320\260\320\262\320\272\320\260_\321\201\320\265\320\274\320\270\320\275\320\260\321\200_word.docx" "b/templates/reports/\320\277\321\200\320\276\321\207\320\265\320\265_\321\201\320\277\321\200\320\260\320\262\320\272\320\260_\321\201\320\265\320\274\320\270\320\275\320\260\321\200_word.docx"
deleted file mode 100644
index 43c87da2..00000000
Binary files "a/templates/reports/\320\277\321\200\320\276\321\207\320\265\320\265_\321\201\320\277\321\200\320\260\320\262\320\272\320\260_\321\201\320\265\320\274\320\270\320\275\320\260\321\200_word.docx" and /dev/null differ
diff --git "a/templates/reports/\321\201\321\202\320\260\321\200\321\202\320\276\320\262\320\260\321\217_\321\210\320\260\321\205\320\274\320\260\321\202\320\272\320\260_\320\270\320\274\320\265\320\275\320\260.html" "b/templates/reports/\321\201\321\202\320\260\321\200\321\202\320\276\320\262\320\260\321\217_\321\210\320\260\321\205\320\274\320\260\321\202\320\272\320\260_\320\270\320\274\320\265\320\275\320\260.html"
deleted file mode 100644
index 4f46326d..00000000
--- "a/templates/reports/\321\201\321\202\320\260\321\200\321\202\320\276\320\262\320\260\321\217_\321\210\320\260\321\205\320\274\320\260\321\202\320\272\320\260_\320\270\320\274\320\265\320\275\320\260.html"
+++ /dev/null
@@ -1,124 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Start Times{% endblock %}
-
-{% block head %}
-{{ super() }}
-{% endblock %}
-
-{% block content %}
-<div id="start-times-tables"></div>
-{% raw %}
-<style>
-    @media print {
-		table.sportorg-table {
-		  width: 100%;
-		  table-layout: fixed;
-		}
-		
-        table.sportorg-table th {
-            text-align: left;
-        }
-
-		table.sportorg-table td:nth-child(1) {
-            padding-top: 10px;
-            border-bottom: 1px solid black;
-        }
-        table.sportorg-table td:nth-child(1n+1) {
-            padding-top: 10px;
-            border-bottom: 1px solid black;
-			white-space: normal;
-			font-size: 14px;
-			width: 1%;
-        }
-    }
-	
-	    @media screen {
-		table.sportorg-table {
-		  width: 100%;
-		  table-layout: fixed;
-		}
-		
-        table.sportorg-table th {
-            text-align: left;
-        }
-
-		table.sportorg-table td:nth-child(1) {
-            padding-top: 10px;
-            border-bottom: 1px solid black;
-        }
-
-        table.sportorg-table td:nth-child(1n+1) {
-            padding-top: 10px;
-            border-bottom: 1px solid black;
-			white-space: normal;
-			font-size: 15px;
-			width: 1%;
-        }
-
-    }
-
-</style>
-<script>
-    var race = {% endraw %}{{race|tojson}}{% raw %};
-    racePreparation(race);
-
-    function getStartTimes() {
-        var times = {};
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-			var persId = person.group.name + '\n' + person.name + '\n' + person.surname + '\n(' + person.card_number + ')';
-            if (times[person.start_time]) {
-                var val = times[person.start_time][person.group && person.group.start_corridor || 0];
-                if (val) {
-                    //val += ' ' + person.bib;
-					val += ' ' + persId;
-                }
-                else {
-                   //val = person.bib;
-				   val = persId;
-                }
-               times[person.start_time][person.group && person.group.start_corridor || 0] = val;
-            }
-            else {
-                times[person.start_time] = {};
-                //times[person.start_time][person.group && person.group.start_corridor || 0] = person.bib;
-				times[person.start_time][person.group && person.group.start_corridor || 0] = persId;
-            }
-        }
-        var results = [];
-        for (var start_time in times) {
-            times[start_time]['start_time'] = +start_time;
-            times[start_time]['start_time_str'] = toHHMMSS(+start_time);
-            results.push(times[start_time])
-        }
-        results.sort(function (a, b) {
-            return a.start_time - b.start_time;
-        });
-        return results;
-    }
-    var Fields = {
-        fields: [
-            {key: 'start_time_str', title: 'Время'}
-        ],
-        init: function () {
-            var start_corridors = {};
-            for (var _i = 0, _a = race.groups; _i < _a.length; _i++) {
-                var group = _a[_i];
-                start_corridors[group.start_corridor] = group.start_corridor;
-            }
-            for (var c in start_corridors) {
-                this.fields.push({key: c, title: start_corridors[c]})
-            }
-            return this;
-        }
-    }.init();
-    function render() {
-        var resultBlock = document.getElementById('start-times-tables');
-        resultBlock.innerHTML = '';
-        resultBlock.appendChild(new TableGenerator(getStartTimes(), Fields.fields).getTable({className: 'sportorg-table'}));
-    }
-    render();
-</script>
-{% endraw %}
-{% endblock %}
\ No newline at end of file
diff --git "a/templates/reports/\321\201\321\202\320\260\321\200\321\202\320\276\320\262\321\213\320\265_\320\275\320\276\320\274\320\265\321\200\320\260_\320\264\320\273\321\217_\320\272\320\260\321\200\321\202.html" "b/templates/reports/\321\201\321\202\320\260\321\200\321\202\320\276\320\262\321\213\320\265_\320\275\320\276\320\274\320\265\321\200\320\260_\320\264\320\273\321\217_\320\272\320\260\321\200\321\202.html"
deleted file mode 100644
index 88f63b64..00000000
--- "a/templates/reports/\321\201\321\202\320\260\321\200\321\202\320\276\320\262\321\213\320\265_\320\275\320\276\320\274\320\265\321\200\320\260_\320\264\320\273\321\217_\320\272\320\260\321\200\321\202.html"
+++ /dev/null
@@ -1,333 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Bib on maps</title>
-   {% raw %} 
-    <style>
-        table {
-            border-collapse: collapse;
-            border-spacing: 0;
-        }
-
-        p,
-        blockquote,
-        ul,
-        ol,
-        dl,
-        table,
-        pre {
-            margin-top: 0;
-            margin-bottom: 16px;
-        }
-
-        hr {
-            box-sizing: content-box;
-            height: 0;
-        }
-
-        hr {
-            height: 0;
-            margin: 15px 0;
-            overflow: hidden;
-            background: transparent;
-            border: 0;
-            border-bottom: 1px solid #ddd;
-        }
-
-        hr:before {
-            display: table;
-            content: "";
-        }
-
-        hr:after {
-            display: table;
-            clear: both;
-            content: "";
-        }
-
-        hr {
-            height: 4px;
-            padding: 0;
-            margin: 16px 0;
-            background-color: #e7e7e7;
-            border: 0 none;
-        }
-
-        a:not([href]) {
-            color: inherit;
-            text-decoration: none;
-        }
-
-        a {
-            color: #4078c0;
-            text-decoration: none;
-        }
-
-        a:hover,
-        a:active {
-            text-decoration: underline;
-        }
-
-        a {
-            background-color: transparent;
-        }
-
-        a:active,
-        a:hover {
-            outline: 0;
-        }
-
-        .print {
-            display: none;
-        }
-
-        .no-print {
-            display: block;
-        }
-
-        /*=== BIB ===*/
-        .bib-item {
-            width: 26.4cm;
-            float: left;
-            padding: 1cm;
-            border: 1px solid #e7e7e7;
-        }
-        .bib-title {
-            text-align: center;
-            font-size: 1.2cm;
-            height: 4.2cm;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .bib-number {
-            text-align: left;
-            font-size: 5cm;
-            height: 5cm;
-            font-weight: normal;
-        }
-        .bib-info {
-            font-size: 0.8cm;
-        }
-        .bib-info .left-info, .bib-info .right-info {
-            width: 50%;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .bib-info .left-info {
-            float: left;
-        }
-        .bib-info .right-info {
-            float: right;
-        }
-        .info-item {
-            white-space: nowrap;
-        }
-        .rotatable {
-            -webkit-transform: rotate(-180deg); //Chrome, Safari
-        -moz-transform: rotate(-180deg); //Firefox
-        -o-transform: rotate(-180deg); //Opera
-        -ms-transform: rotate(-180deg); //IE
-        transform: rotate(-180deg);
-        }
-        /*=== BIB ===*/
-
-        @page {
-            size: A4 landscape;
-        }
-
-        @media print {
-            @page {
-                margin: 0.0cm;
-            }
-            body {
-                margin: 0;
-                zoom: 100%;
-            }
-            table {
-                display: table;
-                width: 100%;
-            }
-            table th,
-            table td {
-                padding: 1px 10px;
-            }
-            table,
-            pre {
-                margin-bottom: 1px;
-            }
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-         	h6 {
-                margin: 1px 0;
-				
-            }
-			
-            section {
-                page-break-before: always;
-            }
-            .new-page:nth-child(4n) {
-                page-break-after: always;
-				page-break-before: always;
-            }
-            ul {
-                page-break-inside: avoid;
-            }
-            p {
-                widows: 4;
-            }
-            a[href^="http"]:after {
-                content: " (" attr(href) ")";
-            }
-            abbr[title]:after {
-                content: " (" attr(title) ")";
-            }
-            .print {
-                display: block;
-            }
-            .no-print {
-                display: none;
-            }
-        }
-    </style>
-    {% endraw %}
-    {% include 'script.js.html' %}
-</head>
-<body>
-<div class="bib-list" id="bib-list">
-</div>
-{% raw %}
-<script>
-    var race = {% endraw %}{{race|tojson}}{% raw %};
-    racePreparation(race);
-    var store = {
-        bibDetailedRotatableText: false,
-        isRelayView: false
-    };
-    function render (options) {
-        var sort = options && options.sort;
-        var sortFunc = function (a, b) {
-            return !options.isRelayView ? a.bib - b.bib: a.bib % 1000 - b.bib % 1000;
-        };
-        if (sort === 'name') {
-            sortFunc = function (a, b) {
-                var nameA = a.surname && a.surname.toLowerCase() || '';
-                var nameB = b.surname && b.surname.toLowerCase() || '';
-                if (nameA < nameB) //sort string ascending
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        } else if (sort === 'group') {
-            sortFunc = function (a, b) {
-                var nameA = a.group && a.group.name.toLowerCase() || '';
-                var nameB = b.group && b.group.name.toLowerCase() || '';
-                if (nameA < nameB) //sort string ascending
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        }else if (sort === 'organization') {
-            sortFunc = function (a, b) {
-                var nameA = a.organization && a.organization.name.toLowerCase() || '';
-                var nameB = b.organization && b.organization.name.toLowerCase() || '';
-                if (nameA < nameB) //sort string ascending
-                    return -1;
-                if (nameA > nameB)
-                    return 1;
-                return 0;
-            };
-        }
-        race.persons.sort(sortFunc);
-        var bibListBlock = document.getElementById('bib-list');
-        bibListBlock.innerHTML = '';
-        for (var _i = 0, _a = race.persons; _i < _a.length; _i++) {
-            var person = _a[_i];
-            var bibItemBlock = document.createElement('div');
-            bibItemBlock.className = 'bib-item';
-            var bibTitleBlock = document.createElement('div');
-            bibTitleBlock.className = 'bib-title';
-            var bibNumberBlock = document.createElement('div');
-            bibNumberBlock.className = 'bib-number';
-            var bibInfoBlock = document.createElement('div');
-            bibInfoBlock.className = 'bib-info';
-            var bibDetailedBlock = document.createElement('div');
-            var detildData = [
-                { title: '', value: person.surname + ' ' + person.name },
-                { title: 'Номер чипа: ', value: person.card_number || '' },
-                { title: 'Время старта: ', value: toHHMMSS(person.start_time) },
-                { title: 'Группа: ', value: person.group && person.group.name },
-                { title: 'Коллектив: ', value: person.organization && person.organization.name || '' }
-            ];
-            for (var _b = 0, detildData_ = detildData; _b < detildData_.length; _b++) {
-                var obj = detildData_[_b];
-                var itemSpan = document.createElement('span');
-                itemSpan.className = 'info-item';
-                itemSpan.appendChild(document.createTextNode(obj.title));
-                var strong = document.createElement('strong');
-                strong.appendChild(document.createTextNode(obj.value));
-                itemSpan.appendChild(strong);
-                bibDetailedBlock.appendChild(itemSpan);
-                bibDetailedBlock.appendChild(document.createElement('br'));
-            }
-            var bibDetailedRotatableBlock = bibDetailedBlock.cloneNode(true);
-            bibDetailedBlock.className = 'left-info';
-            bibDetailedRotatableBlock.className = 'right-info rotatable';
-            bibTitleBlock.appendChild(document.createTextNode(race.data.title));
-            bibTitleBlock.appendChild(document.createElement('br'));
-            bibTitleBlock.appendChild(document.createTextNode(''));
-            bibNumberBlock.appendChild(document.createTextNode(!options.isRelayView ? person.bib : person.bib % 1000 + '.' + ~~(person.bib / 1000)));
-            bibInfoBlock.appendChild(bibDetailedBlock);
-            if (options && options.bibDetailedRotatableText) {
-                bibInfoBlock.appendChild(bibDetailedRotatableBlock);
-            }
-            bibItemBlock.appendChild(bibTitleBlock);
-            bibItemBlock.appendChild(bibNumberBlock);
-            bibItemBlock.appendChild(bibInfoBlock);
-            bibListBlock.appendChild(bibItemBlock);
-            var newPageBlock = document.createElement('div');
-            newPageBlock.className = 'new-page';
-            bibListBlock.appendChild(newPageBlock);
-        }
-    }
-    render(store);
-    new SettingsGenerator([
-        {
-            title: 'Сортировать по: ',
-            value: [
-                {text: 'номеру', value: 'bib'},
-                {text: 'имени', value: 'name'},
-                {text: 'группе', value: 'group'},
-                {text: 'коллективу', value: 'organization'}
-            ],
-            change: function (arr) {
-                store.sort = arr[0];
-                render(store);
-            }
-        },
-        {
-            title: 'Отображать перевернутые данные',
-            value: store.bibDetailedRotatableText,
-            change: function (checked) {
-                store.bibDetailedRotatableText = checked;
-                render(store);
-            }
-        },
-        {
-            title: '1002 -> 2.1',
-            value: store.isRelayView,
-            change: function (checked) {
-                store.isRelayView = checked;
-                render(store);
-            }
-        }
-    ]).show()
-</script>
-{% endraw %}
-</body>
-</html>
diff --git a/templates/split/1_split_printout.html b/templates/split/1_split_printout.html
index c1204db7..1f0659da 100644
--- a/templates/split/1_split_printout.html
+++ b/templates/split/1_split_printout.html
@@ -143,9 +143,9 @@
         {{ race.data.title }}
         <br> {{ race.data.start_datetime|date }}
         <h2>{{ person.surname }} {{ person.name }} - {{ group.name }}</h2>
-        <br> Команда: {{organization.name}}
-        <br> Номер: {{person.bib}} Card: {{person.card_number}}
-        <br> Старт: {{result.start_msec|tohhmmss}}
+        <br> Team: {{organization.name}}
+        <br> BIB: {{person.bib}} Card: {{person.card_number}}
+        <br> Start: {{result.start_msec|tohhmmss}}
         <table>
         {% for leg in result.splits %}
             {% if leg.is_correct %}
@@ -159,7 +159,7 @@ <h2>{{ person.surname }} {{ person.name }} - {{ group.name }}</h2>
                         <td>{{leg.leg_place}}</td>
                      {% else %}
                         <td></td>
-                    {% endif %}    
+                    {% endif %}
                     <td></td>
                 </tr>
             {% else %}
@@ -174,25 +174,25 @@ <h2>{{ person.surname }} {{ person.name }} - {{ group.name }}</h2>
             {% endif %}
         {% endfor %}
         </table>
-        <br> Финиш: {{result.finish_msec|tohhmmss}} {{result.speed}}
+        <br> Finish: {{result.finish_msec|tohhmmss}} {{result.speed}}
         {% if race['settings'].get('result_processing_mode', 'time') == 'scores' and result.rogaine_penalty > 0 %}
-        <br> Набрано очков: {{result.rogaine_score + result.rogaine_penalty}}
-        <br> Штраф за превышение: {{result.rogaine_penalty}}
+        <br> Score: {{result.rogaine_score + result.rogaine_penalty}}
+        <br> Penalty: {{result.rogaine_penalty}}
         {% endif%}
         {% if race['settings'].get('marked_route_mode', 'off') == 'laps' %}
-        <br> Штрафных кругов: {{result.penalty_laps}}
+        <br> Penalty laps: {{result.penalty_laps}}
         {% elif race['settings'].get('marked_route_mode', 'off') == 'time' %}
-        <br> Штраф: {{result.penalty_time|tohhmmss}}
+        <br> Penalty: {{result.penalty_time|tohhmmss}}
         {% endif %}
-        <br> Результат: {{result.result}}
+        <br> Result: {{result.result}}
         {% if result.place > 0 %}
-            <br> Место: {{result.place}} из {{group.count_finished}} (всего {{group.count_person}})
+            <br> Place: {{result.place}}/{{group.count_finished}} ({{group.count_person}})
             {% if "can_win_count" in result %}
                 {% if result.can_win_count > 0 %}
-                    <br>Вас могут выиграть: {{result.can_win_count}} чел.
-                    <br>В {{result.final_result_time}} определится результат
+                    <br>The number of participants can overtake and beat you: {{result.can_win_count}}
+                    <br>Final result at {{result.final_result_time}}
                 {% else %}
-                    <br>Вас уже никто не обгонит!
+                    <br>No participant can beat you
                 {% endif %}
             {% endif %}
         {% endif %}
@@ -200,9 +200,9 @@ <h2>{{ person.surname }} {{ person.name }} - {{ group.name }}</h2>
             {% for control in course.controls %}
                 {{control.code}}
             {% endfor %}<br>
-			<h1>ПЛОХАЯ ОТМЕТКА</h1>
+			<h1>BAD</h1>
 		{% else %}
-			<h1>ОТМЕТКА - OK</h1>
+			<h1>OK</h1>
         {% endif %}
         <table class="small-text">
             {% for item in items %}
@@ -219,4 +219,4 @@ <h1>ОТМЕТКА - OK</h1>
         <br> {{ race.data.url }}
     </code>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/templates/split/1_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\321\201_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\265\320\274.html" "b/templates/split/1_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\321\201_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\265\320\274.html"
deleted file mode 100644
index 6fb4c87b..00000000
--- "a/templates/split/1_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\321\201_\320\270\320\267\320\276\320\261\321\200\320\260\320\266\320\265\320\275\320\270\320\265\320\274.html"
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        td {
-            padding-right: 7px;
-        }
-
-		code{
-			font-family: Lucida console;
-			font-weight: normal;
-			font-size: 12px;
-			line-height: 14px;
-		}
-		code2{
-			font-family: Lucida console;
-			font-weight: bold;
-			font-size: 15px;
-		}
-    </style>
-    {% endraw %}
-</head>
-<body>
-    <code>
-        {{ race.data.title }}
-		<div style="height:12px;font-size:12px;">&nbsp;</div>
-        {{ race.data.start_datetime|date }}, {{ race.data.location }}
-        <br> <code2>{{ person.surname }} {{ person.name }}</code2>
-		<br> Группа: {{ group.name }}
-        <br> Команда: {{organization.name}}
-        <br> Номер: {{person.bib}} Номер чипа: {{person.card_number}}
-        <br> Старт: {{result.start_msec|tohhmmss}}
-        <table>
-        {% for leg in result.splits %}
-            {% if leg.is_correct %}
-                <tr>
-                    <td>{{leg.course_index}}</td>
-                    <td>{{leg.code}}</td>
-                    <td>{{leg.relative_time|tohhmmss}}</td>
-                    <td>{{leg.leg_time|tohhmmss('%M:%S')}}</td>
-                    <td>{{leg.speed}}</td>
-                    <td>{{leg.leg_place}}</td>
-                    <td></td>
-                    {% set data = namespace(plus='') %}
-					{% for control in course.controls %}
-                        {% if leg.code == (control.code[0:3] | replace('(', '')) %}
-                            {% set data.plus = '+' %}
-                        {% endif %}
-                    {% endfor %}
-                    {{ data.plus }}
-                </tr>
-            {% else %}
-                <tr>
-                    <td></td>
-                    <td>{{leg.code}}</td>
-                    <td>{{leg.relative_time|tohhmmss}}</td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-            {% endif %}
-        {% endfor %}
-        </table>
-		<div style="height:12px;font-size:12px;">&nbsp;</div>
-        <br> Финиш: {{result.finish_msec|tohhmmss}} {%if result.splits|length > 0%} {{(result.finish_msec - result.splits[-1].relative_time - result.start_msec)|tohhmmss('%M:%S')}} {%endif%}
-        <br> Результат: {{result.result}} {{result.speed}}
-        {% if 'result_current' in result and result.result_current != result.result%}
-            <br> Рез.этапа: {{result.result_current}}
-        {% endif %}
-        {% if race.settings.marked_route_mode == 'time' %}
-		    <br> Штраф, время: {{result.penalty_time|tohhmmss('%H:%M:%S')}}
-        {% endif %}
-        {% if race.settings.marked_route_mode == 'laps' %}
-            <br> Штраф, круги: {{result.penalty_laps}}
-        {% endif %}
-        {% if result.place > 0 %}
-            <br> Место: {{result.place}} из {{group.count_finished}} (всего {{group.count_person}})
-        {% endif %}
-        <br>
-        {% if result.status != 1 %}
-			<code2>Отметка: ПЛОХАЯ</code2>
-			<br>
-            {% for control in course.controls %}
-                ({{control.code[3:] | replace('(', '')}}
-            {% endfor %}
-		{% else %}	
-			<code2>Отметка: ОК</code2>
-        {% endif %}
-		<br>
-		Предварительные результаты
-        <table>
-            {% for item in items %}
-                {% if item.result.place|int < 11 and item.result.place|int > 0 %}
-                    <tr>
-                        <td>{{item.result.place}}</td>
-                        <td>{{item.person.surname}} {{item.person.name}}</td>
-                        <td>{{item.result.result}}</td>
-                    </tr>
-                {% endif %}
-            {% endfor %}
-        </table>
-        <br> {{ race.data.url }}
-		<!-- 
-		<br><img src="C:\img.png"  width="150" align="left"> 
-		-->
-		<br> 
-		<img src="C:\Program Files (x86)\SportOrg\templates\split\qr-code.png" width="200">
-		<br>
-		<img src="C:\Program Files (x86)\SportOrg\templates\split\img.png" width="200">
-    </code>
-</body>
-</html>
\ No newline at end of file
diff --git "a/templates/split/1_\321\201\320\277\320\273\320\270\321\202\321\213_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\321\202\320\276\320\273\321\214\320\272\320\276_\321\210\321\202\321\200\320\260\321\204.html" "b/templates/split/1_\321\201\320\277\320\273\320\270\321\202\321\213_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\321\202\320\276\320\273\321\214\320\272\320\276_\321\210\321\202\321\200\320\260\321\204.html"
deleted file mode 100644
index b6618c31..00000000
--- "a/templates/split/1_\321\201\320\277\320\273\320\270\321\202\321\213_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\321\202\320\276\320\273\321\214\320\272\320\276_\321\210\321\202\321\200\320\260\321\204.html"
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        td {
-            padding-right: 7px;
-        }
-		code{
-			font-family: Lucida console;
-			font-weight: normal;
-			font-size: 12px;
-			line-height: 14px;
-		}
-		code2{
-			font-family: Lucida console;
-			font-weight: bold;
-			font-size: 15px;
-		}
-    </style>
-    {% endraw %}
-</head>
-<body>
-    <code>
-        {{ race.data.title }}
-		<div style="height:12px;font-size:12px;">&nbsp;</div>
-        {{ race.data.start_datetime|date }}, {{ race.data.location }}
-        <br> <code2>{{ person.surname }} {{ person.name }}</code2>
-		<br> Группа: {{ group.name }}
-        <br> Команда: {{organization.name}}
-        <br> Номер: {{person.bib}} Номер чипа: {{person.card_number}}
-        <br> Старт: {{result.start_msec|tohhmmss}}
-        <table>
-        {% for leg in result.splits %}
-            {% if leg.is_correct %}
-                <tr>
-                    <td>{{leg.course_index}}</td>
-                    <td>{{leg.code}}</td>
-                    <td>{{leg.relative_time|tohhmmss}}</td>
-                    <td>{{leg.leg_time|tohhmmss('%M:%S')}}</td>
-                    <td>{{leg.speed}}</td>
-                    <td>{{leg.leg_place}}</td>
-                    <td></td>
-                    {% set data = namespace(plus='') %}
-					{% for control in course.controls %}
-                        {% if leg.code == (control.code[0:3] | replace('(', '')) %}
-                            {% set data.plus = '+' %}
-                        {% endif %}
-                    {% endfor %}
-                    <!--{{ data.plus }}-->
-                </tr>
-            {% else %}
-                <tr>
-                    <td></td>
-                    <td>{{leg.code}}</td>
-                    <td>{{leg.relative_time|tohhmmss}}</td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-            {% endif %}
-        {% endfor %}
-        </table>
-		<div style="height:12px;font-size:12px;">&nbsp;</div>
-        <br> Финиш: {{result.finish_msec|tohhmmss}} {%if result.splits|length > 0%} {{(result.finish_msec - result.splits[-1].relative_time - result.start_msec)|tohhmmss('%M:%S')}} {%endif%}
-        <br> Результат: {{result.result}} {{result.speed}}
-        {% if 'result_current' in result and result.result_current != result.result%}
-            <br> Рез.этапа: {{result.result_current}}
-        {% endif %}
-        {% if race.settings.marked_route_mode == 'time' %}
-		    <br> Штраф, время: {{result.penalty_time|tohhmmss('%H:%M:%S')}}
-        {% endif %}
-        {% if race.settings.marked_route_mode == 'laps' %}
-            <br> Штраф, круги: {{result.penalty_laps}}
-        {% endif %}
-        {% if result.place > 0 %}
-            <br> Место: {{result.place}} из {{group.count_finished}} (всего {{group.count_person}})
-        {% endif %}
-        <br>
-        {% if result.status != 1 %}
-			<code2>Отметка: ПЛОХАЯ</code2>
-			<br>
-            {% for control in course.controls %}
-                ({{control.code[3:] | replace('(', '')}}
-            {% endfor %}
-		{% else %}
-			<code2>Отметка: ОК</code2>
-        {% endif %}
-		<br>
-		Предварительные результаты
-        <table>
-            {% for item in items %}
-                {% if item.result.place|int < 11 and item.result.place|int > 0 %}
-                    <tr>
-                        <td>{{item.result.place}}</td>
-                        <td>{{item.person.surname}} {{item.person.name}}</td>
-                        <td>{{item.result.result}}</td>
-                    </tr>
-                {% endif %}
-            {% endfor %}
-        </table>
-        <br> {{ race.data.url }}
-		<!--
-		<br><img src="C:\img.png"  width="150" align="left">
-		-->
-		<br>
-		<img src="C:\Program Files (x86)\SportOrg\templates\split\qr-code.png" width="200">
-		<br>
-		<img src="C:\Program Files (x86)\SportOrg\templates\split\img.png" width="200">
-    </code>
-</body>
-</html>
\ No newline at end of file
diff --git "a/templates/split/1_\321\202\321\200\320\270\320\260\321\202\320\273\320\276\320\275.html" "b/templates/split/1_\321\202\321\200\320\270\320\260\321\202\320\273\320\276\320\275.html"
deleted file mode 100644
index 40b2dda5..00000000
--- "a/templates/split/1_\321\202\321\200\320\270\320\260\321\202\320\273\320\276\320\275.html"
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        td {
-            padding-right: 7px;
-        }
-        body {
-            font-weight: bold;
-        }
-
-        .small-text {
-            font-size: 75%;
-        }
-
-        p,
-        blockquote,
-        ul,
-        ol,
-        dl,
-        pre {
-            margin-top: 0;
-            margin-bottom: 16px;
-        }
-
-        hr {
-            box-sizing: content-box;
-            height: 0;
-        }
-
-        hr {
-            height: 0;
-            margin: 15px 0;
-            overflow: hidden;
-            background: transparent;
-            border: 0;
-            border-bottom: 1px solid #ddd;
-        }
-
-        hr:before {
-            display: table;
-            content: "";
-        }
-
-        hr:after {
-            display: table;
-            clear: both;
-            content: "";
-        }
-
-        hr {
-            height: 4px;
-            padding: 0;
-            margin: 16px 0;
-            background-color: #e7e7e7;
-            border: 0 none;
-        }
-
-        a:not([href]) {
-            color: inherit;
-            text-decoration: none;
-        }
-
-        a {
-            color: #4078c0;
-            text-decoration: none;
-        }
-
-        a:hover,
-        a:active {
-            text-decoration: underline;
-        }
-
-        a {
-            background-color: transparent;
-        }
-
-        a:active,
-        a:hover {
-            outline: 0;
-        }
-
-        .print {
-            display: none;
-        }
-
-        .no-print {
-            display: block;
-        }
-
-        .text-center {
-            text-align: center;
-        }
-
-        @media print {
-            @page {
-                margin: 0.5cm;
-            }
-            body {
-                font-size: 85%;
-            }
-            pre {
-                margin-bottom: 1px;
-            }
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6 {
-                margin: 1px 0;
-            }
-            section {
-                page-break-before: always;
-            }
-            ul {
-                page-break-inside: avoid;
-            }
-            p {
-                widows: 4;
-            }
-            a[href^="http"]:after {
-                content: " (" attr(href) ")";
-            }
-            abbr[title]:after {
-                content: " (" attr(title) ")";
-            }
-            .print {
-                display: block;
-            }
-            .no-print {
-                display: none;
-            }
-        }
-    </style>
-    {% endraw %}
-</head>
-<body>
-    <code>
-        {{ race.data.title }}
-        <br> {{ race.data.start_datetime|date }}
-        <h2>{{ person.surname }} {{ person.name }} - {{ group.name }}</h2>
-        <br> Команда: {{organization.name}}
-        <br> Номер: {{person.bib}} Card: {{person.card_number}}
-        <br> Старт: {{result.start_msec|tohhmmss}}
-        <table>
-        {% for leg in result.splits %}
-            {% if leg.is_correct %}
-                <tr>
-                    <td>{{leg.course_index}}</td>
-                    <td>{{leg.code}}</td>
-                    <td>{{leg.relative_time|tohhmmss}}</td>
-                    <td>{{leg.leg_time|tohhmmss('%M:%S')}}</td>
-                    <td>{{leg.speed}}</td>
-                    {% if leg.leg_place %}
-                        <td>{{leg.leg_place}}</td>
-                     {% else %}
-                        <td></td>
-                    {% endif %}    
-                    {% if leg.course_index == 1 %}
-						<td>ПЛАВАНИЕ</td>
-					{% elif leg.course_index == 2 %}
-						<td>ТРАНЗИТ-1</td>
-					{% elif leg.course_index == 3 %}
-						<td>ВЕЛО</td>
-					{% elif leg.course_index == 4 %}
-						<td>ТРАНЗИТ-2</td>
-					{% elif leg.course_index == 5 %}
-						<td>БЕГ</td>
-					{% endif %} 
-                </tr>
-            {% else %}
-                <tr>
-                    <td></td>
-                    <td>{{leg.code}}</td>
-                    <td>{{leg.relative_time|tohhmmss}}</td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-            {% endif %}
-        {% endfor %}
-        </table>
-        <br> Финиш: {{result.finish_msec|tohhmmss}} {{result.speed}}
-        <br> Результат: {{result.result}}
-        {% if result.place > 0 %}
-            <br> Место: {{result.place}} из {{group.count_finished}} (всего {{group.count_person}})
-            <!--
-			{% if "can_win_count" in result %}
-                {% if result.can_win_count > 0 %}
-                    <br>Вас могут выиграть: {{result.can_win_count}} чел.
-                    <br>В {{result.final_result_time}} определится результат
-                {% else %}
-                    <br>Вас уже никто не обгонит!
-                {% endif %}
-            {% endif %}
-			<br>
-			-->
-        {% endif %}
-        <br>
-        <table>
-            {% for item in items %}
-                {% if item.result.place|int < 15 and item.result.place|int > 0 %}
-                    <tr>
-                        <td>{{item.result.place}}</td>
-                        <td>{{item.person.surname}} {{item.person.name}}</td>
-                        <td>{{item.person.bib}}</td>
-                        <td>{{item.result.result}}</td>
-                    </tr>
-                {% endif %}
-            {% endfor %}
-        </table>
-        <br> {{ race.data.url }}
-    </code>
-</body>
-</html>
\ No newline at end of file
diff --git a/templates/split/2_marked_route_penalty_A5.html b/templates/split/2_marked_route_penalty_A5.html
deleted file mode 100644
index f11a35c7..00000000
--- a/templates/split/2_marked_route_penalty_A5.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<!-- A5 paper with portrait orientation -->
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        p {
-            font-family: Arial, Helvetica, sans-serif;
-            font-weight: bold;
-            text-align: center;
-        }
-        .penalty-digit {
-            font-size: 150pt;
-        }
-        .penalty-text {
-            font-size: 90pt;
-        }
-        .penalty-outer {
-            font-size: 30pt;
-        }
-        hr {
-            width: 300%;
-            border: dashed;
-        }
-    </style>
-    {% endraw %}
-</head>
-
-<body>
-    <code>
-        <p class="penalty-outer">&nbsp;</p>
-        <p class="penalty-inner">
-            <span class="penalty-text">№</span>
-            <span class="penalty-digit">{{person.bib}}</span>
-        </p>
-        <p class="penalty-outer">&nbsp;</p>
-        <hr>
-        <p class="penalty-outer">&nbsp;</p>
-        <p class="penalty-inner">
-            <span class="penalty-digit">{{result.penalty_laps}}</span>
-            <span class="penalty-text">кр.</span>
-        </p>
-    </code>
-</body>
-
-</html>
\ No newline at end of file
diff --git "a/templates/split/2_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_WO.html" "b/templates/split/2_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_WO.html"
deleted file mode 100644
index ec4106bc..00000000
--- "a/templates/split/2_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_WO.html"
+++ /dev/null
@@ -1,158 +0,0 @@
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        td {
-            padding-right: 7px;
-        }
-        body {
-            font-weight: bold;
-        }
-
-        .small-text {
-            font-size: 75%;
-        }
-
-        p,
-        blockquote,
-        ul,
-        ol,
-        dl,
-        pre {
-            margin-top: 0;
-            margin-bottom: 16px;
-        }
-
-        hr {
-            box-sizing: content-box;
-            height: 0;
-        }
-
-        hr {
-            height: 0;
-            margin: 15px 0;
-            overflow: hidden;
-            background: transparent;
-            border: 0;
-            border-bottom: 1px solid #ddd;
-        }
-
-        hr:before {
-            display: table;
-            content: "";
-        }
-
-        hr:after {
-            display: table;
-            clear: both;
-            content: "";
-        }
-
-        hr {
-            height: 4px;
-            padding: 0;
-            margin: 16px 0;
-            background-color: #e7e7e7;
-            border: 0 none;
-        }
-
-        a:not([href]) {
-            color: inherit;
-            text-decoration: none;
-        }
-
-        a {
-            color: #4078c0;
-            text-decoration: none;
-        }
-
-        a:hover,
-        a:active {
-            text-decoration: underline;
-        }
-
-        a {
-            background-color: transparent;
-        }
-
-        a:active,
-        a:hover {
-            outline: 0;
-        }
-
-        .print {
-            display: none;
-        }
-
-        .no-print {
-            display: block;
-        }
-
-        .text-center {
-            text-align: center;
-        }
-
-        @media print {
-            @page {
-                margin: 0.5cm;
-            }
-            body {
-                font-size: 85%;
-            }
-            pre {
-                margin-bottom: 1px;
-            }
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6 {
-                margin: 1px 0;
-            }
-            section {
-                page-break-before: always;
-            }
-            ul {
-                page-break-inside: avoid;
-            }
-            p {
-                widows: 4;
-            }
-            a[href^="http"]:after {
-                content: " (" attr(href) ")";
-            }
-            abbr[title]:after {
-                content: " (" attr(title) ")";
-            }
-            .print {
-                display: block;
-            }
-            .no-print {
-                display: none;
-            }
-        }
-    </style>
-    {% endraw %}
-</head>
-<body>
-    <code>
-		<br>
-		<br>
-		<br>
-		<br>
-		<br>
-        <p style="font-size:80px;">N {{person.bib}}</p>
-		<p style="font-size:80px;">----</p>
-		{% if result.status == 1 %}
-			<p style="font-size:80px;">{{result.penalty_laps}} круг</p>
-		{% else %}
-			<p style="font-size:80px;">СНЯТ</p>
-        {% endif %}
-    </code>
-</body>
-</html>
\ No newline at end of file
diff --git "a/templates/split/2_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\320\275\320\276\320\274\320\265\321\200_\320\270_\321\210\321\202\321\200\320\260\321\204.html" "b/templates/split/2_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\320\275\320\276\320\274\320\265\321\200_\320\270_\321\210\321\202\321\200\320\260\321\204.html"
deleted file mode 100644
index 4194db58..00000000
--- "a/templates/split/2_\320\274\320\260\321\200\320\272\320\270\321\200\320\276\320\262\320\272\320\260_\320\275\320\276\320\274\320\265\321\200_\320\270_\321\210\321\202\321\200\320\260\321\204.html"
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        td {
-            padding-right: 7px;
-        }
-        body {
-            font-weight: bold;
-        }
-
-        .small-text {
-            font-size: 75%;
-        }
-
-        p,
-        blockquote,
-        ul,
-        ol,
-        dl,
-        pre {
-            margin-top: 0;
-            margin-bottom: 16px;
-        }
-
-        hr {
-            box-sizing: content-box;
-            height: 0;
-        }
-
-        hr {
-            height: 0;
-            margin: 15px 0;
-            overflow: hidden;
-            background: transparent;
-            border: 0;
-            border-bottom: 1px solid #ddd;
-        }
-
-        hr:before {
-            display: table;
-            content: "";
-        }
-
-        hr:after {
-            display: table;
-            clear: both;
-            content: "";
-        }
-
-        hr {
-            height: 4px;
-            padding: 0;
-            margin: 16px 0;
-            background-color: #e7e7e7;
-            border: 0 none;
-        }
-
-        a:not([href]) {
-            color: inherit;
-            text-decoration: none;
-        }
-
-        a {
-            color: #4078c0;
-            text-decoration: none;
-        }
-
-        a:hover,
-        a:active {
-            text-decoration: underline;
-        }
-
-        a {
-            background-color: transparent;
-        }
-
-        a:active,
-        a:hover {
-            outline: 0;
-        }
-
-        .print {
-            display: none;
-        }
-
-        .no-print {
-            display: block;
-        }
-
-        .text-center {
-            text-align: center;
-        }
-
-        @media print {
-            @page {
-                margin: 0.5cm;
-            }
-            body {
-                font-size: 85%;
-            }
-            pre {
-                margin-bottom: 1px;
-            }
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6 {
-                margin: 1px 0;
-            }
-            section {
-                page-break-before: always;
-            }
-            ul {
-                page-break-inside: avoid;
-            }
-            p {
-                widows: 4;
-            }
-            a[href^="http"]:after {
-                content: " (" attr(href) ")";
-            }
-            abbr[title]:after {
-                content: " (" attr(title) ")";
-            }
-            .print {
-                display: block;
-            }
-            .no-print {
-                display: none;
-            }
-        }
-    </style>
-    {% endraw %}
-</head>
-<body>
-    <code>
-		<br>
-		<br>
-		<br>
-		<br>
-		<br>
-        <p style="font-size:80px;">{{person.bib|int%1000}}.{{person.bib|int//1000}}</p>
-		<p style="font-size:80px;">----</p>
-		{% if result.status == 1 %}
-			<p style="font-size:180px;"> {%if result.penalty_laps %}{{result.penalty_laps}} {% else %} 0{% endif %}</p>
-			<p style="font-size:70px;">штраф</p>
-		{% else %}
-			<p style="font-size:180px;">2</p>
-			<!-- нас попросили в случае снятия участника писать 2, чтобы он не расстраивался (до этого писали "СНЯТ")
-			Если решат всех восстановить, то хотя бы будет понятно, сколько времени участник ехал штрафной круг по времени
-			-->
-        {% endif %}
-    </code>
-</body>
-</html>
\ No newline at end of file
diff --git a/templates/split/3_marked_route_penalty_80mm.html b/templates/split/3_marked_route_penalty_80mm.html
deleted file mode 100644
index 04fe7a47..00000000
--- a/templates/split/3_marked_route_penalty_80mm.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<!-- A5 paper with portrait orientation -->
-<head>
-    <meta charset="UTF-8">
-    <title>{{name}} Split</title>
-    {% raw %}
-    <style>
-        p {
-            font-family: Arial, Helvetica, sans-serif;
-            font-weight: bold;
-            text-align: left;
-            padding-top: 250px;
-
-        }
-        .penalty-digit {
-            font-size: 96pt;
-        }
-        .penalty-text {
-            font-size: 32pt;
-        }
-        .penalty-outer {
-            font-size: 60pt;
-            font-weight: 100;
-        }
-        hr {
-            width: 300%;
-            border: dashed;
-        }
-        div {
-        }
-    </style>
-    {% endraw %}
-</head>
-
-<body>
-    <code>
-        <div><div>
-        <p class="penalty-inner">
-            <span class="penalty-text">№</span>
-            <span class="penalty-digit">{{person.bib}}</span>
-        </p>
-        <div><div>
-        <hr>
-        <p class="penalty-outer">&nbsp;</p>
-        <p class="penalty-inner">
-            <span class="penalty-digit">{% if result.penalty_laps %}{{result.penalty_laps}}{% else %}0{% endif %}</span>
-            <span class="penalty-text">кр.</span>
-        </p>
-        <div><div>
-    </code>
-</body>
-
-</html>
\ No newline at end of file