Merge pull request #13 from Liturgical-Calendar/JohnRDOrazio/issue12

Successful / Failed test count for Resources -> API Paths

Author: JohnRDOrazio

assets/js/resources.js

@@ -234,15 +234,15 @@ const setEndpoints = (ev) => {
         ENDPOINTS.VERSION = '';
         API_PATH = '';
     }
-    const API_PORT_STR = [443, 80].includes(API_PORT) ? '' : `:${API_PORT}`;
-    ENDPOINTS.CALENDARS    = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/calendars`;
-    ENDPOINTS.DECREES     = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/decrees`;
-    ENDPOINTS.TESTS  = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/tests`;
-    ENDPOINTS.EVENTS  = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/events`;
-    ENDPOINTS.EASTER  = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/easter`;
-    ENDPOINTS.SCHEMAS  = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/schemas`;
-    ENDPOINTS.MISSALS     = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/missals`;
-    ENDPOINTS.DATA  = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/data`;
+    const API_PORT_STR  = [443, 80].includes(API_PORT) ? '' : `:${API_PORT}`;
+    ENDPOINTS.CALENDARS = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/calendars`;
+    ENDPOINTS.DECREES   = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/decrees`;
+    ENDPOINTS.TESTS     = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/tests`;
+    ENDPOINTS.EVENTS    = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/events`;
+    ENDPOINTS.EASTER    = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/easter`;
+    ENDPOINTS.SCHEMAS   = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/schemas`;
+    ENDPOINTS.MISSALS   = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/missals`;
+    ENDPOINTS.DATA      = `${API_PROTOCOL}://${API_HOST}${API_PORT_STR}${API_PATH}/data`;
     console.info(
         `APP_ENV: ${APP_ENV},
         API_PATH: ${API_PATH},
@@ -452,13 +452,13 @@ const connectWebSocket = () => {
         switch( currentState ) {
             case TestState.ExecutingResourceValidations:
                 performance.mark( 'resourceDataTestsEnd' );
-                let totalSourceDataTestTime = performance.measure( 'litcalResourceDataTestRunner', 'resourceDataTestsStart', 'resourceDataTestsEnd' );
-                $( '#totalSourceDataTestsTime' ).text( MsToTimeString( Math.round( totalSourceDataTestTime.duration ) ) );
+                let totalResourceDataTestsTime = performance.measure( 'litcalResourceDataTestRunner', 'resourceDataTestsStart', 'resourceDataTestsEnd' );
+                $( '#totalResourceDataTestsTime' ).text( MsToTimeString( Math.round( totalResourceDataTestsTime.duration ) ) );
                 break;
             case TestState.ExecutingSourceValidations:
                 performance.mark( 'sourceDataTestsEnd' );
-                let totalCalendarDataTestTime = performance.measure( 'litcalSourceDataTestRunner', 'sourceDataTestsStart', 'sourceDataTestsEnd' );
-                $( '#totalCalendarDataTestsTime' ).text( MsToTimeString( Math.round( totalCalendarDataTestTime.duration ) ) );
+                let totalSourceDataTestsTime = performance.measure( 'litcalSourceDataTestRunner', 'sourceDataTestsStart', 'sourceDataTestsEnd' );
+                $( '#totalSourceDataTestsTime' ).text( MsToTimeString( Math.round( totalSourceDataTestsTime.duration ) ) );
                 break;
         }
     };

resources.php

@@ -87,17 +87,17 @@ class="btn btn-primary" disabled
                             <div class="col-2 text-white p-2 text-center test-results bg-success">
                                 <i class="fas fa-circle-check fa-fw"></i> <?php
                                     echo _("Successful tests:");
-                                ?> <span id="successfulCalendarDataTestsCount" class="successfulCount">0</span>
+                                ?> <span id="successfulResourceDataTestsCount" class="successfulCount">0</span>
                             </div>
                             <div class="col-2 text-white p-2 text-center test-results bg-danger">
                                 <i class="fas fa-circle-xmark fa-fw"></i> <?php
                                     echo _("Failed tests:");
-                                ?> <span id="failedCalendarDataTestsCount" class="failedCount">0</span>
+                                ?> <span id="failedResourceDataTestsCount" class="failedCount">0</span>
                             </div>
                             <div class="col-3 text-white p-2 text-center test-results bg-dark">
                                 <i class="fas fa-stopwatch fa-fw"></i> <?php
-                                    echo sprintf(_("Total time for %s tests:"), "<span id=\"totalCalendarDataTestsCount\"></span>");
-                                ?> <span id="totalCalendarDataTestsTime">0 seconds, 0ms</span>
+                                    echo sprintf(_("Total time for %s tests:"), "<span id=\"totalResourceDataTestsCount\"></span>");
+                                ?> <span id="totalResourceDataTestsTime">0 seconds, 0ms</span>
                             </div>
                         </button>
                     </h2>