Add feature to show if image has been labelled

2knal · Feb 29, 2020 · 6c99ed3 · 6c99ed3
1 parent ef3f44f
commit 6c99ed3
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 49 deletions.
diff --git a/labellab-client/src/components/project/images.js b/labellab-client/src/components/project/images.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
 import { Link } from 'react-router-dom'
-import { Table, Button, Form, Dimmer, Loader } from 'semantic-ui-react'
+import { Table, Button, Form, Dimmer, Loader, Icon } from 'semantic-ui-react'
 import { AutoSizer, List } from 'react-virtualized'
 import { submitImage, deleteImage, fetchProject } from '../../actions/index'
 import './css/images.css'
@@ -209,7 +209,10 @@ const columnStyles = [
 
 const Row = ({ image, projectId, style, onDelete, imageId }) => (
   <Table.Row style={{ ...style, display: 'flex' }}>
-    <Table.Cell style={columnStyles[0]}>{imageId + 1}</Table.Cell>
+    <Table.Cell style={columnStyles[0]}>
+      {imageId + 1}
+      {image.labelled ? <Icon name="checkmark green"></Icon> : null}
+    </Table.Cell>
     <Table.Cell style={columnStyles[1]}>
       <a
         href={

diff --git a/labellab-server/controller/image/imageControls.js b/labellab-server/controller/image/imageControls.js
@@ -165,7 +165,12 @@ exports.updateLabels = function(req, res) {
         {
           _id: req.params.imageId
         },
-        { height: data.height, width: data.width, labelData: data.labels },
+        {
+          height: data.height,
+          width: data.width,
+          labelData: data.labels,
+          labelled: true
+        },
         { new: true }
       ).exec(function(err, image) {
         if (err) {
@@ -217,50 +222,52 @@ exports.updateLabels = function(req, res) {
 }
 
 exports.deleteImage = function(req, res) {
-	if (req && req.params && req.params.imageId) {
-		Image.findOne({
-			           _id:req.params.imageId
-			        }).exec(function(err,image){
-			            if(err){
-			                return res.status(400).send({
-			                    success: false,
-			                    msg: 'Unable to connect to database. Please try again.',
-			                    error: err
-			                })
-			            }else{
-			            Image.findOneAndDelete({
-			                    _id: image
-			            })
-			            fs.unlinkSync(path.join(__dirname,"../../",`public/uploads/${image.imageUrl}`))
-			            }
-			        })
-		Image.findOneAndDelete({
-			_id: req.params.imageId
-		}).exec(function(err, image) {
-			if (err) {
-				return res.status(400).send({
-					success: false,
-					msg: 'Unable to connect to database. Please try again.',
-					error: err
-				})
-			} else {
-				Project.findOneAndUpdate(
-					{ _id: image.project },
-					{ $pull: { image: req.params.imageId } }
-				).exec(function(err, project) {
-					if (err) {
-						return res.status(400).send({
-							success: false,
-							msg: 'Cannot delete image',
-							error: err
-						})
-					}
-					return res.json({
-						success: true,
-						msg: 'Image deleted successfully!'
-					})
-				})
-			}
-		})
-	} else res.status(400).send({ success: false, msg: 'Invalid Data' })
+  if (req && req.params && req.params.imageId) {
+    Image.findOne({
+      _id: req.params.imageId
+    }).exec(function(err, image) {
+      if (err) {
+        return res.status(400).send({
+          success: false,
+          msg: 'Unable to connect to database. Please try again.',
+          error: err
+        })
+      } else {
+        Image.findOneAndDelete({
+          _id: image
+        })
+        fs.unlinkSync(
+          path.join(__dirname, '../../', `public/uploads/${image.imageUrl}`)
+        )
+      }
+    })
+    Image.findOneAndDelete({
+      _id: req.params.imageId
+    }).exec(function(err, image) {
+      if (err) {
+        return res.status(400).send({
+          success: false,
+          msg: 'Unable to connect to database. Please try again.',
+          error: err
+        })
+      } else {
+        Project.findOneAndUpdate(
+          { _id: image.project },
+          { $pull: { image: req.params.imageId } }
+        ).exec(function(err, project) {
+          if (err) {
+            return res.status(400).send({
+              success: false,
+              msg: 'Cannot delete image',
+              error: err
+            })
+          }
+          return res.json({
+            success: true,
+            msg: 'Image deleted successfully!'
+          })
+        })
+      }
+    })
+  } else res.status(400).send({ success: false, msg: 'Invalid Data' })
 }