Fix issue with time left

Author: Stefano Malagò

frontend/src/interfaces/Dataset.ts

@@ -1,13 +1,13 @@
 export interface Dataset {
     "name": string,
-    "creation_data": Date,
+    "creation_data": string,
     "dataset_id": string,
     "questions": [Question]
 }
 
 export interface DatasetDesc {
     "name": string,
-    "creation_data": Date,
+    "creation_data": string,
     "dataset_id": string,
     "nr_questions": number,
     "clusters_computed": number

frontend/src/pages/tagging/DatasetSelection.tsx

@@ -59,16 +59,20 @@ function DatasetSelection() {
                 <TableBody>
                     {datasets.map((dataset: DatasetDesc) => {
                         const loading_cluster = dataset.clusters_computed != dataset.nr_questions
-                        // const needed_time_s = 1000 * 60 * 2 * dataset.nr_questions
-                        // const started = new Date(dataset.creation_data)
-                        // const now = new Date()
-                        //
-                        // const time_left = needed_time_s - (now.getTime() - started.getTime()) - now.getTimezoneOffset() * 1000 * 60
-                        //
-                        // const time_left_minutes = Math.floor(time_left / (60 * 1000))
-                        // const seconds = Math.floor((time_left - time_left_minutes * (60 * 1000)) / (1000))
-                        //
-                        // const time_left_seconds = seconds < 10 ? '0' + seconds : seconds
+                        const needed_time_s = 1000 * 60 * 2 * dataset.nr_questions
+                        const started = new Date(dataset.creation_data)
+                        const now = new Date()
+
+                        const time_left = needed_time_s - (now.getTime() - started.getTime())
+
+                        const time_left_minutes = Math.max(Math.floor(time_left / (60 * 1000)), 0)
+                        const seconds = Math.floor((time_left - time_left_minutes * (60 * 1000)) / (1000))
+
+                        const time_left_seconds = seconds < 10 ? '0' + seconds : seconds
+
+                        const displayed_time = time_left_minutes < 1 ?
+                            '<1m' :
+                            `~${time_left_minutes}:${time_left_seconds}`
 
                         if (dataset.clusters_computed != dataset.nr_questions) {
                             return (
@@ -83,7 +87,8 @@ function DatasetSelection() {
                                         />
                                     </StyledTableCell>
                                     <StyledTableCell component={'th'} scope={'row'} style={{textAlign: 'end'}}>
-                                        {`${dataset.clusters_computed}/${dataset.nr_questions}`}
+                                        {`${dataset.clusters_computed}/${dataset.nr_questions} Time Left: ${
+                                            displayed_time}`}
                                     </StyledTableCell>
                                 </StyledTableRow>
                             )

tagging-service/flaskr/endpoints/upload_api.py

@@ -16,7 +16,7 @@
 DATASET_DESC = api.model('Dataset Description', {
     'dataset_id': fields.String(required=True, readonly=True, description='ID of the dataset'),
     'name': fields.String(required=True, readonly=True, description='The name of the dataset'),
-    'creation_data': fields.Date(required=True, readonly=True, description='The Date of the dataset creation'),
+    'creation_data': fields.DateTime(required=True, readonly=True, description='The Date of the dataset creation'),
     'clusters_computed': fields.Integer(required=True, readonly=True, description='Number of computed clusters'),
     'nr_questions': fields.Integer(required=True, readonly=True, description='Number of questions in dataset')
 })
@@ -35,7 +35,7 @@
 
 DATASET = api.model('Dataset', {
     "name": fields.String(required=True, readonly=True, description='Name of dataset'),
-    "creation_data": fields.Date(required=True, readonly=True, description='The Date of the Dataset creation'),
+    "creation_data": fields.DateTime(required=True, readonly=True, description='The Date of the Dataset creation'),
     "dataset_id": fields.String(required=True, readonly=True, description='ID of the Dataset'),
     "questions": fields.List(fields.Nested(QUESTION))
 })