anto

js/index.js

@@ -2,6 +2,10 @@
 function display_projects() {
   // Get data from API and then generate HTML code to display the data in a table
   const table = document.getElementById("table-projects");
+  const form = document.getElementById("add-project")
+  form.addEventListener('click', () => {
+    console.log("test")
+  });
   let datas = `<tr>
                 <th>Id</th>
                 <th>Name</th>

js/projet_detail.js

@@ -125,7 +125,6 @@ document.addEventListener("DOMContentLoaded", async () => {
     }
     const choice = choiceSelect.value
     const measurementIds = getMeasurementsIdsFromForm(choice,firstInput,lastInput);
-    console.log(measurementIds)
     postNewVideo(projectId, measurementIds, nameVideo, videoResolution, videoDuration)
       .then(()=>{
         alert('Nouvelle vidéo enregistrée :\nNom : ' + nameVideo +
@@ -231,17 +230,17 @@ async function generateViewMetric(projectId) {
   let samples;
   if(videoId!=-1){
     currentVideoDatas = await getDataVideoFromApi(videoId);
-    const pathToVideo = await getVideoFromApi(videoId)
-    samples = currentVideoDatas[0]["measurement_ids"];
+    samples = JSON.parse(currentVideoDatas[0]["measurement_ids"]);
     videoPlaceHolder.innerHTML=`
     <video width="600" controls>
-    <source src="path/to/your/video.mp4" type="video/mp4">
+    <source src="https://timelapse.kerboul.me/api/cat" type="video/mp4">
     Your browser does not support the video tag.
   </video>`
+  tempoMeasure=filterAndSortMeasurementsByNumber(measurements, samples)
   } else {
     samples=measurements.map(measurements => measurements.id);
+    tempoMeasure = filterAndSortMeasurementsByIds(measurements, samples);
   }
-  tempoMeasure = filterAndSortMeasurementsByIds(measurements, samples);
   tempoMeasure.forEach((measure) => {
     datesMeasurement.push(measure.timestamp);
     Temperature.push(measure.temperature);

js/utilities/populate.js

@@ -2,7 +2,6 @@ async function PopulateSelect(mySelect, id) {
   let data = [];
   if (mySelect.name == "videos" && id != null) {
     data = await getDataProjectVideosFromApi(id);
-    console.log(data)
     const selectObjDefault = document.createElement("option");
     selectObjDefault.value = -1;
     selectObjDefault.innerHTML = "Default";

js/utilities/routes.js

@@ -102,7 +102,7 @@ async function postNewVideo(project_id, measurements_id, name_video, resolution,
 async function getVideoFromApi(id) {
   try {
     const response = await $.ajax({
-      url: api_url.concat(`/videos/${id}`),
+      url: api_url.concat(`/cat/`),
       method: "GET",
       dataType: "json",
     });

js/utilities/tools.js

@@ -1,5 +1,4 @@
 function convertStringToArray(string) {
-  console.log(string)
   const numberStrings = string.replace(/[{}]/g, '').split(',');
 
   // Trim whitespace and convert the string numbers to integers
@@ -13,6 +12,13 @@ function filterAndSortMeasurementsByIds(measurements, ids) {
     .filter((measurement) => ids.includes(measurement.id))
     .sort((a, b) => new Date(a.timestamp) - new Date(b.timestamp));
 }
+function filterAndSortMeasurementsByNumber(measurements, Numbers) {
+  // Filter measurements based on their position in the Numbers array
+  const filteredMeasurements = Numbers.map(index => measurements[index - 1]).filter(measurement => measurement !== undefined);
+
+  // Sort the filtered measurements by their timestamp
+  return filteredMeasurements.sort((a, b) => new Date(a.timestamp) - new Date(b.timestamp));
+}
 
 function checkVideoPath(videos, name) {
   let res = true;