Merge branch 'IT18109290_Dewmal' into 'master'

It18109290 dewmal

See merge request !84

UI/app.js

@@ -99,7 +99,6 @@ if(result != null){
                 </div>
             </div>`
 
-
         })
         .catch(error => console.log('error'))
 })

UI/results.html

@@ -38,6 +38,10 @@
 
             <button class="btn btn-primary" id="result" hidden>View Result</button>
 
+            <div id="imageView" style="">
+
+            </div>
+
             <div id="dataSection">
 
             </div>

app.py

@@ -480,7 +480,7 @@ def GetAllData():
     data2 = {'id': faceRecogData.id, 'Name': faceRecogData.Name, 'Age': faceRecogData.Age,
              'Gender': faceRecogData.Gender, 'DOB': faceRecogData.DOB, 'Address': faceRecogData.Address,
              'Blood_Group': faceRecogData.Blood_Group, 'NIC': faceRecogData.NIC, 'Height': faceRecogData.Height,
-             'Crimes': faceRecogData.Crimes, 'Profile_picture': faceRecogData.Profile_picture}
+             'Crimes': faceRecogData.Crimes}
     data3 = {'id': figureData.id, 'age': figureData.age, 'gender': figureData.gender, 'height': figureData.height}
 
     return jsonify(data1, data2, data3)

face_detection_recognition/db_Handler.py

@@ -18,9 +18,9 @@ def return_data():
             cursor.execute(
                 "CREATE TABLE criminal_result(id int(11) NOT NULL, Name varchar(100) NOT NULL, Age int(11) NOT NULL,"
                 " Gender varchar(100) NOT NULL, DOB date NOT NULL, Address varchar(100) NOT NULL, Blood_Group varchar(100) NOT NULL,"
-                " NIC int(11) DEFAULT NULL,Height float NOT NULL, Crimes varchar(100) NOT NULL,Profile_picture varchar(100) NOT NULL)")
+                " NIC int(11) DEFAULT NULL,Height float NOT NULL, Crimes varchar(100) NOT NULL)")
             # print("Criminal Result Table Created")
-            sql = "INSERT INTO criminal_investigation.criminal_result SELECT criminals_details.id,criminals_details.Name,criminals_details.Age,criminals_details.Gender, criminals_details.DOB,criminals_details.Address,criminals_details.Blood_Group,criminals_details.NIC,criminals_details.Height, criminals_details.Crimes, criminals_details.Profile_picture" \
+            sql = "INSERT INTO criminal_investigation.criminal_result SELECT criminals_details.id,criminals_details.Name,criminals_details.Age,criminals_details.Gender, criminals_details.DOB,criminals_details.Address,criminals_details.Blood_Group,criminals_details.NIC,criminals_details.Height, criminals_details.Crimes " \
                   "FROM criminals LEFT JOIN criminals_details ON (criminals_details.id = criminals.cID)" \
                   "WHERE criminals.SNo = SNo = 1"
             cursor.execute(sql)

main.js

@@ -4,8 +4,8 @@ require('electron-reload')(__dirname)
 
 function createWindow() {
     const mainWindow = new BrowserWindow({
-        width: 800,
-        height: 600
+        width: 1000,
+        height: 800
     })
 
     mainWindow.loadFile(__dirname + '/UI/loading.html')