Projekt

Obecné

Profil

« Předchozí | Další » 

Revize b88dd6bb

Přidáno uživatelem Jan Kohlíček před téměř 7 roky(ů)

refs #6949: rozdělení app.js do více souborů, grafy mají vlastní directive, gulp rozšířen o build-js

Zobrazit rozdíly:

frontend/index.php
15 15
          integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
16 16
    <link rel="stylesheet" media="screen" href="./assets/css/styles.min.css">
17 17

  
18
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.10/angular.min.js"></script>
19
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.10/angular-route.min.js"></script>
20
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.10/angular-resource.min.js"></script>
21
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.10/angular-sanitize.min.js"></script>
18
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.0/angular.min.js"></script>
19
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.0/angular-resource.min.js"></script>
20
    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.0/angular-sanitize.min.js"></script>
22 21

  
23 22
    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"></script>
24 23
    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
25 24

  
25
    <?php
26
    //$base_url = 'http://students.kiv.zcu.cz/~valesz/index.php/api/v1';
27
    $base_url = './../backend/public/api/v1';
26 28

  
29
    include_once '../backend/lib/generateToken.php';
30
    $token = generateToken();
31
    ?>
27 32
    <script>
28
        <?php
29
        /* JEN PRO TESTOVANI, POZDEJI SE ODSTRANIT, A NAHRADIT NASDILENOU KNIHOVNOU */
30
        //$base_url = 'http://students.kiv.zcu.cz/~valesz/index.php/api/v1';
31
        $base_url = './../backend/public/api/v1';
32

  
33
        include_once '../backend/lib/generateToken.php';
34
        $token = generateToken();
35
        ?>
36 33
        var API_URL = '<?=$base_url ?>';
37 34
        var API_TOKEN = '<?=$token ?>';
38 35
    </script>
39 36

  
40
    <script src="./app.js"></script>
37
    <script src="./app.min.js"></script>
41 38
</head>
42 39
<body ng-controller="mainController" class="container-fluid">
43 40

  
......
148 145
                    </div>
149 146
                </div>
150 147

  
151

  
152 148
                <div class="form-group col">
153 149
                    <label for="rangeToDate" class="invisible">Období</label>
154 150
                    <input type="date" id="rangeToDate"
......
162 158
                </div>
163 159
            </div>
164 160

  
165

  
166 161
            <div class="form-row">
167 162
                <div class="form-group col">
168 163
                    <label for="rangeFromTime">
......
205 200

  
206 201
        <div id="graphs" ng-show="$root.selectDevice!=null && $root.selectDevice.traffics.length>0 && !showInfoLoading">
207 202
            <h4 class="mt-4">Průměrná rychlost</h4>
208
            <canvas id="graphAverageSpeed"></canvas>
203
            <graph-average-speed></graph-average-speed>
209 204

  
210 205
            <h4 class="mt-4">Počet vozidel</h4>
211
            <canvas id="graphNumberVehicles" class="mb-5"></canvas>
206
            <graph-number-vehicles></graph-number-vehicles>
212 207

  
213 208
            <div class="text-center">
214 209
                <a class="btn btn-dark" href="{{ urlExportCsv }}" role="button">Export CSV</a>

Také k dispozici: Unified diff