From 6cee2380a567fd4ef83dc5e02c218709cfe2f35b Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Tue, 24 Dec 2024 12:27:57 +0500
Subject: [PATCH 1/7] Fix bugs and add summary report.

---
 .idea/jarRepositories.xml                     |   5 +
 .../utopiaindustries/auth/ReportingRole.java  |  14 +++
 .../controller/JobCardController.java         |   2 +-
 .../controller/ReportingController.java       |  58 +++++++++++
 .../dao/ctp/SummaryInventoryReportDao.java    |  45 +++++++++
 .../ctp/SummaryInventoryReportRowMapper.java  |  23 +++++
 .../com/utopiaindustries/model/Roles.java     |   3 +-
 .../model/ctp/SummaryInventoryReport.java     |  94 ++++++++++++++++++
 .../SummaryInventoryReportQueryBuilder.java   |  72 ++++++++++++++
 .../SummaryInventoryReportService.java        |  62 ++++++++++++
 .../resources/static/js/cutting/summary.js    |  64 ++++++++++++
 src/main/resources/templates/_fragments.html  |   6 ++
 .../templates/_job-card-sidebar.html          |   8 +-
 .../templates/cutting/_bundle-sidebar.html    |   2 +-
 .../_cutting-inventory-account-sidebar.html   |   4 +-
 .../cutting/_master-bundle-sidebar.html       |   2 +-
 .../cutting/inventory-transactions.html       |   2 +-
 .../finishing/finished-item-list.html         |   5 +-
 .../templates/inventory-account-list.html     |   2 +-
 .../resources/templates/job-card-list.html    |   2 +-
 .../quality-control/qc-items-list.html        |   5 +-
 .../reporting/inventory-summary-sidebar.html  |  38 +++++++
 .../reporting/inventory-summary.html          |  55 ++++++++++
 .../stitching/_finished-item-sidebar.html     |   2 +-
 .../stitching/receive-inventory.html          |   3 +-
 .../stitching/stitched-offline-items.html     |   2 +-
 .../stitching/stitching-item-form.html        |   4 +-
 src/main/resources/templates/users.html       |   2 +-
 .../controller/JobCardController.class        | Bin 6903 -> 6894 bytes
 .../com/utopiaindustries/model/Roles.class    | Bin 1521 -> 1584 bytes
 target/classes/templates/_fragments.html      |   6 ++
 .../classes/templates/_job-card-sidebar.html  |   8 +-
 .../templates/cutting/_bundle-sidebar.html    |   2 +-
 .../_cutting-inventory-account-sidebar.html   |   4 +-
 .../cutting/_master-bundle-sidebar.html       |   2 +-
 .../cutting/inventory-transactions.html       |   2 +-
 .../finishing/finished-item-list.html         |   5 +-
 .../templates/inventory-account-list.html     |   2 +-
 target/classes/templates/job-card-list.html   |   2 +-
 .../quality-control/qc-items-list.html        |   5 +-
 .../stitching/_finished-item-sidebar.html     |   2 +-
 .../stitching/receive-inventory.html          |   3 +-
 .../stitching/stitched-offline-items.html     |   2 +-
 .../stitching/stitching-item-form.html        |   4 +-
 target/classes/templates/users.html           |   2 +-
 45 files changed, 599 insertions(+), 38 deletions(-)
 create mode 100644 src/main/java/com/utopiaindustries/auth/ReportingRole.java
 create mode 100644 src/main/java/com/utopiaindustries/controller/ReportingController.java
 create mode 100644 src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java
 create mode 100644 src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportRowMapper.java
 create mode 100644 src/main/java/com/utopiaindustries/model/ctp/SummaryInventoryReport.java
 create mode 100644 src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java
 create mode 100644 src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java
 create mode 100644 src/main/resources/static/js/cutting/summary.js
 create mode 100644 src/main/resources/templates/reporting/inventory-summary-sidebar.html
 create mode 100644 src/main/resources/templates/reporting/inventory-summary.html

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 9e4f55e..d9f4e72 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="In project repo" />
       <option name="url" value="file:///D:\Projects\uind-cut-to-pack\cut-to-pack/libs" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="in-project" />
+      <option name="name" value="In project repo" />
+      <option name="url" value="file:///D:\Project\cut-to-pack-service/libs" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/utopiaindustries/auth/ReportingRole.java b/src/main/java/com/utopiaindustries/auth/ReportingRole.java
new file mode 100644
index 0000000..043416a
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/auth/ReportingRole.java
@@ -0,0 +1,14 @@
+package com.utopiaindustries.auth;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@PreAuthorize( "hasAnyRole('ROLE_REPORTING','ROLE_ADMIN')")
+public @interface ReportingRole {
+}
diff --git a/src/main/java/com/utopiaindustries/controller/JobCardController.java b/src/main/java/com/utopiaindustries/controller/JobCardController.java
index 1387d1a..91324cc 100644
--- a/src/main/java/com/utopiaindustries/controller/JobCardController.java
+++ b/src/main/java/com/utopiaindustries/controller/JobCardController.java
@@ -38,7 +38,7 @@ public class JobCardController {
                                     @RequestParam( value = "customer" ,required = false ) String customer,
                                     @RequestParam( value = "lot-number", required = false ) String lotNumber,
                                     @RequestParam( value = "purchase-order-id", required = false ) String purchaseOrderId,
-                                    @RequestParam( value = "location-site-id", required = false ) String locationSiteId,
+                                    @RequestParam( value = "site-id", required = false ) String locationSiteId,
                                     @RequestParam( value = "created-start-date", required = false ) String createdStartDate,
                                     @RequestParam( value = "created-end-date", required = false ) String createdEndDate,
                                     @RequestParam( value = "limit" , required = false) Long limit,
diff --git a/src/main/java/com/utopiaindustries/controller/ReportingController.java b/src/main/java/com/utopiaindustries/controller/ReportingController.java
new file mode 100644
index 0000000..0929f69
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/controller/ReportingController.java
@@ -0,0 +1,58 @@
+package com.utopiaindustries.controller;
+
+import com.utopiaindustries.auth.CuttingRole;
+import com.utopiaindustries.auth.ReportingRole;
+import com.utopiaindustries.model.ctp.SummaryInventoryReport;
+import com.utopiaindustries.service.SummaryInventoryReportService;
+import com.utopiaindustries.util.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@ReportingRole
+@RequestMapping( "/reporting" )
+public class ReportingController {
+    private final SummaryInventoryReportService summaryInventoryReportService;
+
+    public ReportingController(SummaryInventoryReportService summaryInventoryReportService2) {
+        this.summaryInventoryReportService = summaryInventoryReportService2;
+    }
+
+    @GetMapping( "/summary")
+    public String showMasterBundles(@RequestParam(value = "item-id", required = false ) String itemId,
+                                    @RequestParam(value = "sku" , required = false) String sku,
+                                     @RequestParam(value = "start-date", required = false) String startDate,
+                                     @RequestParam(value = "end-date", required = false) String endDate,
+                                     Model model ){
+
+        Map<String, Map<String, List<SummaryInventoryReport>>> getDataByFilteration = summaryInventoryReportService.findByFilter(itemId,sku,startDate,endDate);
+
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(7) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+
+        ArrayList<LocalDate> arrayList = generateDateList(startDate1,endDate1);
+        model.addAttribute("dateLimits", arrayList);
+        model.addAttribute("tableData", getDataByFilteration);
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+            return "redirect:/reporting/summary?item-id=&sku=&start-date="+startDate1.toString()+"&end-date="+endDate1;
+        }
+        return "/reporting/inventory-summary";
+    }
+
+    private ArrayList<LocalDate> generateDateList(LocalDate start, LocalDate end) {
+        ArrayList<LocalDate> localDates = new ArrayList<>();
+        while (start.isBefore(end)) {
+            localDates.add(start);
+            start = start.plusDays(1);
+        }
+        return localDates;
+    }
+}
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java b/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java
new file mode 100644
index 0000000..8177a4b
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportDao.java
@@ -0,0 +1,45 @@
+package com.utopiaindustries.dao.ctp;
+
+import com.utopiaindustries.model.ctp.SummaryInventoryReport;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class SummaryInventoryReportDao {
+
+    private final NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    private final String TABLE_NAME = "cut_to_pack.inventory_transaction_leg ";
+    String SELECT_QUERY = "SELECT item_id, account_id, parent_document_id, DATE(transaction_leg_datetime) AS transaction_date, "
+            + "sku, parent_document_type, parent_document_piece_type, "
+            + "SUM(CASE WHEN type = 'IN' THEN 1 ELSE 0 END) AS total_in, "
+            + "SUM(CASE WHEN type = 'OUT' THEN 1 ELSE 0 END) AS total_out "
+            + "FROM " + TABLE_NAME + " "
+            + "WHERE "
+            + "(:sku IS NULL OR sku = :sku) "
+            + "AND (:item_id IS NULL OR item_id = :item_id) "
+            + "OR (:start_date IS NULL OR :end_date IS NULL OR transaction_leg_datetime BETWEEN :start_date AND :end_date) "
+            + "GROUP BY DATE(transaction_leg_datetime), sku, parent_document_type, parent_document_piece_type "
+            + "ORDER BY transaction_date, sku;";
+
+    public SummaryInventoryReportDao(NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
+        this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
+    }
+
+    //find by filter for reporting
+    public List<SummaryInventoryReport>  findByFilter(Integer itemId, String sku, String startDate, String endDate) {
+        MapSqlParameterSource params = new MapSqlParameterSource();
+        params.addValue("sku", sku);
+        params.addValue("item_id", itemId);
+        params.addValue("start_date", startDate);
+        params.addValue("end_date", endDate);
+
+        // Query the database and map the result
+        List<SummaryInventoryReport> results = namedParameterJdbcTemplate.query(SELECT_QUERY, params, new SummaryInventoryReportRowMapper());
+
+        return results.isEmpty() ? null : results;
+    }
+}
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportRowMapper.java b/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportRowMapper.java
new file mode 100644
index 0000000..aceb783
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/dao/ctp/SummaryInventoryReportRowMapper.java
@@ -0,0 +1,23 @@
+package com.utopiaindustries.dao.ctp;
+
+import com.utopiaindustries.model.ctp.SummaryInventoryReport;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class SummaryInventoryReportRowMapper implements RowMapper<SummaryInventoryReport> {
+    public SummaryInventoryReport mapRow(ResultSet rs, int rowNum) throws SQLException {
+        SummaryInventoryReport summaryInventoryReport = new SummaryInventoryReport();
+        summaryInventoryReport.setItemId(rs.getInt("item_id"));
+        summaryInventoryReport.setSku(rs.getString("sku"));
+        summaryInventoryReport.setParentDocumentId(rs.getString("parent_document_id"));
+        summaryInventoryReport.setAccountId(rs.getString("account_id"));
+        summaryInventoryReport.setDate(rs.getString("transaction_date"));
+        summaryInventoryReport.setTotalIn(rs.getLong("total_in"));
+        summaryInventoryReport.setTotalOut(rs.getLong("total_out"));
+        summaryInventoryReport.setParentDocumentType(rs.getString("parent_document_type"));
+        summaryInventoryReport.setParentDocumentPieceType(rs.getString("parent_document_piece_type"));
+        return summaryInventoryReport;
+    }
+}
diff --git a/src/main/java/com/utopiaindustries/model/Roles.java b/src/main/java/com/utopiaindustries/model/Roles.java
index e7c3e3c..69aba63 100644
--- a/src/main/java/com/utopiaindustries/model/Roles.java
+++ b/src/main/java/com/utopiaindustries/model/Roles.java
@@ -8,5 +8,6 @@ public enum Roles {
     ROLE_STITCHING,
     ROLE_QUALITY_CONTROL,
     ROLE_FINISHING,
-    ROLE_PACKAGING
+    ROLE_PACKAGING,
+    ROLE_REPORTING
 }
diff --git a/src/main/java/com/utopiaindustries/model/ctp/SummaryInventoryReport.java b/src/main/java/com/utopiaindustries/model/ctp/SummaryInventoryReport.java
new file mode 100644
index 0000000..42f469c
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/model/ctp/SummaryInventoryReport.java
@@ -0,0 +1,94 @@
+package com.utopiaindustries.model.ctp;
+
+public class SummaryInventoryReport {
+    private int id;
+    private int itemId;
+    private String sku;
+    private String Date;
+    private long totalIn;
+    private long totalOut;
+    private String parentDocumentType;
+    private String parentDocumentId;
+    private String accountId;
+    private String parentDocumentPieceType;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(int itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public long getTotalIn() {
+        return totalIn;
+    }
+
+    public void setTotalIn(long totalIn) {
+        this.totalIn = totalIn;
+    }
+
+    public String getDate() {
+        return Date;
+    }
+
+    public void setDate(String date) {
+        Date = date;
+    }
+
+    public long getTotalOut() {
+        return totalOut;
+    }
+
+    public void setTotalOut(long totalOut) {
+        this.totalOut = totalOut;
+    }
+
+    public String getParentDocumentType() {
+        return parentDocumentType;
+    }
+
+    public void setParentDocumentType(String parentDocumentType) {
+        this.parentDocumentType = parentDocumentType;
+    }
+
+    public String getParentDocumentPieceType() {
+        return parentDocumentPieceType;
+    }
+
+    public void setParentDocumentPieceType(String parentDocumentPieceType) {
+        this.parentDocumentPieceType = parentDocumentPieceType;
+    }
+
+    public String getParentDocumentId() {
+        return parentDocumentId;
+    }
+
+    public void setParentDocumentId(String parentDocumentId) {
+        this.parentDocumentId = parentDocumentId;
+    }
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+}
diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java
new file mode 100644
index 0000000..0c7e2c3
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/SummaryInventoryReportQueryBuilder.java
@@ -0,0 +1,72 @@
+package com.utopiaindustries.querybuilder.ctp;
+
+import com.utopiaindustries.querybuilder.QueryBuilder;
+import com.utopiaindustries.util.CTPDateTimeFormat;
+import com.utopiaindustries.util.StringUtils;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public class SummaryInventoryReportQueryBuilder {
+    private final static String TABLE_NAME = " cut_to_pack.inventory_transaction_leg ";
+
+    public static String buildQuery(String itemId,
+                                    String sku,
+                                    String startDate,
+                                    String endDate) {
+
+        // format date
+        String formattedDate;
+        String formattedEndDate;
+        String startDate1 = "";
+        String endDate1 = "";
+        String itemId1 = "";
+        String sku1 = "";
+        
+        if (!StringUtils.isNullOrEmpty(startDate)) {
+            formattedDate = CTPDateTimeFormat.getMySQLFormattedDateString(startDate, CTPDateTimeFormat.HTML5_DATE_INPUT_FORMAT);
+            formattedEndDate = CTPDateTimeFormat.getMySQLFormattedDateString(endDate, CTPDateTimeFormat.HTML5_DATE_INPUT_FORMAT);
+            startDate1 = String.format("'%s 00:00:01'", formattedDate);
+            if (!StringUtils.isNullOrEmpty(endDate)) {
+                endDate1 = String.format("'%s 23:59:59'", formattedEndDate);
+            } else {
+                endDate1 = String.format("'%s 23:59:59'", LocalDate.now());
+            }
+        }
+        
+        if (!StringUtils.isNullOrEmpty(itemId)) {
+            itemId1 = itemId;
+        }
+
+        if (!StringUtils.isNullOrEmpty(sku)) {
+            sku1 = sku;
+        }
+
+        QueryBuilder qb = new QueryBuilder()
+                .setTable(TABLE_NAME) 
+                .setColumns("item_id, DATE(transaction_leg_datetime) AS transaction_date, sku, parent_document_type, parent_document_piece_type, "
+                        + "SUM(CASE WHEN type = 'IN' THEN 1 ELSE 0 END) AS total_in, "
+                        + "SUM(CASE WHEN type = 'OUT' THEN 1 ELSE 0 END) AS total_out")
+                .where()
+                .bracketOpen()
+                .bracketOpen()
+                .columnEquals("sku", sku1)
+                .or()
+                .columnIsNull("sku")
+                .bracketClose()
+                .or()
+                .bracketOpen()
+                .columnEquals("item_id",itemId)
+                .or()
+                .columnIsNull("item_id")
+                .bracketClose()
+                .bracketClose()
+                .and()
+                .columnBetween("transaction_leg_date",startDate,endDate)
+                .groupBy("DATE(transaction_leg_datetime), sku, parent_document_type, parent_document_piece_type")
+                .orderBy("transaction_date,", "sku");
+
+        return qb.build();
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java b/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java
new file mode 100644
index 0000000..944a2ad
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java
@@ -0,0 +1,62 @@
+package com.utopiaindustries.service;
+
+import com.utopiaindustries.dao.ctp.SummaryInventoryReportDao;
+import com.utopiaindustries.model.ctp.SummaryInventoryReport;
+import com.utopiaindustries.util.CTPDateTimeFormat;
+import com.utopiaindustries.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.*;
+
+@Service
+public class SummaryInventoryReportService {
+
+    private final SummaryInventoryReportDao summaryInventoryReportDao;
+
+    public SummaryInventoryReportService(SummaryInventoryReportDao summaryInventoryReportDao) {
+        this.summaryInventoryReportDao = summaryInventoryReportDao;
+    }
+
+    public Map<String, Map<String, List<SummaryInventoryReport>>> findByFilter(String itemId, String sku, String startDate, String endDate){
+        String formattedDate;
+        String formattedEndDate;
+        String startDate1 = null;
+        String endDate1 = null;
+        Integer itemId1 = null;
+        String sku1 = null;
+        if (!StringUtils.isNullOrEmpty(startDate)) {
+            formattedDate = CTPDateTimeFormat.getMySQLFormattedDateString(startDate, CTPDateTimeFormat.HTML5_DATE_INPUT_FORMAT);
+            formattedEndDate = CTPDateTimeFormat.getMySQLFormattedDateString(endDate, CTPDateTimeFormat.HTML5_DATE_INPUT_FORMAT);
+            startDate1 = String.format("'%s 00:00:01'", formattedDate);
+            if (!StringUtils.isNullOrEmpty(endDate)) {
+                endDate1 = String.format("'%s 00:00:01'", formattedEndDate);
+            } else {
+                endDate1 = String.format("'%s 23:59:59'", LocalDate.now());
+            }
+        }
+        if (!StringUtils.isNullOrEmpty(itemId)) {
+            itemId1 = Integer.valueOf(itemId);
+        }
+
+        if (!StringUtils.isNullOrEmpty(sku)) {
+            sku1 = sku;
+        }
+        List<SummaryInventoryReport> summaries =  summaryInventoryReportDao.findByFilter(itemId1, sku1, startDate1, endDate1);
+
+        Map<String, Map<String, List<SummaryInventoryReport>>> tableData = new HashMap<>();
+
+       if(summaries == null) {
+        tableData = null;
+       }else {
+           for (SummaryInventoryReport summary : summaries) {
+               tableData
+                       .computeIfAbsent(summary.getSku(), k -> new HashMap<>()) // SKU as key
+                       .computeIfAbsent(summary.getDate(), d -> new ArrayList<>()) // Date as key
+                       .add(summary);
+           }
+       }
+        return tableData;
+    }
+
+}
diff --git a/src/main/resources/static/js/cutting/summary.js b/src/main/resources/static/js/cutting/summary.js
new file mode 100644
index 0000000..b61abd0
--- /dev/null
+++ b/src/main/resources/static/js/cutting/summary.js
@@ -0,0 +1,64 @@
+(function( $ ) {
+    
+    let $btnPreviousWeek = $( '[data-prev-week]' ),
+        $btnNextWeek = $( '[data-next-week]' ),
+        $btnResyncWeek = $( '[data-sync-this-week]' ),
+        $inputDateOfWeek = $( '[data-date-of-week]' );
+
+    let currentURL = new URL( window.location.href.split('#')[0] );
+
+    $( function () {
+        console.log( currentURL.href );
+    });
+
+    $inputDateOfWeek.on( 'change', function () {
+        let $this = $(this);
+
+        currentURL.searchParams.delete('date-of-week');
+        currentURL.searchParams.append( 'date-of-week' , $this.val());
+
+        window.location.href = currentURL.href;
+    } );
+
+    $btnPreviousWeek.on( 'click', function () {
+        let date = new Date( Date.parse( $inputDateOfWeek.val() ) );
+        let prevWeekDate = new Date( date.setDate( date.getDate() - 7 ) );
+        let prevWeekDateString = window.uind.utils.getFormattedDateAsISO8601( prevWeekDate );
+
+        currentURL.searchParams.delete('date-of-week');
+        currentURL.searchParams.append( 'date-of-week' , prevWeekDateString );
+
+        window.location.href = currentURL.href;
+    } );
+
+    $btnNextWeek.on( 'click', function () {
+        let date = new Date( Date.parse( $inputDateOfWeek.val() ) );
+        let nextWeekDate = new Date( date.setDate( date.getDate() + 7 ) );
+        let nextWeekDateString = window.uind.utils.getFormattedDateAsISO8601( nextWeekDate );
+
+        currentURL.searchParams.delete('date-of-week');
+        currentURL.searchParams.append( 'date-of-week' , nextWeekDateString );
+
+        window.location.href = currentURL.href;
+    } );
+
+    $btnResyncWeek.on( 'click', function () {
+        let date = new Date( Date.parse( $inputDateOfWeek.val() ) );
+        console.log( date.getDate() );
+        console.log( date.getDay() );
+        let startDate = new Date( date.setDate( date.getDate() - date.getDay() + 1 ) );
+        console.log( startDate );
+        let endDate = new Date( date.setDate( startDate.getDate() + 6 ) );
+        console.log( endDate );
+
+        let startDateString = window.uind.utils.getFormattedDateAsISO8601( startDate );
+        let endDateString = window.uind.utils.getFormattedDateAsISO8601( endDate );
+
+        currentURL.searchParams.delete('date-of-week');
+
+        console.log( ( currentURL.href + '/sync?from-date=' + startDateString + '&to-date=' + endDateString ).replace( '//sync', '/sync' ) );
+
+        window.location.href = ( currentURL.href + '/sync?from-date=' + startDateString + '&to-date=' + endDateString ).replace( '//sync', '/sync' );
+    } );
+
+}( jQuery ));
\ No newline at end of file
diff --git a/src/main/resources/templates/_fragments.html b/src/main/resources/templates/_fragments.html
index cef98dc..8a34827 100644
--- a/src/main/resources/templates/_fragments.html
+++ b/src/main/resources/templates/_fragments.html
@@ -53,6 +53,12 @@
                                th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/packaging') ? 'active' : ''}">Packaging</a>
                         </li>
 
+                        <li class="nav-item" sec:authorize="hasAnyRole('ROLE_PACKAGING', 'ROLE_ADMIN')">
+                            <a th:href="@{/reporting/summary}" class="nav-link"
+                               th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/reporting') ? 'active' : ''}">Reporting</a>
+                        </li>
+
+
                         <li class="nav-item dropdown" sec:authorize="hasRole('ROLE_ADMIN')">
                             <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Admin</a>
                             <div class="dropdown-menu">
diff --git a/src/main/resources/templates/_job-card-sidebar.html b/src/main/resources/templates/_job-card-sidebar.html
index 6bfe71b..9d7e663 100644
--- a/src/main/resources/templates/_job-card-sidebar.html
+++ b/src/main/resources/templates/_job-card-sidebar.html
@@ -43,12 +43,18 @@
                         <label>Lot Number</label>
                         <input type="text" class="form-control" name="lot-number" maxlength="100" th:value="${param['lot-number']}">
                     </div>
-                    <div class="form-group" data-vue-app th:with="id=${param['purchase-order-id']},title=${param['purchase-order-code']}">
+                    <div class="form-group" data-vue-app th:with="id=${param['purchase-order-id']},title=${param['purchase-order-id']}">
                        <purchase-order-search th:attr="id=${id},title=${title}"
                                               v-bind:id-field-name="'purchase-order-id'"
                                               v-bind:code-field-name="'purchase-order-code'"
                        ></purchase-order-search>
                     </div>
+                    <div class="form-group" data-vue-app th:with="id=${param['site-id']},title=${param['site-title']}">
+                        <location-site-search th:attr="id=${id},title=${title}"
+                                              v-bind:id-field-name="'site-id'"
+                                              v-bind:title-field-name="'site-title'"
+                        ></location-site-search>
+                    </div>
                     <div class="form-group">
                         <label>From Date</label>
                         <input type="date" class="form-control" name="created-start-date" th:value="${param['created-start-date']}" >
diff --git a/src/main/resources/templates/cutting/_bundle-sidebar.html b/src/main/resources/templates/cutting/_bundle-sidebar.html
index a7b41ba..7a87757 100644
--- a/src/main/resources/templates/cutting/_bundle-sidebar.html
+++ b/src/main/resources/templates/cutting/_bundle-sidebar.html
@@ -54,7 +54,7 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count']}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}" class="btn btn-secondary btn-block">Reset</a>
diff --git a/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html b/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html
index a76868b..f6ae71b 100644
--- a/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html
+++ b/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html
@@ -44,8 +44,8 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100"
-                               th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}" min="0" step="1" />
+
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}"
diff --git a/src/main/resources/templates/cutting/_master-bundle-sidebar.html b/src/main/resources/templates/cutting/_master-bundle-sidebar.html
index 1399a79..da34147 100644
--- a/src/main/resources/templates/cutting/_master-bundle-sidebar.html
+++ b/src/main/resources/templates/cutting/_master-bundle-sidebar.html
@@ -36,7 +36,7 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100"
+                        <input type="number" class="form-control" name="count" min="0" maxlength="100"
                                th:value="${param['count']}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
diff --git a/src/main/resources/templates/cutting/inventory-transactions.html b/src/main/resources/templates/cutting/inventory-transactions.html
index 21b6164..ef8e467 100644
--- a/src/main/resources/templates/cutting/inventory-transactions.html
+++ b/src/main/resources/templates/cutting/inventory-transactions.html
@@ -23,7 +23,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-10">
-                    <table class="table table-bordered font-sm" th:if="${#lists.size(transactions) > 0}">
+                    <table th:if="${#lists.size(transactions) !=  0 && #lists != null }" class="table table-bordered font-sm">
                         <thead>
                             <tr>
                                 <th>ID</th>
diff --git a/src/main/resources/templates/finishing/finished-item-list.html b/src/main/resources/templates/finishing/finished-item-list.html
index 5ead209..64446c9 100644
--- a/src/main/resources/templates/finishing/finished-item-list.html
+++ b/src/main/resources/templates/finishing/finished-item-list.html
@@ -50,8 +50,9 @@
                                     <td th:text="${item.createdBy}"></td>
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
-                                        <span th:if="${not item.isSegregated}" class="badge badge-danger">PENDING</span>
-                                        <div th:if="${item.isSegregated}">
+                                        <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge" style="background: yellow">REVERTED</span>
+                                        <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
                                     </td>
diff --git a/src/main/resources/templates/inventory-account-list.html b/src/main/resources/templates/inventory-account-list.html
index 9e9eb8e..1d35f01 100644
--- a/src/main/resources/templates/inventory-account-list.html
+++ b/src/main/resources/templates/inventory-account-list.html
@@ -17,7 +17,7 @@
                         <a th:href="@{/inventory-accounts/new}" class="btn btn-primary">Add New</a>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists.size(accounts) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>ID</th>
diff --git a/src/main/resources/templates/job-card-list.html b/src/main/resources/templates/job-card-list.html
index 3be593d..24cd34b 100644
--- a/src/main/resources/templates/job-card-list.html
+++ b/src/main/resources/templates/job-card-list.html
@@ -16,7 +16,7 @@
                             <a th:href="@{/job-cards/new}" class="btn btn-primary">Add New</a>
                         </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table class="table table-striped font-sm" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists.size(cards) !=  0 && #lists != null }" class="table table-striped font-sm" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>Code</th>
diff --git a/src/main/resources/templates/quality-control/qc-items-list.html b/src/main/resources/templates/quality-control/qc-items-list.html
index e8187c7..859d1bb 100644
--- a/src/main/resources/templates/quality-control/qc-items-list.html
+++ b/src/main/resources/templates/quality-control/qc-items-list.html
@@ -50,8 +50,9 @@
                                     <td th:text="${item.createdBy}"></td>
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
-                                        <span th:if="${not item.isSegregated}" class="badge badge-danger">PENDING</span>
-                                        <div th:if="${item.isSegregated}">
+                                        <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge" style="background: yellow">REVERTED</span>
+                                        <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
                                     </td>
diff --git a/src/main/resources/templates/reporting/inventory-summary-sidebar.html b/src/main/resources/templates/reporting/inventory-summary-sidebar.html
new file mode 100644
index 0000000..32a56a2
--- /dev/null
+++ b/src/main/resources/templates/reporting/inventory-summary-sidebar.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+<head th:replace="_fragments :: head('Home Page')"></head>
+<body>
+<!-- sidebar starts -->
+<aside class="col-sm-2" th:fragment="sidebar">
+    <div class="page-filters-sidebar">
+        <form th:action="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}">
+            <h5 class="mb-4">Refine Your Search</h5>
+            <div class="form-group">
+                <label>Item ID</label>
+                <input type="text" class="form-control" name="item-id" maxlength="100" th:value="${param['item-id']}">
+            </div>
+            <div class="form-group">
+                <label>SKu</label>
+                <input type="text" class="form-control" name="sku" maxlength="100" th:value="${param['sku']}">
+            </div>
+            <div class="form-group">
+                <label>Start Date</label>
+                <input type="date" class="form-control" name="start-date" th:value="${param['start-date']}">
+            </div>
+            <div class="form-group">
+                <label>End Date</label>
+                <input type="date" class="form-control" name="end-date" th:value="${param['end-date']}">
+            </div>
+
+            <input type="submit" class="btn btn-secondary btn-block" value="Search">
+            <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}" class="btn btn-secondary btn-block">Reset</a>
+        </form>
+    </div>
+</aside>
+<!-- sidebar ends -->
+<div th:fragment="page-footer-scripts">
+    <script th:src="@{/js/vendor/lazyload-db.js}"></script>
+    <script th:src="@{/js/main.js}"></script>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/reporting/inventory-summary.html b/src/main/resources/templates/reporting/inventory-summary.html
new file mode 100644
index 0000000..527ea15
--- /dev/null
+++ b/src/main/resources/templates/reporting/inventory-summary.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml"
+      xmlns:ctp="http://www.w3.org/1999/xhtml">
+
+<head th:replace="_fragments :: head('Summary')"></head>
+
+<body>
+<div class="container-fluid">
+    <header class="row page-header" th:replace="_fragments :: page-header"></header>
+    <main class="row page-main">
+        <aside class="col-sm-2" th:replace="/reporting/inventory-summary-sidebar :: sidebar"></aside>
+
+        <div class="col-sm">
+            <h3 >Summary</h3>
+
+            <table th:if="${tableData != null}" class=" table table-striped table-bordered table-hover font-sm "  data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                <thead>
+                <tr>
+                    <th colspan="1" >SKU / Date</th>
+                    <th class="text-center text-center" th:each="date: ${dateLimits}" >
+                        <span class="d-block  " style="width: 100px !important; padding-left: 70px;  " th:text="${#temporals.format(date, 'E')}"></span>
+                        <span class="d-block pl-4 " style="width: 150px !important; " ctp:formatdate="${date}" ></span>
+                    </th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr th:each="sku : ${tableData.keySet()}">
+                    <!-- SKU Column (first td) -->
+                    <td th:rowspan="${#lists.size(sku)}" th:text="${sku}" class="align-middle" rowspan="3" ></td>
+                    <td th:each="dates: ${dateLimits}" class="p-0 ">
+                        <table th:each="data : ${tableData.get(sku)}" class="table table-striped table-bordered table-hover font-sm  m-0  " >
+                            <tbody >
+                                <tr th:each="reportSummary : ${data.getValue()}"   rowspan="3"  >
+                                    <td th:if="${data.getKey() == dates.toString()}" >
+                                        <span th:text="${reportSummary.getParentDocumentType()} + ' ' + ${reportSummary.getParentDocumentPieceType()}"></span>
+                                    </td>
+                                    <td th:if="${data.getKey() == dates.toString()}" class="w-25 text-center" >
+                                        <span th:text="${reportSummary.getTotalIn() - reportSummary.getTotalOut()}"></span>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+            <h4 th:if="${tableData == null}"> No data found </h4>
+        </div>
+    </main>
+</div>
+
+<div th:replace="_fragments :: page-footer-scripts"></div>
+<script th:src="@{/js/summary.js}"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/stitching/_finished-item-sidebar.html b/src/main/resources/templates/stitching/_finished-item-sidebar.html
index abed3a0..3b958b9 100644
--- a/src/main/resources/templates/stitching/_finished-item-sidebar.html
+++ b/src/main/resources/templates/stitching/_finished-item-sidebar.html
@@ -33,7 +33,7 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count']}">
                     </div>
 
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
diff --git a/src/main/resources/templates/stitching/receive-inventory.html b/src/main/resources/templates/stitching/receive-inventory.html
index c06276a..266c675 100644
--- a/src/main/resources/templates/stitching/receive-inventory.html
+++ b/src/main/resources/templates/stitching/receive-inventory.html
@@ -18,7 +18,8 @@
                                 <div class="col-sm-3 p-0">
                                     <master-bundle-search
                                             v-bind:id-field-name="'master-id'"
-                                            v-on:master-bundle-select="OnSelect">
+                                            v-on:master-bundle-select="OnSelect"
+                                            v-bind:required="true">
                                     </master-bundle-search>
                                 </div>
                                 <div class="col-sm-3">
diff --git a/src/main/resources/templates/stitching/stitched-offline-items.html b/src/main/resources/templates/stitching/stitched-offline-items.html
index a371d00..915f142 100644
--- a/src/main/resources/templates/stitching/stitched-offline-items.html
+++ b/src/main/resources/templates/stitching/stitched-offline-items.html
@@ -19,7 +19,7 @@
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
                     <form th:action="@{/stitching/generate-barcodes}" method="post">
                         <input hidden="hidden" name="artifactType" value="FinishedItem">
-                        <table class="table table-striped table-bordered" data-table
+                        <table th:if="${#lists.size(items) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table
                                data-order="[[ 0, &quot;asc&quot; ]]">
                             <thead>
                                 <tr>
diff --git a/src/main/resources/templates/stitching/stitching-item-form.html b/src/main/resources/templates/stitching/stitching-item-form.html
index 31bfad4..e429666 100644
--- a/src/main/resources/templates/stitching/stitching-item-form.html
+++ b/src/main/resources/templates/stitching/stitching-item-form.html
@@ -51,8 +51,8 @@
                                         <th>Production</th>
                                     </tr>
                                     <tbody>
-                                        <tr v-for="(item,index) in items">
-                                            <td>
+                                        <tr v-if="(item.actualProduction !== item.totalProduction)" v-for="(item,index) in items">
+                                            <td  >
                                                 <div class="form-group form-check mb-0">
                                                     <input class="form-check-input" type="checkbox" v-bind:name="'items[' + index + '].isSelected'" v-model="item.isSelected">
                                                     <label th:for="*{id}" class="form-check-label"></label>
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index 111e37a..f6044f7 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -17,7 +17,7 @@
                         <a th:href="@{/users/new}" class="btn btn-primary">Add New</a>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists.size(users) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>User</th>
diff --git a/target/classes/com/utopiaindustries/controller/JobCardController.class b/target/classes/com/utopiaindustries/controller/JobCardController.class
index 1dee056f8b10280a3e5805bc6f95522c2eb0a434..ed7797be98cf7834062eae3807060deb7b7bfcc2 100644
GIT binary patch
delta 14
Vcmexv`p$Gi7%wCH<^<m9yZ|nc1up;q

delta 23
ecmaE7`rULx7%!JVPJVJ?NoIbY?&fgb>AV1PPYAvM

diff --git a/target/classes/com/utopiaindustries/model/Roles.class b/target/classes/com/utopiaindustries/model/Roles.class
index 1a35ca5fe9deb4902c71ff60140f316504b103aa..8a7ab6ca037cc6042c7f446dffdbcc53de7f9cfb 100644
GIT binary patch
delta 616
zcmZ{h$xZ@65QhKmVVGeUO$Vb!LsW1Dcg1}H7sLf+QDZoH_2k(bzQf$S`2Z#=i5iK<
zv#;S3c=BefuHj;gopjfHU4K<|)qI9;UG@I`{0bn2k_9Qy<CSF3^@NB91)9r+eD<`Q
zEf&g0I|sQC$n7GAxHl=L!hPts5O*<vLGN6|!U-fT47(V?sCOlf?F7bMOkmRc5(zQx
z#bj%fjV_0hthiW3x|We=!c0(Y$Gb5y)l3Jv5Cl}GE<x8OLdYOZ0c%8YvU)l9=zc)&
z8~SdE1lH*cvd<v>2sR*DpCYRxoQOz1VdxD)>*X)~Cf&Hc3e_yO2y?Vef$XK$((7Sx
zHf;@ZS;^t(BgXFN^S@LUwsjkvDI~F@fL+>q9FkX#?wxAto=y;;6G*Gji}w*oRV&KA
zNA&P-XEyecZ$#A_QPny`B{F3^V!8%{Ar)Y-7-mcchha9z(8MrjF(`(4o1ukZu@YHO
tzOapbi^^AaFfA!x8hyfY4c&SO{``~l3+rZYyNe5&l5F&PfC4Ebia*`ZR;mC1

delta 568
zcmZ{h$xZ@65QhJrW|(Fe<2Xd)LS&Os78ei|#RXhZF)=Y7ym<EN6X4bJJcT!wC`6;-
ztWV>`qp`Z-VvLh?*L+idRrTM~us(z4`}gx3fCA2%rps8wtFe4AhPZ)<g#>22dln12
zm^CnGA%(Q}$S#G8tc7_jc#f8eW(5KQmcX!pBQPp3E-+<+Vco(8O6_ayhUqR133wm8
zT(>7NjR>KR05(w~;TBPxqI}F2!cU0y5Ni-IY}4*nIZpZ%cAzPJfugK19hUAQ*#nb$
z?U%kxU#z|g73>o2p-zJtDtA&#7Qj`v97RrfBb^C%kZIEEf2|Dc(}83wa-`wF1`cT*
zsgkN~O3yS?dOC-XcA#jBSFkJI0>AJ^^lbgFHGyMP2W1a~vfCFbau#_9OKorkIiCVU
zL0(s2Dp>X_7*bF$6xa$@go2QQRhx84>Nlov&F(8Fx+u00mcIK}?$Y1-(i0(0_t3X?
Kf>X+BsQm!s&q>Ju

diff --git a/target/classes/templates/_fragments.html b/target/classes/templates/_fragments.html
index cef98dc..8a34827 100644
--- a/target/classes/templates/_fragments.html
+++ b/target/classes/templates/_fragments.html
@@ -53,6 +53,12 @@
                                th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/packaging') ? 'active' : ''}">Packaging</a>
                         </li>
 
+                        <li class="nav-item" sec:authorize="hasAnyRole('ROLE_PACKAGING', 'ROLE_ADMIN')">
+                            <a th:href="@{/reporting/summary}" class="nav-link"
+                               th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/reporting') ? 'active' : ''}">Reporting</a>
+                        </li>
+
+
                         <li class="nav-item dropdown" sec:authorize="hasRole('ROLE_ADMIN')">
                             <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Admin</a>
                             <div class="dropdown-menu">
diff --git a/target/classes/templates/_job-card-sidebar.html b/target/classes/templates/_job-card-sidebar.html
index 6bfe71b..9d7e663 100644
--- a/target/classes/templates/_job-card-sidebar.html
+++ b/target/classes/templates/_job-card-sidebar.html
@@ -43,12 +43,18 @@
                         <label>Lot Number</label>
                         <input type="text" class="form-control" name="lot-number" maxlength="100" th:value="${param['lot-number']}">
                     </div>
-                    <div class="form-group" data-vue-app th:with="id=${param['purchase-order-id']},title=${param['purchase-order-code']}">
+                    <div class="form-group" data-vue-app th:with="id=${param['purchase-order-id']},title=${param['purchase-order-id']}">
                        <purchase-order-search th:attr="id=${id},title=${title}"
                                               v-bind:id-field-name="'purchase-order-id'"
                                               v-bind:code-field-name="'purchase-order-code'"
                        ></purchase-order-search>
                     </div>
+                    <div class="form-group" data-vue-app th:with="id=${param['site-id']},title=${param['site-title']}">
+                        <location-site-search th:attr="id=${id},title=${title}"
+                                              v-bind:id-field-name="'site-id'"
+                                              v-bind:title-field-name="'site-title'"
+                        ></location-site-search>
+                    </div>
                     <div class="form-group">
                         <label>From Date</label>
                         <input type="date" class="form-control" name="created-start-date" th:value="${param['created-start-date']}" >
diff --git a/target/classes/templates/cutting/_bundle-sidebar.html b/target/classes/templates/cutting/_bundle-sidebar.html
index a7b41ba..7a87757 100644
--- a/target/classes/templates/cutting/_bundle-sidebar.html
+++ b/target/classes/templates/cutting/_bundle-sidebar.html
@@ -54,7 +54,7 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count']}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}" class="btn btn-secondary btn-block">Reset</a>
diff --git a/target/classes/templates/cutting/_cutting-inventory-account-sidebar.html b/target/classes/templates/cutting/_cutting-inventory-account-sidebar.html
index a76868b..f6ae71b 100644
--- a/target/classes/templates/cutting/_cutting-inventory-account-sidebar.html
+++ b/target/classes/templates/cutting/_cutting-inventory-account-sidebar.html
@@ -44,8 +44,8 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100"
-                               th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}" min="0" step="1" />
+
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}"
diff --git a/target/classes/templates/cutting/_master-bundle-sidebar.html b/target/classes/templates/cutting/_master-bundle-sidebar.html
index 1399a79..da34147 100644
--- a/target/classes/templates/cutting/_master-bundle-sidebar.html
+++ b/target/classes/templates/cutting/_master-bundle-sidebar.html
@@ -36,7 +36,7 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100"
+                        <input type="number" class="form-control" name="count" min="0" maxlength="100"
                                th:value="${param['count']}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
diff --git a/target/classes/templates/cutting/inventory-transactions.html b/target/classes/templates/cutting/inventory-transactions.html
index 21b6164..ef8e467 100644
--- a/target/classes/templates/cutting/inventory-transactions.html
+++ b/target/classes/templates/cutting/inventory-transactions.html
@@ -23,7 +23,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-10">
-                    <table class="table table-bordered font-sm" th:if="${#lists.size(transactions) > 0}">
+                    <table th:if="${#lists.size(transactions) !=  0 && #lists != null }" class="table table-bordered font-sm">
                         <thead>
                             <tr>
                                 <th>ID</th>
diff --git a/target/classes/templates/finishing/finished-item-list.html b/target/classes/templates/finishing/finished-item-list.html
index 5ead209..64446c9 100644
--- a/target/classes/templates/finishing/finished-item-list.html
+++ b/target/classes/templates/finishing/finished-item-list.html
@@ -50,8 +50,9 @@
                                     <td th:text="${item.createdBy}"></td>
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
-                                        <span th:if="${not item.isSegregated}" class="badge badge-danger">PENDING</span>
-                                        <div th:if="${item.isSegregated}">
+                                        <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge" style="background: yellow">REVERTED</span>
+                                        <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
                                     </td>
diff --git a/target/classes/templates/inventory-account-list.html b/target/classes/templates/inventory-account-list.html
index 9e9eb8e..1d35f01 100644
--- a/target/classes/templates/inventory-account-list.html
+++ b/target/classes/templates/inventory-account-list.html
@@ -17,7 +17,7 @@
                         <a th:href="@{/inventory-accounts/new}" class="btn btn-primary">Add New</a>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists.size(accounts) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>ID</th>
diff --git a/target/classes/templates/job-card-list.html b/target/classes/templates/job-card-list.html
index 3be593d..24cd34b 100644
--- a/target/classes/templates/job-card-list.html
+++ b/target/classes/templates/job-card-list.html
@@ -16,7 +16,7 @@
                             <a th:href="@{/job-cards/new}" class="btn btn-primary">Add New</a>
                         </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table class="table table-striped font-sm" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists.size(cards) !=  0 && #lists != null }" class="table table-striped font-sm" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>Code</th>
diff --git a/target/classes/templates/quality-control/qc-items-list.html b/target/classes/templates/quality-control/qc-items-list.html
index e8187c7..859d1bb 100644
--- a/target/classes/templates/quality-control/qc-items-list.html
+++ b/target/classes/templates/quality-control/qc-items-list.html
@@ -50,8 +50,9 @@
                                     <td th:text="${item.createdBy}"></td>
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
-                                        <span th:if="${not item.isSegregated}" class="badge badge-danger">PENDING</span>
-                                        <div th:if="${item.isSegregated}">
+                                        <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge" style="background: yellow">REVERTED</span>
+                                        <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
                                     </td>
diff --git a/target/classes/templates/stitching/_finished-item-sidebar.html b/target/classes/templates/stitching/_finished-item-sidebar.html
index abed3a0..3b958b9 100644
--- a/target/classes/templates/stitching/_finished-item-sidebar.html
+++ b/target/classes/templates/stitching/_finished-item-sidebar.html
@@ -33,7 +33,7 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count']}">
                     </div>
 
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
diff --git a/target/classes/templates/stitching/receive-inventory.html b/target/classes/templates/stitching/receive-inventory.html
index c06276a..266c675 100644
--- a/target/classes/templates/stitching/receive-inventory.html
+++ b/target/classes/templates/stitching/receive-inventory.html
@@ -18,7 +18,8 @@
                                 <div class="col-sm-3 p-0">
                                     <master-bundle-search
                                             v-bind:id-field-name="'master-id'"
-                                            v-on:master-bundle-select="OnSelect">
+                                            v-on:master-bundle-select="OnSelect"
+                                            v-bind:required="true">
                                     </master-bundle-search>
                                 </div>
                                 <div class="col-sm-3">
diff --git a/target/classes/templates/stitching/stitched-offline-items.html b/target/classes/templates/stitching/stitched-offline-items.html
index a371d00..915f142 100644
--- a/target/classes/templates/stitching/stitched-offline-items.html
+++ b/target/classes/templates/stitching/stitched-offline-items.html
@@ -19,7 +19,7 @@
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
                     <form th:action="@{/stitching/generate-barcodes}" method="post">
                         <input hidden="hidden" name="artifactType" value="FinishedItem">
-                        <table class="table table-striped table-bordered" data-table
+                        <table th:if="${#lists.size(items) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table
                                data-order="[[ 0, &quot;asc&quot; ]]">
                             <thead>
                                 <tr>
diff --git a/target/classes/templates/stitching/stitching-item-form.html b/target/classes/templates/stitching/stitching-item-form.html
index 31bfad4..e429666 100644
--- a/target/classes/templates/stitching/stitching-item-form.html
+++ b/target/classes/templates/stitching/stitching-item-form.html
@@ -51,8 +51,8 @@
                                         <th>Production</th>
                                     </tr>
                                     <tbody>
-                                        <tr v-for="(item,index) in items">
-                                            <td>
+                                        <tr v-if="(item.actualProduction !== item.totalProduction)" v-for="(item,index) in items">
+                                            <td  >
                                                 <div class="form-group form-check mb-0">
                                                     <input class="form-check-input" type="checkbox" v-bind:name="'items[' + index + '].isSelected'" v-model="item.isSelected">
                                                     <label th:for="*{id}" class="form-check-label"></label>
diff --git a/target/classes/templates/users.html b/target/classes/templates/users.html
index 111e37a..f6044f7 100644
--- a/target/classes/templates/users.html
+++ b/target/classes/templates/users.html
@@ -17,7 +17,7 @@
                         <a th:href="@{/users/new}" class="btn btn-primary">Add New</a>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists.size(users) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>User</th>
-- 
2.40.1


From 45a929fbfb3110e9080a45176a6a7432e34ddd08 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Tue, 24 Dec 2024 13:55:57 +0500
Subject: [PATCH 2/7] change badge color in qc_item_list

---
 src/main/resources/templates/finishing/finished-item-list.html  | 2 +-
 src/main/resources/templates/quality-control/qc-items-list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/finishing/finished-item-list.html b/src/main/resources/templates/finishing/finished-item-list.html
index 64446c9..b99ed64 100644
--- a/src/main/resources/templates/finishing/finished-item-list.html
+++ b/src/main/resources/templates/finishing/finished-item-list.html
@@ -51,7 +51,7 @@
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
                                         <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
-                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge" style="background: yellow">REVERTED</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge badge-warning">REVERTED</span>
                                         <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
diff --git a/src/main/resources/templates/quality-control/qc-items-list.html b/src/main/resources/templates/quality-control/qc-items-list.html
index 859d1bb..1f14b58 100644
--- a/src/main/resources/templates/quality-control/qc-items-list.html
+++ b/src/main/resources/templates/quality-control/qc-items-list.html
@@ -51,7 +51,7 @@
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
                                         <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
-                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge" style="background: yellow">REVERTED</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge badge-warning" >REVERTED</span>
                                         <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
-- 
2.40.1


From 40a18eb266f35fbeeb46fed3f4630e012de7e619 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Tue, 31 Dec 2024 13:28:55 +0500
Subject: [PATCH 3/7] add job card screen

---
 .../controller/CuttingController.java         |  39 +++-
 .../controller/FinishingController.java       |  12 +-
 .../InventoryAccountController.java           |   4 +-
 .../controller/JobCardController.java         |  45 ++++-
 .../controller/PackagingController.java       |   8 +-
 .../controller/QualityControlController.java  |   9 +-
 .../controller/ReportingController.java       |   2 -
 .../controller/StitchingController.java       |  41 ++++-
 .../dao/ctp/AuthorityDAO.java                 |   6 +-
 .../utopiaindustries/dao/ctp/CutPieceDAO.java |   9 +
 .../dao/ctp/FinishOfflineItemRowMapper.java   |  25 +++
 .../dao/ctp/FinishedItemDAO.java              |  12 ++
 .../utopiaindustries/dao/ctp/JobCardDAO.java  |   8 +
 .../dao/ctp/StitchingOfflineItemDAO.java      |   7 +
 .../ctp/InventoryAccountQueryBuilder.java     |   4 +-
 .../querybuilder/ctp/JobCardQueryBuilder.java |   6 +-
 .../ctp/StichedOfflineItemQueryBuilder.java   |  49 +++++
 .../service/BundleService.java                |   3 +-
 .../service/InventoryArtifactService.java     |   9 +
 .../service/InventoryService.java             |   8 +-
 .../service/JobCardService.java               |  42 ++++-
 .../utopiaindustries/service/UserService.java |   4 +-
 .../resources/static/js/receive-inventory.js  |  21 +--
 src/main/resources/templates/_fragments.html  |   2 +-
 .../templates/_job-card-fragment.html         |   2 +-
 .../templates/_job-card-sidebar.html          |   6 +-
 .../templates/cutting/_bundle-sidebar.html    |   2 +-
 .../cutting/inventory-transactions.html       |   2 +-
 .../finishing/finished-item-list.html         |   6 +-
 .../resources/templates/job-card-list.html    |   2 +-
 .../resources/templates/job-card-view.html    | 168 ++++++++++++++++++
 .../quality-control/qc-items-list.html        |   6 +-
 .../stitching/stitching-item-form.html        |   2 +-
 33 files changed, 495 insertions(+), 76 deletions(-)
 create mode 100644 src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java
 create mode 100644 src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java
 create mode 100644 src/main/resources/templates/job-card-view.html

diff --git a/src/main/java/com/utopiaindustries/controller/CuttingController.java b/src/main/java/com/utopiaindustries/controller/CuttingController.java
index 8406714..98bbb82 100644
--- a/src/main/java/com/utopiaindustries/controller/CuttingController.java
+++ b/src/main/java/com/utopiaindustries/controller/CuttingController.java
@@ -4,13 +4,13 @@ import com.utopiaindustries.auth.CuttingRole;
 import com.utopiaindustries.dao.ctp.BundleWrapper;
 import com.utopiaindustries.model.ctp.JobCardWrapper;
 import com.utopiaindustries.service.*;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.ResponseEntity;
+import com.utopiaindustries.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 
 @Controller
@@ -61,8 +61,12 @@ public class CuttingController {
                                          @RequestParam( value = "site-id", required = false ) String siteId,
                                          @RequestParam( value = "count", required = false ) Long count,
                                          Model model ){
+
         model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , "PROCESS", "1", false) );
         model.addAttribute("locations", locationService.findAll() );
+        if(StringUtils.isNullOrEmpty( active )){
+            return "redirect:/cutting/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
+        }
         return "/cutting/inventory-accounts";
     }
 
@@ -73,7 +77,7 @@ public class CuttingController {
                                                    @ModelAttribute JobCardWrapper wrapper ){
         try {
            inventoryService.receiveJobCardInventory( jobCardId, wrapper );
-            redirectAttributes.addFlashAttribute("success", "Inventory Success Received" );
+            redirectAttributes.addFlashAttribute("success", "Inventory Successfully Received by Job Card  ID:  " +jobCardId );
         } catch ( Exception ex ){
             redirectAttributes.addFlashAttribute("error", ex.getMessage() );
         }
@@ -105,6 +109,7 @@ public class CuttingController {
     @GetMapping( "/bundles" )
     public String showBundles(  @RequestParam( value = "id", required = false ) String id,
                                 @RequestParam( value = "sku", required = false) String sku,
+                                @RequestParam( value = "exceptionCheck", required = false, defaultValue = "false") boolean exceptionCheck,
                                 @RequestParam( value = "jc-id", required = false) String jobCardId,
                                 @RequestParam( value =  "master-id" , required = false ) String masterId,
                                 @RequestParam( value = "type", required = false) String type,
@@ -112,9 +117,18 @@ public class CuttingController {
                                 @RequestParam( value = "start-date", required = false) String startDate,
                                 @RequestParam( value = "end-date", required = false) String endDate,
                                 @RequestParam( value = "count", required = false ) Long count,
-                                Model model ){
-        model.addAttribute("bundles", bundleService.getBundles( id, sku, jobCardId, masterId, type, status, startDate, endDate ,count ) );
+                                Model model, RedirectAttributes redirectAttributes){
+
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        model.addAttribute("bundles", bundleService.getBundles( id, sku, jobCardId, masterId, type, status, startDate1.toString(), endDate1.toString() ,count ) );
         model.addAttribute("types", jobCardService.getAllPieceTypes() );
+        if(exceptionCheck){
+            redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
+        }
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+            return "redirect:/cutting/bundles?id=&sku=&jc-id=&master-id=&type=&status=0&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
+        }
         return "/cutting/bundles";
     }
 
@@ -126,7 +140,12 @@ public class CuttingController {
                                      @RequestParam(value = "end-date", required = false) String endDate,
                                      @RequestParam(value = "count", required = false) Long count,
                                      Model model ){
-        model.addAttribute("masterBundles", bundleService.getMasterBundles( id, jobCardId, startDate, endDate, count ) );
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        model.addAttribute("masterBundles", bundleService.getMasterBundles( id, jobCardId, startDate1.toString(), endDate1.toString(), count ) );
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+            return "redirect:/cutting/master-bundles?id=&jc-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
+        }
         return "/cutting/master-bundles";
     }
 
@@ -139,9 +158,11 @@ public class CuttingController {
 
 
     @PostMapping( "/generate-barcodes" )
-    public ResponseEntity<InputStreamResource> generateBarcode(@RequestParam( name = "ids", required = true ) Long[] ids,
-                                                               @RequestParam( name = "artifactType", required = true ) String artifactType ) throws Exception {
-
+    public Object generateBarcode(@RequestParam( name = "ids", required = false ) Long[] ids,
+                                  @RequestParam( name = "artifactType", required = true ) String artifactType ) throws Exception {
+        if(ids == null){
+            return "redirect:/cutting/bundles?exceptionCheck=true";
+        }
         return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
     }
 }
diff --git a/src/main/java/com/utopiaindustries/controller/FinishingController.java b/src/main/java/com/utopiaindustries/controller/FinishingController.java
index a68fa6d..fb853d9 100644
--- a/src/main/java/com/utopiaindustries/controller/FinishingController.java
+++ b/src/main/java/com/utopiaindustries/controller/FinishingController.java
@@ -8,11 +8,13 @@ import com.utopiaindustries.service.BundleService;
 import com.utopiaindustries.service.InventoryAccountService;
 import com.utopiaindustries.service.InventoryService;
 import com.utopiaindustries.service.LocationService;
+import com.utopiaindustries.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Controller
@@ -48,8 +50,13 @@ public class FinishingController {
                                       @RequestParam( value = "job-card-id", required = false ) String jobCardId,
                                       @RequestParam( value = "count", required = false ) Long count,
                                       Model model ){
-        List<FinishedItem> itemList = bundleService.getFinishedItem( id, itemId, sku, startDate, endDate, jobCardId ,count );
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        List<FinishedItem> itemList = bundleService.getFinishedItem( id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId ,count );
         model.addAttribute("items", itemList ) ;
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+            return "redirect:/finishing/finished-items?id=&item-id=&sku=&job-card-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
+        }
         return "finishing/finished-item-list";
     }
 
@@ -70,6 +77,9 @@ public class FinishingController {
         // 5 for Finishing
         model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count, "PROCESS", "5" , false ));
         model.addAttribute("locations", locationService.findAll() );
+        if(count == null){
+            return "redirect:/finishing/inventory-accounts?id=&title=&active=&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
+        }
         return "/finishing/inventory-accounts";
     }
 
diff --git a/src/main/java/com/utopiaindustries/controller/InventoryAccountController.java b/src/main/java/com/utopiaindustries/controller/InventoryAccountController.java
index 8c1df3d..4a450c2 100644
--- a/src/main/java/com/utopiaindustries/controller/InventoryAccountController.java
+++ b/src/main/java/com/utopiaindustries/controller/InventoryAccountController.java
@@ -46,7 +46,7 @@ public class InventoryAccountController {
                                RedirectAttributes redirectAttributes ){
         try {
             inventoryAccountService.saveAccount( inventoryAccount );
-            redirectAttributes.addFlashAttribute("success", "Inventory Account Successfully Added" );
+            redirectAttributes.addFlashAttribute("success", inventoryAccount.getTitle() + "  Successfully Added" );
         } catch ( Exception e ){
             redirectAttributes.addFlashAttribute("error", e.getMessage() );
         }
@@ -59,7 +59,7 @@ public class InventoryAccountController {
                                RedirectAttributes redirectAttributes ){
         try {
             inventoryAccountService.saveAccount( inventoryAccount );
-            redirectAttributes.addFlashAttribute("success", "Inventory Account Successfully Added" );
+            redirectAttributes.addFlashAttribute("success", inventoryAccount.getTitle() + "  Successfully update" );
         } catch ( Exception e ){
             redirectAttributes.addFlashAttribute("error", e.getMessage() );
         }
diff --git a/src/main/java/com/utopiaindustries/controller/JobCardController.java b/src/main/java/com/utopiaindustries/controller/JobCardController.java
index 91324cc..5e3dfa8 100644
--- a/src/main/java/com/utopiaindustries/controller/JobCardController.java
+++ b/src/main/java/com/utopiaindustries/controller/JobCardController.java
@@ -1,16 +1,22 @@
 package com.utopiaindustries.controller;
 
 import com.utopiaindustries.auth.JobCardRole;
+import com.utopiaindustries.dao.ctp.JobCardDAO;
 import com.utopiaindustries.model.ctp.JobCard;
+import com.utopiaindustries.model.ctp.JobCardItem;
 import com.utopiaindustries.service.InventoryAccountService;
 import com.utopiaindustries.service.JobCardService;
 import com.utopiaindustries.service.LocationService;
+import com.utopiaindustries.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Controller
 @JobCardRole
@@ -20,19 +26,20 @@ public class JobCardController {
     private final JobCardService jobCardService;
     private final LocationService locationService;
     private final InventoryAccountService inventoryAccountService;
+    private final JobCardDAO jobCardDAO;
 
-    public JobCardController(JobCardService jobCardService, LocationService locationService, InventoryAccountService inventoryAccountService){
+    public JobCardController(JobCardService jobCardService, LocationService locationService, InventoryAccountService inventoryAccountService, JobCardDAO jobCardDAO){
         this.jobCardService = jobCardService;
         this.locationService = locationService;
         this.inventoryAccountService = inventoryAccountService;
+        this.jobCardDAO = jobCardDAO;
     }
 
     /**
      *  get all job cards
      * */
     @GetMapping
-    public String showJobCardList(  @RequestParam( value = "id", required = false ) String id,
-                                    @RequestParam( value = "code", required = false ) String code,
+    public String showJobCardList(  @RequestParam( value = "code", required = false ) String code,
                                     @RequestParam( value = "status", required = false ) String status,
                                     @RequestParam( value = "inventory-status" , required = false) String inventoryStatus,
                                     @RequestParam( value = "customer" ,required = false ) String customer,
@@ -43,11 +50,17 @@ public class JobCardController {
                                     @RequestParam( value = "created-end-date", required = false ) String createdEndDate,
                                     @RequestParam( value = "limit" , required = false) Long limit,
                                     Model model ){
-        List<JobCard> cards = jobCardService.getCards(  id, code, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId,createdStartDate, createdEndDate, limit );
+        List<JobCard> cards = jobCardService.getCards(code, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId,createdStartDate, createdEndDate, limit );
         model.addAttribute("cards", cards );
         model.addAttribute("statuses", JobCard.Status.values() );
         model.addAttribute("invStatuses", JobCard.InventoryStatus.values() );
         model.addAttribute("locations", locationService.findAll() );
+        LocalDate startDate = StringUtils.isNullOrEmpty(createdStartDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(createdStartDate);
+        LocalDate endDate = StringUtils.isNullOrEmpty(createdEndDate) ? LocalDate.now() : LocalDate.parse(createdEndDate);
+        if(StringUtils.isNullOrEmpty( createdStartDate) || StringUtils.isNullOrEmpty( createdEndDate )){
+            return "redirect:/job-cards/?code=&status=&inventory-status=&customer=&lot-number=&purchase-order-id=&purchase-order-code=&purchaseOrderTitle=&site-id=&site-title=&created-start-date="+startDate+"&created-end-date="+endDate+"&limit=100";
+        }
+
         return "job-card-list";
     }
 
@@ -141,4 +154,28 @@ public class JobCardController {
         }
         return "redirect:/job-cards";
     }
+
+    @GetMapping( value = "/job-card-detail/{id}" )
+    public String showJobCardDetail( @PathVariable("id") long id,
+                                       Model model ){
+        List<JobCardItem> jobCardItems = jobCardService.findJobCardItemByJobCardId(id);
+        List<Long> jobCardItemIds = jobCardItems.stream()
+                .map(JobCardItem::getId)
+                .collect(Collectors.toList());
+        model.addAttribute( "card", jobCardService.findByID(id));
+        model.addAttribute("jobCardItems", jobCardItems);
+        model.addAttribute("cutPiece",jobCardService.findCutPieceByJobCardItemIds(jobCardItemIds));
+        model.addAttribute("finishItem",jobCardService.findFinishItemByJobCardId(id));
+        model.addAttribute("stitchingItem",jobCardService.findStitchItemByJobCardId(id));
+        return "job-card-view";
+    }
+
+    private ArrayList<LocalDate> generateDateList(LocalDate start, LocalDate end) {
+        ArrayList<LocalDate> localDates = new ArrayList<>();
+        while (start.isBefore(end)) {
+            localDates.add(start);
+            start = start.plusDays(1);
+        }
+        return localDates;
+    }
 }
diff --git a/src/main/java/com/utopiaindustries/controller/PackagingController.java b/src/main/java/com/utopiaindustries/controller/PackagingController.java
index 5e5ed88..bbadbe3 100644
--- a/src/main/java/com/utopiaindustries/controller/PackagingController.java
+++ b/src/main/java/com/utopiaindustries/controller/PackagingController.java
@@ -3,12 +3,15 @@ package com.utopiaindustries.controller;
 import com.utopiaindustries.auth.PackagingRole;
 import com.utopiaindustries.service.InventoryAccountService;
 import com.utopiaindustries.service.LocationService;
+import com.utopiaindustries.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.time.LocalDate;
+
 @Controller
 @PackagingRole
 @RequestMapping("/packaging" )
@@ -41,8 +44,9 @@ public class PackagingController {
                                         Model model ){
         model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , null, null,true ) );
         model.addAttribute("locations", locationService.findAll() );
+        if(count == null){
+            return "redirect:/packaging/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
+        }
         return "/packaging/inventory-accounts";
-
     }
-
 }
diff --git a/src/main/java/com/utopiaindustries/controller/QualityControlController.java b/src/main/java/com/utopiaindustries/controller/QualityControlController.java
index 49d980e..bf4b60a 100644
--- a/src/main/java/com/utopiaindustries/controller/QualityControlController.java
+++ b/src/main/java/com/utopiaindustries/controller/QualityControlController.java
@@ -7,11 +7,13 @@ import com.utopiaindustries.service.BundleService;
 import com.utopiaindustries.service.InventoryAccountService;
 import com.utopiaindustries.service.InventoryService;
 import com.utopiaindustries.service.LocationService;
+import com.utopiaindustries.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Controller
@@ -64,8 +66,13 @@ public class QualityControlController {
                                     @RequestParam( value = "job-card-id", required = false ) String jobCardId,
                                     @RequestParam( value = "count", required = false ) Long count,
                                     Model model ){
-        List<FinishedItem> itemList = bundleService.getFinishedItem( id, itemId, sku, startDate, endDate, jobCardId ,count );
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        List<FinishedItem> itemList = bundleService.getFinishedItem( id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId ,count );
         model.addAttribute("items", itemList ) ;
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+            return "redirect:/quality-control/qc-finished-items?id=&item-id=&sku=&job-card-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
+        }
         return "/quality-control/qc-items-list";
     }
 
diff --git a/src/main/java/com/utopiaindustries/controller/ReportingController.java b/src/main/java/com/utopiaindustries/controller/ReportingController.java
index 0929f69..4649ed9 100644
--- a/src/main/java/com/utopiaindustries/controller/ReportingController.java
+++ b/src/main/java/com/utopiaindustries/controller/ReportingController.java
@@ -34,10 +34,8 @@ public class ReportingController {
                                      Model model ){
 
         Map<String, Map<String, List<SummaryInventoryReport>>> getDataByFilteration = summaryInventoryReportService.findByFilter(itemId,sku,startDate,endDate);
-
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(7) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
-
         ArrayList<LocalDate> arrayList = generateDateList(startDate1,endDate1);
         model.addAttribute("dateLimits", arrayList);
         model.addAttribute("tableData", getDataByFilteration);
diff --git a/src/main/java/com/utopiaindustries/controller/StitchingController.java b/src/main/java/com/utopiaindustries/controller/StitchingController.java
index cb38cc7..95797af 100644
--- a/src/main/java/com/utopiaindustries/controller/StitchingController.java
+++ b/src/main/java/com/utopiaindustries/controller/StitchingController.java
@@ -4,13 +4,13 @@ import com.utopiaindustries.auth.StitchingRole;
 import com.utopiaindustries.model.ctp.JobCard;
 import com.utopiaindustries.model.ctp.StitchingOfflineItem;
 import com.utopiaindustries.service.*;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.ResponseEntity;
+import com.utopiaindustries.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
 
@@ -75,8 +75,13 @@ public class StitchingController {
                                          @RequestParam( value = "count", required = false ) Long count,
                                          Model model ) {
         // 2 for stitching
+
+
         model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts(id, title, active, createdBy, startDate, endDate, siteId, count, "PROCESS", "2", false));
         model.addAttribute("locations", locationService.findAll() );
+        if(count == null){
+            return "redirect:/stitching/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
+        }
         return "/stitching/inventory-accounts";
     }
 
@@ -91,9 +96,23 @@ public class StitchingController {
                                             @RequestParam( value = "end-date", required = false ) String endDate,
                                             @RequestParam( value = "job-card-id", required = false ) String jobCardId,
                                             @RequestParam( value = "count", required = false ) Long count,
-                                            Model model ){
+                                            Model model
+    ,RedirectAttributes redirect){
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
         List<StitchingOfflineItem> itemList = bundleService.getStitchedOfflineItems( id, itemId, sku, startDate, endDate, jobCardId ,count );
         model.addAttribute("items", itemList ) ;
+        if(model.getAttribute("message") != null){
+            if(model.getAttribute("message").equals("Finished Item Created Successfully") ){
+                redirect.addFlashAttribute("success",  model.getAttribute("message"));
+
+            }else {
+                redirect.addFlashAttribute("error",  model.getAttribute("message"));
+            }
+        }
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+            return "redirect:/stitching/stitching-offline-items?id=&item-id=&sku=&job-card-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
+        }
         return "/stitching/stitched-offline-items";
     }
 
@@ -110,18 +129,22 @@ public class StitchingController {
                                                Model model ){
         try {
             inventoryService.createStitchingOfflineItemsFromJobCard( jobCard );
-            redirectAttributes.addFlashAttribute("success", "Finished Item Created Successfully");
+            redirectAttributes.addFlashAttribute("message", "Finished Item Created Successfully");
         } catch ( Exception exception ){
             exception.printStackTrace();
-            redirectAttributes.addFlashAttribute( "error", exception.getMessage() );
+            redirectAttributes.addFlashAttribute( "message", exception.getMessage() );
         }
         return "redirect:/stitching/stitching-offline-items";
     }
 
     @PostMapping( "/generate-barcodes" )
-    public ResponseEntity<InputStreamResource> generateBarcode(@RequestParam( name = "ids"  ) Long[] ids,
-                                                               @RequestParam( name = "artifactType"  ) String artifactType ) throws Exception {
-
-        return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
+    public Object generateBarcode(@RequestParam( name = "ids" ,required = false) Long[] ids,
+                                  @RequestParam( name = "artifactType"  ) String artifactType, RedirectAttributes redirectAttributes ) throws Exception {
+        if (ids == null){
+            redirectAttributes.addFlashAttribute( "message", "Select At least One CheckBox" );
+            return "redirect:/stitching/stitching-offline-items";
+        }else {
+            return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
+        }
     }
 }
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java
index 4e81d97..f380853 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java
@@ -82,11 +82,13 @@ public class AuthorityDAO {
     // save all
     public int[] saveAll( List<Authority> authorities ) {
         List<MapSqlParameterSource> batchArgs = new ArrayList<>();
+        if (authorities == null){
+            return namedParameterJdbcTemplate.batchUpdate( INSERT_QUERY, batchArgs.toArray(new MapSqlParameterSource[0]) );
+        }
         for ( Authority authority: authorities ) {
             MapSqlParameterSource params = prepareInsertQueryParams( authority );
             batchArgs.add( params );
         }
-        return namedParameterJdbcTemplate.batchUpdate( INSERT_QUERY, batchArgs.toArray(new MapSqlParameterSource[authorities.size()]) );
+          return namedParameterJdbcTemplate.batchUpdate( INSERT_QUERY, batchArgs.toArray(new MapSqlParameterSource[authorities.size()]) );
     }
-
 }
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java
index a3d3257..8001261 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/CutPieceDAO.java
@@ -21,6 +21,7 @@ public class CutPieceDAO {
 	private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
 	private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
 	private final String SELECT_BY_ITEM_IDS = String.format( "SELECT * FROM %s WHERE job_card_item_id IN (:item_ids)", TABLE_NAME );
+	private final String SELECT_BY_ITEM_IDS_AND_GROUP_BY = String.format( "SELECT  id,job_card_item_id,type,SUM(quantity) AS quantity FROM %s WHERE job_card_item_id IN (:item_ids) GROUP BY job_card_item_id, type", TABLE_NAME );
 	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, job_card_item_id, type, quantity) VALUES (:id, :job_card_item_id, :type, :quantity) ON DUPLICATE KEY UPDATE job_card_item_id = VALUES(job_card_item_id), type = VALUES(type), quantity = VALUES(quantity)", TABLE_NAME );
 	private final String DELETE_BY_ITEM_ID = String.format( "DELETE FROM %s WHERE job_card_item_id = :job_card_item_id", TABLE_NAME );
 
@@ -86,6 +87,14 @@ public class CutPieceDAO {
 		return namedParameterJdbcTemplate.query(SELECT_BY_ITEM_IDS, params, new CutPieceRowMapper() );
 	}
 
+	public List<CutPiece> findByJobCardItemIdsWithGroupByType( List<Long> itemIds ){
+		if( itemIds == null || itemIds.isEmpty() )
+			return new ArrayList<>();
+		MapSqlParameterSource params = new MapSqlParameterSource();
+		params.addValue("item_ids", itemIds );
+		return namedParameterJdbcTemplate.query(SELECT_BY_ITEM_IDS_AND_GROUP_BY, params, new CutPieceRowMapper() );
+	}
+
 	public boolean deleteByItemId( long jobCardItemId ){
 		MapSqlParameterSource params = new MapSqlParameterSource();
 		params.addValue("job_card_item_id", jobCardItemId );
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java
new file mode 100644
index 0000000..7bb171a
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java
@@ -0,0 +1,25 @@
+package com.utopiaindustries.dao.ctp;
+
+import com.utopiaindustries.model.ctp.FinishedItem;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class FinishOfflineItemRowMapper implements RowMapper<FinishedItem> {
+    public FinishedItem mapRow(ResultSet rs, int rowNum ) throws SQLException {
+        FinishedItem finishedItem = new FinishedItem();
+        finishedItem.setId( rs.getLong( "id" ) );
+        finishedItem.setItemId( rs.getLong( "item_id" ) );
+        finishedItem.setSku( rs.getString( "sku" ) );
+        finishedItem.setBarcode( rs.getString( "barcode" ) );
+        if ( rs.getTimestamp( "created_at" ) != null ) {
+            finishedItem.setCreatedAt( rs.getTimestamp( "created_at" ).toLocalDateTime() );
+        }
+        finishedItem.setCreatedBy( rs.getString( "created_by" ) );
+        finishedItem.setJobCardId( rs.getLong("job_card_id") );
+        finishedItem.setIsQa( rs.getBoolean("is_qa"));
+        finishedItem.setQaStatus( rs.getString("qa_status" ) );
+        return finishedItem;
+    }
+}
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
index 3d3f44c..56c489c 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
@@ -1,6 +1,7 @@
 package com.utopiaindustries.dao.ctp;
 
 import com.utopiaindustries.model.ctp.FinishedItem;
+import com.utopiaindustries.model.ctp.JobCard;
 import com.utopiaindustries.util.KeyHolderFunctions;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -19,6 +20,7 @@ public class FinishedItemDAO {
 	private final String TABLE_NAME = "cut_to_pack.finished_item";
 	private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME );
 	private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
+	private final String SELECT_QUERY_BY_JOB_CARD = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id", TABLE_NAME );
 	private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
 	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, item_id, sku, barcode, created_at, created_by, job_card_id, is_qa, stitched_item_id, is_segregated, qa_status) VALUES (:id, :item_id, :sku, :barcode, :created_at, :created_by, :job_card_id, :is_qa, :stitched_item_id, :is_segregated, :qa_status) ON DUPLICATE KEY UPDATE item_id = VALUES(item_id), sku = VALUES(sku), barcode = VALUES(barcode), created_at = VALUES(created_at), created_by = VALUES(created_by), job_card_id = VALUES(job_card_id), is_qa = VALUES(is_qa), stitched_item_id = VALUES(stitched_item_id), is_segregated = VALUES(is_segregated), qa_status = VALUES(qa_status)", TABLE_NAME );
 	private final String SELECT_BY_LIMIT = String.format("SELECT * FROM %s ORDER BY id DESC LIMIT :limit", TABLE_NAME );
@@ -98,6 +100,10 @@ public class FinishedItemDAO {
 		return namedParameterJdbcTemplate.query( query, new FinishedItemRowMapper() );
 	}
 
+	public List<FinishedItem> findFinishOfflineItemByQuery(String query ){
+		return namedParameterJdbcTemplate.query( query, new FinishedItemRowMapper() );
+	}
+
 	public List<FinishedItem> findByIds(List<Long> ids ){
 		if( ids == null || ids.isEmpty() ) return new ArrayList<>();
 		MapSqlParameterSource params = new MapSqlParameterSource();
@@ -112,6 +118,12 @@ public class FinishedItemDAO {
 		return namedParameterJdbcTemplate.query( SELECT_BY_TERM , params, new FinishedItemRowMapper() );
 	}
 
+	// find By job card Id
+	public List<FinishedItem> findByJobCardId(long jobCardId ) {
+		MapSqlParameterSource params = new MapSqlParameterSource();
+		params.addValue( "job_card_id", jobCardId );
+		return namedParameterJdbcTemplate.query(SELECT_QUERY_BY_JOB_CARD, params, new FinishedItemRowMapper() );
+	}
 
 	public FinishedItem findByStitchedItem( long stitchedItemId ){
 		MapSqlParameterSource params = new MapSqlParameterSource();
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java
index 72aeaf0..6ce2d34 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/JobCardDAO.java
@@ -21,6 +21,7 @@ public class JobCardDAO {
 	private final String TABLE_NAME = "cut_to_pack.job_card";
 	private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME );
 	private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
+	private final String SELECT_ALL_QUERY_WITH_LIMIT = String.format( "SELECT * FROM %s ORDER BY id DESC limit :limit", TABLE_NAME );
 	private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
 	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, code, job_order_id, created_at, created_by, status, inventory_status, customer, lot_number, purchase_order_id, location_site_id, description) VALUES (:id, :code, :job_order_id, :created_at, :created_by, :status, :inventory_status, :customer, :lot_number, :purchase_order_id, :location_site_id, :description) ON DUPLICATE KEY UPDATE code = VALUES(code), job_order_id = VALUES(job_order_id), created_at = VALUES(created_at), created_by = VALUES(created_by), status = VALUES(status), inventory_status = VALUES(inventory_status), customer = VALUES(customer), lot_number = VALUES(lot_number), purchase_order_id = VALUES(purchase_order_id), location_site_id = VALUES(location_site_id), description = VALUES(description)", TABLE_NAME );
 	private final String SELECT_BY_LIKE_CODE_AND_INV_STATUS_AND_STATUS = String.format( "SELECT * FROM %s WHERE code like :code AND status = :status AND inventory_status = :inventory_status", TABLE_NAME );
@@ -56,6 +57,7 @@ public class JobCardDAO {
 				.orElse( new JobCard() );
 	}
 
+
 	// find all
 	public List<JobCard> findAll() {
 		return namedParameterJdbcTemplate.query( SELECT_ALL_QUERY, new JobCardRowMapper() );
@@ -110,4 +112,10 @@ public class JobCardDAO {
 	public List<JobCard> findByQuery( String query ){
 		return namedParameterJdbcTemplate.query( query, new JobCardRowMapper() );
 	}
+
+	public List<JobCard> findByAllWithLimit(Long limit){
+		MapSqlParameterSource params = new MapSqlParameterSource();
+		params.addValue("limit", limit.intValue());
+		return namedParameterJdbcTemplate.query( SELECT_ALL_QUERY_WITH_LIMIT, params, new JobCardRowMapper() );
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
index 9f1da6a..b8887b4 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
@@ -19,6 +19,7 @@ public class StitchingOfflineItemDAO {
     private final String TABLE_NAME = "cut_to_pack.stitching_offline_item";
     private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME );
     private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
+    private final String SELECT_QUERY_BY_JOB_CARD = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id", TABLE_NAME );
     private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
     private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, item_id, sku, barcode, created_at, created_by, job_card_id, is_qa, qa_remarks, qa_status) VALUES (:id, :item_id, :sku, :barcode, :created_at, :created_by, :job_card_id, :is_qa, :qa_remarks, :qa_status) ON DUPLICATE KEY UPDATE item_id = VALUES(item_id), sku = VALUES(sku), barcode = VALUES(barcode), created_at = VALUES(created_at), created_by = VALUES(created_by), job_card_id = VALUES(job_card_id), is_qa = VALUES(is_qa), qa_remarks = VALUES(qa_remarks), qa_status = VALUES(qa_status)", TABLE_NAME );
     private final String SELECT_BY_LIMIT = String.format("SELECT * FROM %s ORDER BY id DESC LIMIT :limit", TABLE_NAME );
@@ -103,6 +104,12 @@ public class StitchingOfflineItemDAO {
         return namedParameterJdbcTemplate.query( SELECT_BY_IDS , params, new StitchingOfflineItemRowMapper() );
     }
 
+    public List<StitchingOfflineItem> findByJobCardId(long jobCardId){
+        MapSqlParameterSource params = new MapSqlParameterSource();
+        params.addValue( "job_card_id", jobCardId );
+        return namedParameterJdbcTemplate.query( SELECT_QUERY_BY_JOB_CARD , params, new StitchingOfflineItemRowMapper() );
+    }
+
     public List<StitchingOfflineItem> findByTerm( String term  ){
         MapSqlParameterSource params = new MapSqlParameterSource();
         params.addValue("term", "%" + term + "%" );
diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java
index 0489d2f..aba10a7 100644
--- a/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java
+++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java
@@ -42,9 +42,9 @@ public class InventoryAccountQueryBuilder {
                 .setTable("cut_to_pack.inventory_account")
                 .setColumns("*")
                 .where()
-                .columnEquals("id", id)
-                .and()
                 .columnLikeTitle("title", title)
+                .or()
+                .columnEquals("id", id)
                 .and()
                 .columnEquals("active", active)
                 .and()
diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java
index b4e05d2..4eede66 100644
--- a/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java
+++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java
@@ -8,7 +8,7 @@ import java.time.LocalDate;
 
 public class JobCardQueryBuilder {
 
-    public static String buildQuery( String id, String code, String createdBy, String status, String inventoryStatus, String customer, String lotNumber, String purchaseOrderId, String locationSiteId, String startDate, String endDate, Long count ){
+    public static String buildQuery(String code, String createdBy, String status, String inventoryStatus, String customer, String lotNumber, String purchaseOrderId, String locationSiteId, String startDate, String endDate, Long count ){
         // format date
         String formattedDate;
         String formattedEndDate;
@@ -30,9 +30,9 @@ public class JobCardQueryBuilder {
                 .setTable( "cut_to_pack.job_card" )
                 .setColumns( "*" )
                 .where()
-                .columnEquals( "id", id )
+                .columnEquals("created_by",createdBy)
                 .and()
-                .columnEquals( "code", code )
+                .columnLike(  "code" , "%" + code +"%" )
                 .and()
                 .columnEquals( "status", status )
                 .and()
diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java
new file mode 100644
index 0000000..fb90c68
--- /dev/null
+++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java
@@ -0,0 +1,49 @@
+package com.utopiaindustries.querybuilder.ctp;
+
+import com.utopiaindustries.querybuilder.QueryBuilder;
+import com.utopiaindustries.util.CTPDateTimeFormat;
+import com.utopiaindustries.util.StringUtils;
+
+import java.time.LocalDate;
+
+public class StichedOfflineItemQueryBuilder {
+
+    public static String buildQuery(String id, String itemId, String sku, String createdStartDate, String createdEndDate, String jobCardId, Long count) {
+        // format date
+        String formattedDate;
+        String formattedEndDate;
+        String startDate1 = "";
+        String endDate1 = "";
+        if (!StringUtils.isNullOrEmpty( createdStartDate)) {
+            formattedDate = CTPDateTimeFormat.getMySQLFormattedDateString(createdStartDate, CTPDateTimeFormat.HTML5_DATE_INPUT_FORMAT);
+            formattedEndDate = CTPDateTimeFormat.getMySQLFormattedDateString(createdEndDate, CTPDateTimeFormat.HTML5_DATE_INPUT_FORMAT);
+            startDate1 = String.format("'%s 00:00:01'", formattedDate);
+            if (!StringUtils.isNullOrEmpty(createdEndDate)) {
+                endDate1 = String.format("'%s 23:59:59'", formattedEndDate);
+            } else {
+                endDate1 = String.format("'%s 23:59:59'", LocalDate.now());
+            }
+        }
+
+        return ( new QueryBuilder() )
+                .setTable("cut_to_pack.stitching_offline_item")
+                .setColumns("*")
+                .where()
+                .columnEquals("id", id)
+                .and()
+                .columnEquals("sku", sku)
+                .and()
+                .columnEquals("item_id", itemId )
+                .and()
+                .columnEquals("job_card_id", jobCardId )
+                .and()
+                .columnEqualToOrGreaterThan("created_at", startDate1)
+                .and()
+                .columnEqualToOrLessThan("created_at", endDate1 )
+                .orderBy("id","DESC")
+                .limit(count)
+                .build();
+
+    }
+}
+
diff --git a/src/main/java/com/utopiaindustries/service/BundleService.java b/src/main/java/com/utopiaindustries/service/BundleService.java
index c566d42..65e0110 100644
--- a/src/main/java/com/utopiaindustries/service/BundleService.java
+++ b/src/main/java/com/utopiaindustries/service/BundleService.java
@@ -8,6 +8,7 @@ import com.utopiaindustries.model.ctp.StitchingOfflineItem;
 import com.utopiaindustries.querybuilder.ctp.BundleQueryBuilder;
 import com.utopiaindustries.querybuilder.ctp.FinishedItemQueryBuilder;
 import com.utopiaindustries.querybuilder.ctp.MasterBundleQueryBuilder;
+import com.utopiaindustries.querybuilder.ctp.StichedOfflineItemQueryBuilder;
 import com.utopiaindustries.util.NumberUtils;
 import com.utopiaindustries.util.StringUtils;
 import org.springframework.security.core.Authentication;
@@ -99,7 +100,7 @@ public class BundleService {
             count = 100L;
         }
         if( StringUtils.isAnyNotNullOrEmpty(id, itemId, sku, createdStartDate, createdEndDate, jobCardId ) ){
-            String query = FinishedItemQueryBuilder.buildQuery( id, itemId, sku, createdStartDate, createdEndDate, jobCardId , count );
+            String query = StichedOfflineItemQueryBuilder.buildQuery( id, itemId, sku, createdStartDate, createdEndDate, jobCardId , count );
             System.out.println( query );
             stitchingOfflineItems = stitchingOfflineItemDAO.findByQuery( query );
         } else {
diff --git a/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java b/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java
index 71b02d2..dc0e77d 100644
--- a/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java
+++ b/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java
@@ -51,4 +51,13 @@ public class InventoryArtifactService {
         finishedItem.setJobCard( jobCardDAO.find( finishedItem.getJobCardId() ) );
         return finishedItem;
     }
+
+    /*
+     *  get finished Items By Job Card ID
+     * */
+    public FinishedItem findFinishedItemByJobCardId( long id ){
+        FinishedItem finishedItem = finishedItemDAO.find( id );
+        finishedItem.setJobCard( jobCardDAO.find( finishedItem.getJobCardId() ) );
+        return finishedItem;
+    }
 }
diff --git a/src/main/java/com/utopiaindustries/service/InventoryService.java b/src/main/java/com/utopiaindustries/service/InventoryService.java
index 026a8f3..4cb57d1 100644
--- a/src/main/java/com/utopiaindustries/service/InventoryService.java
+++ b/src/main/java/com/utopiaindustries/service/InventoryService.java
@@ -61,7 +61,7 @@ public class InventoryService {
         if (  jobCardId == 0 || jobCardWrapper.getItems( ) == null || jobCardWrapper.getItems( ).isEmpty( ) ) {
             throw new RuntimeException( " JobCard can`t be empty");
         }
-        JobCard jobCard = jobCardDAO.find(  jobCardId );
+        JobCard jobCard = jobCardDAO.find( jobCardId );
         // get job cad items
         List<JobCardItemWrapper> jobCardItemWrappers = jobCardWrapper.getItems( );
         List<Long> jobCardItemWrapperIds = jobCardItemWrappers.stream( )
@@ -155,6 +155,8 @@ public class InventoryService {
 
         if ( transactionType.equalsIgnoreCase( InventoryTransactionLeg.Type.IN.name( ))) {
             initialBalance = initialBalance.add( inventoryTransactionLeg.getQuantity( ));
+        }else if(transactionType.equalsIgnoreCase( InventoryTransactionLeg.Type.OUT.name( )) && inventoryTransactionLeg.getQuantity().equals(BigDecimal.ZERO)){
+            initialBalance = BigDecimal.ZERO;
         } else {
             initialBalance = initialBalance.subtract( inventoryTransactionLeg.getQuantity( ));
         }
@@ -297,11 +299,15 @@ public class InventoryService {
     public void createStitchingOfflineItemsFromJobCard( JobCard jobCard) {
         List<JobCardItem> jobCardItems = jobCard.getItems( );
         List<JobCardItem> updatedItems = new ArrayList<>( );
+
         // validate items
         validateItems( jobCardItems);
         // check whether all bundles are received against finish goods
         checkAllBundleAreReceived( jobCard.getId( ), jobCardItems);
         for ( JobCardItem item : jobCardItems) {
+            if(item.getTotalProduction() == null){
+                item.setTotalProduction(BigDecimal.ZERO);
+            }
             // select which has inventory
             if (  item.getProduction( ).compareTo( BigDecimal.ZERO ) != 0 ) {
                 // production is completed out bundles
diff --git a/src/main/java/com/utopiaindustries/service/JobCardService.java b/src/main/java/com/utopiaindustries/service/JobCardService.java
index 93b9d70..171adb1 100644
--- a/src/main/java/com/utopiaindustries/service/JobCardService.java
+++ b/src/main/java/com/utopiaindustries/service/JobCardService.java
@@ -9,6 +9,7 @@ import com.utopiaindustries.model.uind.Item;
 import com.utopiaindustries.querybuilder.ctp.JobCardQueryBuilder;
 import com.utopiaindustries.util.StringUtils;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,8 +32,10 @@ public class JobCardService {
     private final LocationSiteDAO locationSiteDAO;
     private final PurchaseOrderDAO purchaseOrderDAO;
     private final UserInventoryAccountDAO userInventoryAccountDAO;
+    private final FinishedItemDAO finishedItemDAO;
+    private final StitchingOfflineItemDAO stitchingOfflineItemDAO;
 
-    public JobCardService(JobCardDAO jobCardDAO, CutPieceTypeDAO cutPieceTypeDAO, JobCardItemDAO jobCardItemDAO, CutPieceDAO cutPieceDAO, ItemDAO itemDAO, LocationSiteDAO locationSiteDAO, PurchaseOrderDAO purchaseOrderDAO, UserInventoryAccountDAO userInventoryAccountDAO) {
+    public JobCardService(JobCardDAO jobCardDAO, CutPieceTypeDAO cutPieceTypeDAO, JobCardItemDAO jobCardItemDAO, CutPieceDAO cutPieceDAO, ItemDAO itemDAO, LocationSiteDAO locationSiteDAO, PurchaseOrderDAO purchaseOrderDAO, UserInventoryAccountDAO userInventoryAccountDAO, FinishedItemDAO finishedItemDAO, StitchingOfflineItemDAO stitchingOfflineItemDAO) {
         this.jobCardDAO = jobCardDAO;
         this.cutPieceTypeDAO = cutPieceTypeDAO;
         this.jobCardItemDAO = jobCardItemDAO;
@@ -41,6 +44,8 @@ public class JobCardService {
         this.locationSiteDAO = locationSiteDAO;
         this.purchaseOrderDAO = purchaseOrderDAO;
         this.userInventoryAccountDAO = userInventoryAccountDAO;
+        this.finishedItemDAO = finishedItemDAO;
+        this.stitchingOfflineItemDAO = stitchingOfflineItemDAO;
     }
 
     /*
@@ -63,8 +68,7 @@ public class JobCardService {
     /*
      *  get cards
      * */
-    public List<JobCard> getCards( String id,
-                                   String code,
+    public List<JobCard> getCards( String code,
                                    String status,
                                    String inventoryStatus,
                                    String customer,
@@ -79,11 +83,16 @@ public class JobCardService {
         if( limit == null ){
             limit = 100L;
         }
-        if( StringUtils.isAnyNotNullOrEmpty( id, code, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate ) ){
-            String query = JobCardQueryBuilder.buildQuery( id, code, authentication.getName(), status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate, limit );
+        if( StringUtils.isAnyNotNullOrEmpty( code, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate ) ){
+            String query = JobCardQueryBuilder.buildQuery(code, authentication.getName(), status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate, limit );
             System.out.println( query );
+            for (GrantedAuthority role : authentication.getAuthorities()){
+                if (role.toString().equals("ROLE_ADMIN")){
+                   return jobCards = jobCardDAO.findByAllWithLimit(limit);
+                }
+            }
             jobCards = jobCardDAO.findByQuery( query );
-        } else {
+        }else {
             jobCards = jobCardDAO.findByUserAndLimit( authentication.getName(), limit );
         }
         return jobCards;
@@ -115,6 +124,7 @@ public class JobCardService {
     @Transactional( rollbackFor = Exception.class )
     public void save(JobCard jobCard) {
         if (jobCard != null && jobCard.getItems() != null) {
+            jobCard.setInventoryStatus(String.valueOf(JobCard.InventoryStatus.NOT_RECEIVED_YET));
             long jobCardId = jobCardDAO.save( jobCard );
             jobCard.setId( jobCardId );
             generateCode( jobCard );
@@ -192,9 +202,6 @@ public class JobCardService {
         return jobCard;
     }
 
-
-
-
     /*
      *  find card recursively
      * */
@@ -255,5 +262,22 @@ public class JobCardService {
     public List<JobCardItem> getJobCardItems( long jobCardId ){
         return jobCardItemDAO.findByCardId( jobCardId );
     }
+    public JobCard findByID( long jobCardId ){
+        return jobCardDAO.find( jobCardId );
+    }
 
+    public List<JobCardItem>  findJobCardItemByJobCardId( long jobCardId ){
+       return jobCardItemDAO.findByCardId(jobCardId);
+    }
+
+    public List<CutPiece>  findCutPieceByJobCardItemIds( List<Long> itemIds  ){
+        return cutPieceDAO.findByJobCardItemIdsWithGroupByType(itemIds);
+    }
+
+    public List<FinishedItem>  findFinishItemByJobCardId( long jobCardId ){
+        return finishedItemDAO.findByJobCardId( jobCardId );
+    }
+    public List<StitchingOfflineItem>  findStitchItemByJobCardId( long jobCardId ){
+        return stitchingOfflineItemDAO.findByJobCardId( jobCardId );
+    }
 }
diff --git a/src/main/java/com/utopiaindustries/service/UserService.java b/src/main/java/com/utopiaindustries/service/UserService.java
index 8312288..1d5d36f 100644
--- a/src/main/java/com/utopiaindustries/service/UserService.java
+++ b/src/main/java/com/utopiaindustries/service/UserService.java
@@ -87,7 +87,9 @@ public class UserService {
 
     private void saveUserRolesAndAccounts( User user ){
         List<Authority> newRoles = user.getAuthorities();
-        newRoles.forEach(authority -> authority.setUsername( user.getUsername() ));
+        if(newRoles != null) {
+            newRoles.forEach(authority -> authority.setUsername(user.getUsername()));
+        }
         List<UserInventoryAccount> newInventoryAccounts = user.getInventoryAccounts();
         if( newInventoryAccounts != null ){
             newInventoryAccounts.forEach(account -> account.setUsername( user.getUsername() ));
diff --git a/src/main/resources/static/js/receive-inventory.js b/src/main/resources/static/js/receive-inventory.js
index cc84bb0..72edae9 100644
--- a/src/main/resources/static/js/receive-inventory.js
+++ b/src/main/resources/static/js/receive-inventory.js
@@ -15,7 +15,7 @@
                      <td width="400">
                      <input hidden="hidden" v-bind:name="'items[' + index + '].jobCardId'" v-bind:value="item.jobCardId" >
                      <input hidden="hidden" v-bind:name="'items[' + index + '].jobCardItemId'" v-bind:value="item.id" >
-                         <item-search
+                         <item-search 
                                     v-bind:id-field-name="'items[' + index + '].itemId'"
                                     v-bind:id="item.itemId"
                                     v-bind:title="item.title"
@@ -37,10 +37,10 @@
                         <span class="form-control" readonly>{{item.expectedProduction}}</span>
                      </td>
                     <td  width="200">
-                        <input class="form-control" type="number" v-bind:name="'items[' + index + '].actualProduction'" v-bind:max="item.expectedProduction"  required>
+                        <input class="form-control" min="0" type="number" v-bind:name="'items[' + index + '].actualProduction'" v-bind:max="item.expectedProduction"  required>
                     </td>
                     <td>
-                        <span class="form-control" >{{ populateCuttingAccount() }}</span>
+                      {{ populateCuttingAccount() }}
                     </td>
                 </tr>
         `
@@ -60,15 +60,15 @@
                 <input hidden="hidden" v-bind:name="'items[' + pIndex + '].pieces[' + index  + '].id'" v-bind:value="piece.id">
                 <input hidden="hidden" v-bind:name="'items[' + pIndex + '].pieces[' + index  + '].jobCardItemId'" v-bind:value="piece.jobCardItemId">
                 <input hidden="hidden" v-bind:name="'items[' + pIndex + '].pieces[' + index  + '].type'" v-bind:value="piece.type">
-                <div class="col-md-5">
-                    <select class="form-control" v-bind:name="'pieces[' + index  +'].type'" v-model="piece.type" disabled>
+                <div  class="col-md-5">
+                    <select style="width: 150px;" class="form-control" v-bind:name="'pieces[' + index  +'].type'" v-model="piece.type" disabled>
                         <option value="">Please Select</option>
-                        <option v-for="(type,index) in $types"
+                        <option  v-for="(type,index) in $types"
                              v-bind:selected="type.title === piece.type"
                              v-bind:value="type.title">{{type.title}}</option>
                     </select>
                 </div>
-                <div class="col-md-5">
+                <div class="col-md-6" style="padding-left: 40px;">
                     <input class="form-control" type="number" v-bind:name="'items[' + pIndex + '].pieces[' + index  +'].quantity'" v-model="piece.quantity"  required/>
                 </div>
           </div>
@@ -81,7 +81,7 @@
 
         },
         template : `
-            <table class="table table-bordered bg-white col-sm-12">
+            <table class="table table-bordered bg-white w-100">
                 <thead>
                     <tr>
                         <th>Item</th>
@@ -89,11 +89,12 @@
                         <th>Cut Pieces</th>
                         <th>Expected Production</th>
                         <th>Actual Production</th>
-                         <th>Account</th>
+                         <th style="width: 312px" >Account</th>
+                    </tr>
                     </tr>
                 </thead>
                 <tbody>
-                    <item-rows  v-for="(item,index) in jobCard.items"
+                    <item-rows   v-for="(item,index) in jobCard.items"
                                 v-bind:key="index"
                                 v-bind:index="index"
                                 v-bind:item="item">            
diff --git a/src/main/resources/templates/_fragments.html b/src/main/resources/templates/_fragments.html
index 8a34827..35cac83 100644
--- a/src/main/resources/templates/_fragments.html
+++ b/src/main/resources/templates/_fragments.html
@@ -53,7 +53,7 @@
                                th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/packaging') ? 'active' : ''}">Packaging</a>
                         </li>
 
-                        <li class="nav-item" sec:authorize="hasAnyRole('ROLE_PACKAGING', 'ROLE_ADMIN')">
+                        <li class="nav-item" sec:authorize="hasAnyRole('ROLE_REPORTING', 'ROLE_ADMIN')">
                             <a th:href="@{/reporting/summary}" class="nav-link"
                                th:classappend="${#strings.startsWith(#httpServletRequest.getRequestURI(), '/ctp/reporting') ? 'active' : ''}">Reporting</a>
                         </li>
diff --git a/src/main/resources/templates/_job-card-fragment.html b/src/main/resources/templates/_job-card-fragment.html
index c726003..a0246e1 100644
--- a/src/main/resources/templates/_job-card-fragment.html
+++ b/src/main/resources/templates/_job-card-fragment.html
@@ -22,7 +22,7 @@
                             <div class="form-row">
                                 <div class="col-sm-3 form-group">
                                     <label>Job Order</label>
-                                    <input class="form-control" th:field="*{jobOrderId}" required>
+                                    <input type="number" class="form-control" th:field="*{jobOrderId}" required>
                                 </div>
                                 <div class="col-sm-3 form-group">
                                     <label>Customer</label>
diff --git a/src/main/resources/templates/_job-card-sidebar.html b/src/main/resources/templates/_job-card-sidebar.html
index 9d7e663..0c5b148 100644
--- a/src/main/resources/templates/_job-card-sidebar.html
+++ b/src/main/resources/templates/_job-card-sidebar.html
@@ -8,11 +8,7 @@
                 <form th:action="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}">
                     <h5 class="mb-4">Refine Your Search</h5>
                     <div class="form-group">
-                        <label>ID</label>
-                        <input type="text" class="form-control" name="id" maxlength="100" th:value="${param['id']}">
-                    </div>
-                    <div class="form-group">
-                        <label>Code</label>
+                        <label>ID/Code</label>
                         <input type="text" class="form-control" name="code" maxlength="100" th:value="${param['code']}">
                     </div>
                     <div class="form-group">
diff --git a/src/main/resources/templates/cutting/_bundle-sidebar.html b/src/main/resources/templates/cutting/_bundle-sidebar.html
index 7a87757..b7a6ec9 100644
--- a/src/main/resources/templates/cutting/_bundle-sidebar.html
+++ b/src/main/resources/templates/cutting/_bundle-sidebar.html
@@ -20,7 +20,7 @@
                         <input type="text" class="form-control" name="jc-id" maxlength="100" th:value="${param['jc-id']}">
                     </div>
                     <div class="form-group">
-                        <label>Master Bundle ID</label>
+                        <label>Master Barcode ID</label>
                         <input type="text" class="form-control" name="master-id" maxlength="100" th:value="${param['master-id']}">
                     </div>
                     <div>
diff --git a/src/main/resources/templates/cutting/inventory-transactions.html b/src/main/resources/templates/cutting/inventory-transactions.html
index ef8e467..3ad8783 100644
--- a/src/main/resources/templates/cutting/inventory-transactions.html
+++ b/src/main/resources/templates/cutting/inventory-transactions.html
@@ -38,7 +38,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr th:each="transaction : ${transactions}" th:object="${transaction}">
+                            <tr th:if="${transaction.getBalance() > -1 }" th:each="transaction : ${transactions}" th:object="${transaction}">
                                 <td th:text="*{id}"></td>
                                 <td th:text="*{itemId}"></td>
                                 <td th:text="*{sku}"></td>
diff --git a/src/main/resources/templates/finishing/finished-item-list.html b/src/main/resources/templates/finishing/finished-item-list.html
index b99ed64..92d6726 100644
--- a/src/main/resources/templates/finishing/finished-item-list.html
+++ b/src/main/resources/templates/finishing/finished-item-list.html
@@ -50,9 +50,9 @@
                                     <td th:text="${item.createdBy}"></td>
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
-                                        <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
-                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge badge-warning">REVERTED</span>
-                                        <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
+                                        <span th:if="${not item.isSegregated && item.qaStatus != ('ALTER')}" class="badge badge-danger">PENDING</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus == ('ALTER')}" class="badge badge-warning">REVERTED</span>
+                                        <div th:if="${item.isSegregated && item.qaStatus != ('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
                                     </td>
diff --git a/src/main/resources/templates/job-card-list.html b/src/main/resources/templates/job-card-list.html
index 24cd34b..6840123 100644
--- a/src/main/resources/templates/job-card-list.html
+++ b/src/main/resources/templates/job-card-list.html
@@ -34,7 +34,7 @@
                         </thead>
                         <tbody>
                             <tr th:each="card : ${cards}" th:object="${card}">
-                                <td th:text="*{code}"></td>
+                                <td><a class="text-reset" th:href="@{'job-card-detail/' + *{getId()}}" th:text="*{code}"></a></td>
                                 <td th:text="*{jobOrderId}"></td>
                                 <td>
                                     <span class="badge" th:classappend="'badge-' + *{status}" th:if="*{status}" th:text="*{status}"></span>
diff --git a/src/main/resources/templates/job-card-view.html b/src/main/resources/templates/job-card-view.html
new file mode 100644
index 0000000..19b9b70
--- /dev/null
+++ b/src/main/resources/templates/job-card-view.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:uind="http://www.w3.org/1999/xhtml">
+<head th:replace="_fragments :: head('View PO')"></head>
+<body>
+<div class="container-fluid">
+    <header class="row page-header" th:replace="_fragments :: page-header"></header>
+    <main class="row page-main">
+        <div class="col-sm">
+            <table class="table table-bordered" >
+                <thead class="thead-dark">
+                <tr>
+                    <th colspan="2" class="text-center">
+                        <span th:text="'Job Card Detail'"></span>
+                    </th>
+                </tr>
+                </thead>
+                    <tbody>
+                        <tr>
+                            <td width="200"><i>Code</i></td>
+                            <td th:text="${card.getCode()}"></td>
+                        </tr>
+                        <tr>
+                            <td><i>Job Order ID</i></td>
+                            <td>
+                                <span >
+                                    <a class="text-reset" target="_blank" th:text="${card.getJobOrderId()}" ></a>
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Card Status</i></td>
+                            <td>
+                                <span th:text="${card.getStatus()}"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Inventory Status</i></td>
+                            <td>
+                                <span th:text="${card.getInventoryStatus()}"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Customer</i></td>
+                            <td>
+                                <span th:text="${card.getCustomer()}"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Lot Number</i></td>
+                            <td>
+                                <span th:text="${card.getLotNumber()}"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Purchase Order ID</i></td>
+                            <td>
+                                <span th:text="${card.getPurchaseOrderId()}"></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Items</i></td>
+                            <td class="m-0 p-0">
+                                <table class="table mb-0">
+                                    <thead>
+                                    <tr>
+                                        <th>ID</th>
+                                        <th>Item ID</th>
+                                        <th>Sku</th>
+                                        <th>Expected Production</th>
+                                        <th>Actual Production</th>
+                                        <th>Total Production</th>
+                                        <th class="text-center font-lg">Cut Piece Items</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr th:each="cardItem : ${jobCardItems}">
+                                        <td th:text="${cardItem.getId()}"></td>
+                                        <td th:text="${cardItem.getItemId()}"></td>
+                                        <td th:text="${cardItem.getSku()}"></td>
+                                        <td th:text="${cardItem.getExpectedProduction()}"></td>
+                                        <td th:text="${cardItem.getActualProduction()}"></td>
+                                        <td th:text="${cardItem.getTotalProduction()}"></td>
+                                        <td class="m-0 p-0">
+                                            <table class="table m-0 p-0">
+                                                <tbody>
+                                                <tr th:if="*{cardItem.getId() == cutPieceItem.getJobCardItemId()}" th:each="cutPieceItem : ${cutPiece}">
+                                                    <td th:text="${cutPieceItem.getType()}"></td>
+                                                    <td th:text="${cutPieceItem.getQuantity()}"></td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Stitching Offline Items</i> <i ></i></td>
+                            <td class="m-0 p-0">
+
+                                <table class="table">
+                                    <thead>
+                                    <tr>
+                                        <th>ID</th>
+                                        <th>Item ID</th>
+                                        <th>Sku</th>
+                                        <th>Bar Code</th>
+                                        <th>QA Status</th>
+                                        <th>QA Remarks</th>
+                                        <th>Created At</th>
+                                        <th>Created By</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr th:each="cardStitchingItem : ${stitchingItem}">
+                                        <td th:text="${cardStitchingItem.getId()}"></td>
+                                        <td th:text="${cardStitchingItem.getItemId()}">ad</td>
+                                        <td th:text="${cardStitchingItem.getSku()}"></td>
+                                        <td th:text="${cardStitchingItem.getBarcode()}"></td>
+                                        <td th:text="${cardStitchingItem.getQaStatus()}"></td>
+                                        <td th:text="${cardStitchingItem.getQaRemarks()}"></td>
+                                        <td th:text="${cardStitchingItem.getCreatedAt()}"></td>
+                                        <td th:text="${cardStitchingItem.getCreatedBy()}"></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="align-middle"><i>Finish Items</i></td>
+                            <td class="m-0 p-0">
+
+                                <table class="table mb-0">
+                                    <thead>
+                                    <tr>
+                                        <th>ID</th>
+                                        <th>Item ID</th>
+                                        <th>Sku</th>
+                                        <th>Bar Code</th>
+                                        <th>Status</th>
+                                        <th>Created At</th>
+                                        <th>Created By</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr th:each="cardfinishItem : ${finishItem}">
+                                        <td th:text="${cardfinishItem.getId()}"></td>
+                                        <td th:text="${cardfinishItem.getItemId()}">ad</td>
+                                        <td th:text="${cardfinishItem.getSku()}"></td>
+                                        <td th:text="${cardfinishItem.getBarcode()}"></td>
+                                        <td th:text="${cardfinishItem.getQaStatus()}"></td>
+                                        <td th:text="${cardfinishItem.getCreatedAt()}"></td>
+                                        <td th:text="${cardfinishItem.getCreatedBy()}"></td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+        </div>
+    </main>
+</div>
+
+<div th:replace="_fragments :: page-footer-scripts"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/quality-control/qc-items-list.html b/src/main/resources/templates/quality-control/qc-items-list.html
index 1f14b58..65336e9 100644
--- a/src/main/resources/templates/quality-control/qc-items-list.html
+++ b/src/main/resources/templates/quality-control/qc-items-list.html
@@ -50,9 +50,9 @@
                                     <td th:text="${item.createdBy}"></td>
                                     <td ctp:formatdatetime="${item.createdAt}"></td>
                                     <td>
-                                        <span th:if="${not item.isSegregated && !item.qaStatus.equals('ALTER')}" class="badge badge-danger">PENDING</span>
-                                        <span th:if="${not item.isSegregated && item.qaStatus.equals('ALTER')}" class="badge badge-warning" >REVERTED</span>
-                                        <div th:if="${item.isSegregated && !item.qaStatus.equals('ALTER')}">
+                                        <span th:if="${not item.isSegregated && item.qaStatus != 'ALTER'}" class="badge badge-danger">PENDING</span>
+                                        <span th:if="${not item.isSegregated && item.qaStatus == ('ALTER')}" class="badge badge-warning" >REVERTED</span>
+                                        <div th:if="${item.isSegregated && item.qaStatus != ('ALTER')}">
                                             <span class="badge badge-APPROVED">DONE</span>
                                         </div>
                                     </td>
diff --git a/src/main/resources/templates/stitching/stitching-item-form.html b/src/main/resources/templates/stitching/stitching-item-form.html
index e429666..5b5b69f 100644
--- a/src/main/resources/templates/stitching/stitching-item-form.html
+++ b/src/main/resources/templates/stitching/stitching-item-form.html
@@ -79,7 +79,7 @@
                                                 <span class="form-control">{{item.actualProduction}}</span>
                                             </td>
                                             <td>
-                                                <input hidden="hidden"  v-bind:name="'items[' + index + '].totalProduction'" v-bind:value="item.totalProduction">
+                                                <input hidden="hidden"   v-bind:name="'items[' + index + '].totalProduction'" v-bind:value="item.totalProduction">
                                                 <span class="form-control">{{item.totalProduction}}</span>
                                             </td>
                                             <td>
-- 
2.40.1


From 60956b36baf57cc9977a153363f68d443d7ec1a1 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Tue, 31 Dec 2024 15:27:22 +0500
Subject: [PATCH 4/7] add table validation

---
 .../controller/JobCardController.java         |  8 +++--
 .../dao/ctp/FinishedItemDAO.java              | 16 ++++++++++
 .../dao/ctp/StitchingOfflineItemDAO.java      | 18 +++++++++++
 .../service/JobCardService.java               | 10 ++++++
 .../resources/templates/job-card-view.html    | 32 +++++++++++++------
 .../quality-control/qc-items-form.html        |  2 +-
 6 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/controller/JobCardController.java b/src/main/java/com/utopiaindustries/controller/JobCardController.java
index 5e3dfa8..23c5175 100644
--- a/src/main/java/com/utopiaindustries/controller/JobCardController.java
+++ b/src/main/java/com/utopiaindustries/controller/JobCardController.java
@@ -144,7 +144,6 @@ public class JobCardController {
                                    @PathVariable long id,
                                    RedirectAttributes redirectAttributes,
                                    Model model ){
-
         try {
             jobCard.setStatus(JobCard.Status.POSTED.name() );
             jobCardService.save( jobCard );
@@ -160,13 +159,18 @@ public class JobCardController {
                                        Model model ){
         List<JobCardItem> jobCardItems = jobCardService.findJobCardItemByJobCardId(id);
         List<Long> jobCardItemIds = jobCardItems.stream()
+                .map(JobCardItem::getItemId)
+                .collect(Collectors.toList());
+        List<Long> itemIds = jobCardItems.stream()
                 .map(JobCardItem::getId)
                 .collect(Collectors.toList());
         model.addAttribute( "card", jobCardService.findByID(id));
         model.addAttribute("jobCardItems", jobCardItems);
-        model.addAttribute("cutPiece",jobCardService.findCutPieceByJobCardItemIds(jobCardItemIds));
+        model.addAttribute("cutPiece",jobCardService.findCutPieceByJobCardItemIds(itemIds));
         model.addAttribute("finishItem",jobCardService.findFinishItemByJobCardId(id));
         model.addAttribute("stitchingItem",jobCardService.findStitchItemByJobCardId(id));
+        model.addAttribute("totalFinishItem",jobCardService.totalFinishItem(jobCardItemIds, id));
+        model.addAttribute("totalStitchingItem",jobCardService.totalStitchingItem(jobCardItemIds, id));
         return "job-card-view";
     }
 
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
index 56c489c..7142c09 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
@@ -10,6 +10,7 @@ import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 @Repository
@@ -25,6 +26,7 @@ public class FinishedItemDAO {
 	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, item_id, sku, barcode, created_at, created_by, job_card_id, is_qa, stitched_item_id, is_segregated, qa_status) VALUES (:id, :item_id, :sku, :barcode, :created_at, :created_by, :job_card_id, :is_qa, :stitched_item_id, :is_segregated, :qa_status) ON DUPLICATE KEY UPDATE item_id = VALUES(item_id), sku = VALUES(sku), barcode = VALUES(barcode), created_at = VALUES(created_at), created_by = VALUES(created_by), job_card_id = VALUES(job_card_id), is_qa = VALUES(is_qa), stitched_item_id = VALUES(stitched_item_id), is_segregated = VALUES(is_segregated), qa_status = VALUES(qa_status)", TABLE_NAME );
 	private final String SELECT_BY_LIMIT = String.format("SELECT * FROM %s ORDER BY id DESC LIMIT :limit", TABLE_NAME );
 	private final String SELECT_BY_IDS = String.format( "SELECT * FROM %s WHERE id IN (:ids)", TABLE_NAME );
+	private final String FIND_TOTAL_COUNT = String.format("SELECT COUNT(*) FROM %s  where job_card_id = :job_card_id And item_id = :item_id", TABLE_NAME );
 	private final String SELECT_BY_TERM = String.format( "SELECT * FROM %s WHERE barcode LIKE :term AND is_segregated = :is_segregated ORDER BY ID DESC", TABLE_NAME );
 	private final String SELECT_BY_STITCHED_ITEM_ID = String.format( "SELECT * FROM %s WHERE stitched_item_id = :stitched_item_id", TABLE_NAME );
 	private final String SELECT_BY_STITCHED_ITEM_IDS = String.format( "SELECT * FROM %s WHERE stitched_item_id IN (:stitched_item_ids)", TABLE_NAME );
@@ -135,6 +137,20 @@ public class FinishedItemDAO {
 
 	}
 
+	public HashMap<Long, Long> findTotalCount(List<Long> itemIds, long jobCardId) {
+		HashMap<Long, Long> totalCounts = new HashMap<>();
+		MapSqlParameterSource params = new MapSqlParameterSource();
+		for (long id : itemIds) {
+			params.addValue("job_card_id", jobCardId);
+			params.addValue("item_id", id);
+			Long total = namedParameterJdbcTemplate.queryForObject(FIND_TOTAL_COUNT, params, Long.class);
+			if (total != null) {
+				totalCounts.put(id, total);
+			}
+		}
+		return totalCounts;
+	}
+
 	public List<FinishedItem> findByStitchedItemIds( List<Long> stitchedItemIds ){
 		if( stitchedItemIds == null || stitchedItemIds.isEmpty() ) return new ArrayList<>();
 		MapSqlParameterSource params = new MapSqlParameterSource();
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
index b8887b4..a5c8c5d 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
@@ -9,6 +9,7 @@ import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 @Repository
@@ -23,6 +24,7 @@ public class StitchingOfflineItemDAO {
     private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
     private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, item_id, sku, barcode, created_at, created_by, job_card_id, is_qa, qa_remarks, qa_status) VALUES (:id, :item_id, :sku, :barcode, :created_at, :created_by, :job_card_id, :is_qa, :qa_remarks, :qa_status) ON DUPLICATE KEY UPDATE item_id = VALUES(item_id), sku = VALUES(sku), barcode = VALUES(barcode), created_at = VALUES(created_at), created_by = VALUES(created_by), job_card_id = VALUES(job_card_id), is_qa = VALUES(is_qa), qa_remarks = VALUES(qa_remarks), qa_status = VALUES(qa_status)", TABLE_NAME );
     private final String SELECT_BY_LIMIT = String.format("SELECT * FROM %s ORDER BY id DESC LIMIT :limit", TABLE_NAME );
+    private final String FIND_TOTAL_COUNT = String.format("SELECT COUNT(*) FROM %s  where job_card_id = :job_card_id And item_id = :item_id", TABLE_NAME );
     private final String SELECT_BY_IDS = String.format( "SELECT * FROM %s WHERE id IN (:ids)", TABLE_NAME );
     private final String SELECT_BY_TERM = String.format( "SELECT * FROM %s WHERE barcode LIKE :term ORDER BY ID DESC", TABLE_NAME );
     private final String SELECT_BY_MASTER_ID = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id", TABLE_NAME );
@@ -122,4 +124,20 @@ public class StitchingOfflineItemDAO {
         params.addValue("job_card_id", masterId );
         return namedParameterJdbcTemplate.query( SELECT_BY_MASTER_ID , params, new StitchingOfflineItemRowMapper() );
     }
+
+    public HashMap<Long, Long> findTotalCount(List<Long> itemIds, long jobCardId) {
+        HashMap<Long, Long> totalCounts = new HashMap<>();
+        MapSqlParameterSource params = new MapSqlParameterSource();
+        for (long id : itemIds) {
+            params.addValue("job_card_id", jobCardId);
+            params.addValue("item_id", id);
+            Long total = namedParameterJdbcTemplate.queryForObject(FIND_TOTAL_COUNT, params, Long.class);
+
+            if (total != null) {
+                totalCounts.put(id, total);
+            }
+        }
+        return totalCounts;
+    }
+
 }
diff --git a/src/main/java/com/utopiaindustries/service/JobCardService.java b/src/main/java/com/utopiaindustries/service/JobCardService.java
index 171adb1..aa50ab6 100644
--- a/src/main/java/com/utopiaindustries/service/JobCardService.java
+++ b/src/main/java/com/utopiaindustries/service/JobCardService.java
@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -277,7 +278,16 @@ public class JobCardService {
     public List<FinishedItem>  findFinishItemByJobCardId( long jobCardId ){
         return finishedItemDAO.findByJobCardId( jobCardId );
     }
+
     public List<StitchingOfflineItem>  findStitchItemByJobCardId( long jobCardId ){
         return stitchingOfflineItemDAO.findByJobCardId( jobCardId );
     }
+
+    public HashMap<Long, Long> totalStitchingItem(List<Long> itemIds, long jobCardId ){
+        return stitchingOfflineItemDAO.findTotalCount( itemIds, jobCardId );
+    }
+
+    public HashMap<Long, Long> totalFinishItem(List<Long> itemIds, long jobCardId ){
+        return finishedItemDAO.findTotalCount( itemIds, jobCardId );
+    }
 }
diff --git a/src/main/resources/templates/job-card-view.html b/src/main/resources/templates/job-card-view.html
index 19b9b70..0575e6f 100644
--- a/src/main/resources/templates/job-card-view.html
+++ b/src/main/resources/templates/job-card-view.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org" xmlns:uind="http://www.w3.org/1999/xhtml">
-<head th:replace="_fragments :: head('View PO')"></head>
+<head th:replace="_fragments :: head('Job Card Detail')"></head>
 <body>
 <div class="container-fluid">
     <header class="row page-header" th:replace="_fragments :: page-header"></header>
@@ -69,6 +69,8 @@
                                         <th>Expected Production</th>
                                         <th>Actual Production</th>
                                         <th>Total Production</th>
+                                        <th>Total Stitching Item</th>
+                                        <th>Total Finish Item</th>
                                         <th class="text-center font-lg">Cut Piece Items</th>
                                     </tr>
                                     </thead>
@@ -80,6 +82,8 @@
                                         <td th:text="${cardItem.getExpectedProduction()}"></td>
                                         <td th:text="${cardItem.getActualProduction()}"></td>
                                         <td th:text="${cardItem.getTotalProduction()}"></td>
+                                        <td th:text="${totalStitchingItem.get(cardItem.getItemId())}"></td>
+                                        <td th:text="${totalFinishItem.get(cardItem.getItemId())}"></td>
                                         <td class="m-0 p-0">
                                             <table class="table m-0 p-0">
                                                 <tbody>
@@ -97,9 +101,9 @@
                         </tr>
                         <tr>
                             <td class="align-middle"><i>Stitching Offline Items</i> <i ></i></td>
-                            <td class="m-0 p-0">
+                            <td class="m-0 p-0 text-center">
 
-                                <table class="table">
+                                <table th:if="${!stitchingItem.isEmpty() }" class="table">
                                     <thead>
                                     <tr>
                                         <th>ID</th>
@@ -118,20 +122,23 @@
                                         <td th:text="${cardStitchingItem.getItemId()}">ad</td>
                                         <td th:text="${cardStitchingItem.getSku()}"></td>
                                         <td th:text="${cardStitchingItem.getBarcode()}"></td>
-                                        <td th:text="${cardStitchingItem.getQaStatus()}"></td>
+                                        <td>
+                                            <span th:if="${cardStitchingItem.getQaStatus() == 'APPROVED'}" th:text="${cardStitchingItem.getQaStatus()}" class="badge badge-APPROVED"></span>
+                                            <span th:if="${cardStitchingItem.getQaStatus() == 'REJECT'}" th:text="${cardStitchingItem.getQaStatus()}" class="badge badge-warning"></span>
+                                        </td>
                                         <td th:text="${cardStitchingItem.getQaRemarks()}"></td>
-                                        <td th:text="${cardStitchingItem.getCreatedAt()}"></td>
+                                        <td ctp:formatdatetime="${cardStitchingItem.getCreatedAt()}"></td>
                                         <td th:text="${cardStitchingItem.getCreatedBy()}"></td>
                                     </tr>
                                     </tbody>
                                 </table>
+                                <span th:if="${stitchingItem.isEmpty() }" class="p-5 text-center font-lg font-weight-bold" > No Data Available</span>
                             </td>
                         </tr>
                         <tr>
                             <td class="align-middle"><i>Finish Items</i></td>
-                            <td class="m-0 p-0">
-
-                                <table class="table mb-0">
+                            <td class="m-0 p-0 text-center">
+                                <table th:if="${!finishItem.isEmpty() }" class="table mb-0">
                                     <thead>
                                     <tr>
                                         <th>ID</th>
@@ -149,12 +156,17 @@
                                         <td th:text="${cardfinishItem.getItemId()}">ad</td>
                                         <td th:text="${cardfinishItem.getSku()}"></td>
                                         <td th:text="${cardfinishItem.getBarcode()}"></td>
-                                        <td th:text="${cardfinishItem.getQaStatus()}"></td>
-                                        <td th:text="${cardfinishItem.getCreatedAt()}"></td>
+                                        <td>
+                                            <span th:if="${cardfinishItem.getQaStatus() == 'APPROVED'}" th:text="${cardfinishItem.getQaStatus()}" class="badge badge-APPROVED"></span>
+                                            <span th:if="${cardfinishItem.getQaStatus() == 'WASHED'}" th:text="${cardfinishItem.getQaStatus()}" class="badge badge-danger"></span>
+                                            <span th:if="${cardfinishItem.getQaStatus() == 'ALTER'}" th:text="${cardfinishItem.getQaStatus()}" class="badge badge-warning"></span>
+                                        </td>
+                                        <td ctp:formatdatetime="${cardfinishItem.getCreatedAt()}"></td>
                                         <td th:text="${cardfinishItem.getCreatedBy()}"></td>
                                     </tr>
                                     </tbody>
                                 </table>
+                                <span th:if="${finishItem.isEmpty() }" class="p-5 text-center font-lg font-weight-bold" > No Data Available</span>
                             </td>
                         </tr>
                     </tbody>
diff --git a/src/main/resources/templates/quality-control/qc-items-form.html b/src/main/resources/templates/quality-control/qc-items-form.html
index e2f116e..38a0249 100644
--- a/src/main/resources/templates/quality-control/qc-items-form.html
+++ b/src/main/resources/templates/quality-control/qc-items-form.html
@@ -23,7 +23,7 @@
                                 <div class="col-sm-3 form-group">
                                     <label>Finishing Account</label>
                                     <select class="form-control" name="account-id" th:field="*{finishedAccountId}" required>
-                                        <option value="">PLease select</option>
+                                        <option value="">Please select</option>
                                         <option th:each="account : ${accounts}"
                                             th:value="${account.id}"
                                             th:text="${account.title}"></option>
-- 
2.40.1


From dbbc4da8539b7aa2f2cf0d5d33eda2f22603d0c4 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Thu, 2 Jan 2025 09:17:32 +0500
Subject: [PATCH 5/7] fixed bugs and add job card view, update summary table,

---
 .../controller/CuttingController.java             | 15 ++++++++-------
 .../controller/ReportingController.java           |  4 ++--
 .../utopiaindustries/dao/ctp/FinishedItemDAO.java | 15 +++++++++++++++
 .../StitchingItemsRestController.java             |  9 +++++++--
 .../service/InventoryService.java                 |  2 +-
 .../finishing/finished-item-segregation-form.js   |  2 +-
 src/main/resources/static/js/job-card-form.js     |  2 +-
 .../static/js/qc/finished-items-qc-form.js        |  2 +-
 .../cutting/generate-master-barcode.html          |  2 +-
 .../templates/cutting/inventory-transactions.html |  2 +-
 .../templates/cutting/receive-inventory.html      |  4 ++--
 src/main/resources/templates/job-card-view.html   |  8 ++------
 .../reporting/inventory-summary-sidebar.html      |  4 ----
 .../templates/reporting/inventory-summary.html    | 14 ++++++++++++++
 14 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/controller/CuttingController.java b/src/main/java/com/utopiaindustries/controller/CuttingController.java
index 98bbb82..11a922c 100644
--- a/src/main/java/com/utopiaindustries/controller/CuttingController.java
+++ b/src/main/java/com/utopiaindustries/controller/CuttingController.java
@@ -117,15 +117,12 @@ public class CuttingController {
                                 @RequestParam( value = "start-date", required = false) String startDate,
                                 @RequestParam( value = "end-date", required = false) String endDate,
                                 @RequestParam( value = "count", required = false ) Long count,
-                                Model model, RedirectAttributes redirectAttributes){
+                                Model model){
 
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
         model.addAttribute("bundles", bundleService.getBundles( id, sku, jobCardId, masterId, type, status, startDate1.toString(), endDate1.toString() ,count ) );
         model.addAttribute("types", jobCardService.getAllPieceTypes() );
-        if(exceptionCheck){
-            redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
-        }
         if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
             return "redirect:/cutting/bundles?id=&sku=&jc-id=&master-id=&type=&status=0&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
         }
@@ -139,11 +136,15 @@ public class CuttingController {
                                      @RequestParam(value = "start-date", required = false) String startDate,
                                      @RequestParam(value = "end-date", required = false) String endDate,
                                      @RequestParam(value = "count", required = false) Long count,
-                                     Model model ){
+                                     @RequestParam( value = "exceptionCheck", required = false, defaultValue = "false") boolean exceptionCheck,
+                                     Model model, RedirectAttributes redirectAttributes ){
+        if(exceptionCheck){
+            redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
+        }
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
         model.addAttribute("masterBundles", bundleService.getMasterBundles( id, jobCardId, startDate1.toString(), endDate1.toString(), count ) );
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
+        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate ) || exceptionCheck ){
             return "redirect:/cutting/master-bundles?id=&jc-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
         }
         return "/cutting/master-bundles";
@@ -161,7 +162,7 @@ public class CuttingController {
     public Object generateBarcode(@RequestParam( name = "ids", required = false ) Long[] ids,
                                   @RequestParam( name = "artifactType", required = true ) String artifactType ) throws Exception {
         if(ids == null){
-            return "redirect:/cutting/bundles?exceptionCheck=true";
+            return "redirect:/cutting/master-bundles?id=&jc-id=&start-date=2024-12-01&end-date=2024-12-31&count=100&exceptionCheck=true";
         }
         return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
     }
diff --git a/src/main/java/com/utopiaindustries/controller/ReportingController.java b/src/main/java/com/utopiaindustries/controller/ReportingController.java
index 4649ed9..9243511 100644
--- a/src/main/java/com/utopiaindustries/controller/ReportingController.java
+++ b/src/main/java/com/utopiaindustries/controller/ReportingController.java
@@ -34,8 +34,8 @@ public class ReportingController {
                                      Model model ){
 
         Map<String, Map<String, List<SummaryInventoryReport>>> getDataByFilteration = summaryInventoryReportService.findByFilter(itemId,sku,startDate,endDate);
-        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(7) : LocalDate.parse(startDate);
-        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(6) : LocalDate.parse(startDate);
+        LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now().plusDays(1) : LocalDate.parse(endDate);
         ArrayList<LocalDate> arrayList = generateDateList(startDate1,endDate1);
         model.addAttribute("dateLimits", arrayList);
         model.addAttribute("tableData", getDataByFilteration);
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
index 7142c09..380df3e 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
@@ -2,6 +2,7 @@ package com.utopiaindustries.dao.ctp;
 
 import com.utopiaindustries.model.ctp.FinishedItem;
 import com.utopiaindustries.model.ctp.JobCard;
+import com.utopiaindustries.model.ctp.StitchingOfflineItem;
 import com.utopiaindustries.util.KeyHolderFunctions;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -21,6 +22,7 @@ public class FinishedItemDAO {
 	private final String TABLE_NAME = "cut_to_pack.finished_item";
 	private final String SELECT_QUERY = String.format( "SELECT * FROM %s WHERE id = :id", TABLE_NAME );
 	private final String SELECT_ALL_QUERY = String.format( "SELECT * FROM %s ORDER BY id DESC", TABLE_NAME );
+	private final String SELECT_QUERY_BY_BARCODE_QA_STATUS = String.format( "SELECT case when EXISTS ( SELECT * FROM %s WHERE barcode = :barcode AND (qa_status = 'APPROVED' OR qa_status = 'WASHED') ) then true else false End as Result", TABLE_NAME );
 	private final String SELECT_QUERY_BY_JOB_CARD = String.format( "SELECT * FROM %s WHERE job_card_id = :job_card_id", TABLE_NAME );
 	private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
 	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, item_id, sku, barcode, created_at, created_by, job_card_id, is_qa, stitched_item_id, is_segregated, qa_status) VALUES (:id, :item_id, :sku, :barcode, :created_at, :created_by, :job_card_id, :is_qa, :stitched_item_id, :is_segregated, :qa_status) ON DUPLICATE KEY UPDATE item_id = VALUES(item_id), sku = VALUES(sku), barcode = VALUES(barcode), created_at = VALUES(created_at), created_by = VALUES(created_by), job_card_id = VALUES(job_card_id), is_qa = VALUES(is_qa), stitched_item_id = VALUES(stitched_item_id), is_segregated = VALUES(is_segregated), qa_status = VALUES(qa_status)", TABLE_NAME );
@@ -157,4 +159,17 @@ public class FinishedItemDAO {
 		params.addValue("stitched_item_ids", stitchedItemIds );
 		return namedParameterJdbcTemplate.query( SELECT_BY_STITCHED_ITEM_IDS, params, new FinishedItemRowMapper() );
 	}
+
+	public List<StitchingOfflineItem> findByBarcodeAndApprovedStatus( List<StitchingOfflineItem> finishedItems ){
+		List<StitchingOfflineItem> items = new ArrayList<>();
+		for (StitchingOfflineItem item : finishedItems){
+			MapSqlParameterSource params = new MapSqlParameterSource();
+			params.addValue("barcode", item.getBarcode() );
+			boolean check =Boolean.TRUE.equals(namedParameterJdbcTemplate.queryForObject( SELECT_QUERY_BY_BARCODE_QA_STATUS, params, Boolean.class ));
+			if(!check){
+				items.add(item);
+			}
+		}
+		return items;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/utopiaindustries/restcontroller/StitchingItemsRestController.java b/src/main/java/com/utopiaindustries/restcontroller/StitchingItemsRestController.java
index 2fd8b37..6fb18da 100644
--- a/src/main/java/com/utopiaindustries/restcontroller/StitchingItemsRestController.java
+++ b/src/main/java/com/utopiaindustries/restcontroller/StitchingItemsRestController.java
@@ -1,5 +1,6 @@
 package com.utopiaindustries.restcontroller;
 
+import com.utopiaindustries.dao.ctp.FinishedItemDAO;
 import com.utopiaindustries.dao.ctp.StitchingOfflineItemDAO;
 import com.utopiaindustries.model.ctp.StitchingOfflineItem;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,14 +14,18 @@ import java.util.List;
 @RequestMapping( "/rest/stitching-offline-items" )
 public class StitchingItemsRestController {
 
+    private final FinishedItemDAO finishedItemDAO;
+
     private final StitchingOfflineItemDAO stitchingOfflineItemDAO;
 
-    public StitchingItemsRestController(StitchingOfflineItemDAO stitchingOfflineItemDAO) {
+    public StitchingItemsRestController(StitchingOfflineItemDAO stitchingOfflineItemDAO, FinishedItemDAO finishedItemDAO) {
         this.stitchingOfflineItemDAO = stitchingOfflineItemDAO;
+        this.finishedItemDAO = finishedItemDAO;
     }
 
     @GetMapping( "/search" )
     public List<StitchingOfflineItem> searchFinishedItems(@RequestParam( "term") String term ){
-        return stitchingOfflineItemDAO.findByTerm( term );
+        List<StitchingOfflineItem> items = stitchingOfflineItemDAO.findByTerm( term );
+        return finishedItemDAO.findByBarcodeAndApprovedStatus(items);
     }
 }
diff --git a/src/main/java/com/utopiaindustries/service/InventoryService.java b/src/main/java/com/utopiaindustries/service/InventoryService.java
index 4cb57d1..659a53b 100644
--- a/src/main/java/com/utopiaindustries/service/InventoryService.java
+++ b/src/main/java/com/utopiaindustries/service/InventoryService.java
@@ -447,7 +447,7 @@ public class InventoryService {
                     .stream( )
                     .collect( Collectors.toMap( InventoryTransactionLeg::getParentDocumentId, Function.identity( )));
 
-            // get finished items from stitched items i f exists
+            // get finished items from stitched items if exists
             List<Long> preCreatedFinishedItemIds = finishedItemDAO.findByStitchedItemIds(  stitchedItemIds ).stream( ).
                     map(  FinishedItem::getId ).collect( Collectors.toList( ));
 
diff --git a/src/main/resources/static/js/finishing/finished-item-segregation-form.js b/src/main/resources/static/js/finishing/finished-item-segregation-form.js
index 7677505..56af686 100644
--- a/src/main/resources/static/js/finishing/finished-item-segregation-form.js
+++ b/src/main/resources/static/js/finishing/finished-item-segregation-form.js
@@ -16,7 +16,7 @@
             }
         },
         template : `
-             <table class="table table-bordered bg-white col-sm-10">
+             <table class="table table-bordered bg-white col-sm-12">
                 <thead>
                     <tr>
                         <th>ID</th>
diff --git a/src/main/resources/static/js/job-card-form.js b/src/main/resources/static/js/job-card-form.js
index 69ff2cf..3addcb1 100644
--- a/src/main/resources/static/js/job-card-form.js
+++ b/src/main/resources/static/js/job-card-form.js
@@ -191,7 +191,7 @@
                     <input type="number" class="form-control" v-bind:name="'items[' + pIndex + '].cutPieces[' + index  +'].quantity'" v-model="piece.quantity" required>
                 </div>
                  <div class="col-md-1">
-                  <span class="bi-trash2-fill" title="Remove Piece" v-on:click="removePiece" ></span>
+                  <span class="bi-trash2-fill btn" title="Remove Piece" v-on:click="removePiece" ></span>
                 </div>    
           </div>
        `
diff --git a/src/main/resources/static/js/qc/finished-items-qc-form.js b/src/main/resources/static/js/qc/finished-items-qc-form.js
index 2d3ddd9..2c3cdd9 100644
--- a/src/main/resources/static/js/qc/finished-items-qc-form.js
+++ b/src/main/resources/static/js/qc/finished-items-qc-form.js
@@ -15,7 +15,7 @@
             }
         },
         template: `
-            <table class="table table-bordered bg-white col-sm-8">
+            <table class="table table-bordered bg-white col-sm-12">
                 <thead>
                     <tr>
                         <th>ID</th>
diff --git a/src/main/resources/templates/cutting/generate-master-barcode.html b/src/main/resources/templates/cutting/generate-master-barcode.html
index c87c2a5..026b0c2 100644
--- a/src/main/resources/templates/cutting/generate-master-barcode.html
+++ b/src/main/resources/templates/cutting/generate-master-barcode.html
@@ -36,7 +36,7 @@
                                     v-bind:disabled="hasDuplicates() || bundles.length === 0">
                                 Submit
                             </button>
-                            <a th:href="@{/cutting/bundles}" class="btn btn-light">Cancel</a>
+                            <a th:href="@{/cutting/generate-master-barcode}" class="btn btn-light">Cancel</a>
                         </div>
                     </form>
                     <script th:inline="javascript">
diff --git a/src/main/resources/templates/cutting/inventory-transactions.html b/src/main/resources/templates/cutting/inventory-transactions.html
index 3ad8783..fb40f20 100644
--- a/src/main/resources/templates/cutting/inventory-transactions.html
+++ b/src/main/resources/templates/cutting/inventory-transactions.html
@@ -22,7 +22,7 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="col-sm-10">
+                <div class="col-sm-12">
                     <table th:if="${#lists.size(transactions) !=  0 && #lists != null }" class="table table-bordered font-sm">
                         <thead>
                             <tr>
diff --git a/src/main/resources/templates/cutting/receive-inventory.html b/src/main/resources/templates/cutting/receive-inventory.html
index 2726917..f4f1b48 100644
--- a/src/main/resources/templates/cutting/receive-inventory.html
+++ b/src/main/resources/templates/cutting/receive-inventory.html
@@ -37,7 +37,7 @@
                         </div>
                         <div class="bg-light p-3 mb-3" v-if="jobCard.id !== undefined">
                             <h6>Job Card Details</h6>
-                            <table class="table table-bordered bg-white col-sm-8">
+                            <table class="table table-bordered bg-white col-sm-12">
                                 <thead>
                                     <tr>
                                         <th>Code</th>
@@ -65,7 +65,7 @@
                         </div>
                         <div>
                             <button class="btn btn-primary" type="submit">Receive Inventory</button>
-                            <a th:href="@{/job-cards}" class="btn btn-light">Cancel</a>
+                            <a th:href="@{/cutting/receive-inventory}" class="btn btn-light">Cancel</a>
                         </div>
                     </form>
                     <script th:inline="javascript">
diff --git a/src/main/resources/templates/job-card-view.html b/src/main/resources/templates/job-card-view.html
index 0575e6f..8d785da 100644
--- a/src/main/resources/templates/job-card-view.html
+++ b/src/main/resources/templates/job-card-view.html
@@ -10,15 +10,11 @@
                 <thead class="thead-dark">
                 <tr>
                     <th colspan="2" class="text-center">
-                        <span th:text="'Job Card Detail'"></span>
+                        <span th:text="${card.getCode()}"></span>
                     </th>
                 </tr>
                 </thead>
                     <tbody>
-                        <tr>
-                            <td width="200"><i>Code</i></td>
-                            <td th:text="${card.getCode()}"></td>
-                        </tr>
                         <tr>
                             <td><i>Job Order ID</i></td>
                             <td>
@@ -60,7 +56,7 @@
                         <tr>
                             <td class="align-middle"><i>Items</i></td>
                             <td class="m-0 p-0">
-                                <table class="table mb-0">
+                                <table class="table mb-0 text-center">
                                     <thead>
                                     <tr>
                                         <th>ID</th>
diff --git a/src/main/resources/templates/reporting/inventory-summary-sidebar.html b/src/main/resources/templates/reporting/inventory-summary-sidebar.html
index 32a56a2..f2620a1 100644
--- a/src/main/resources/templates/reporting/inventory-summary-sidebar.html
+++ b/src/main/resources/templates/reporting/inventory-summary-sidebar.html
@@ -7,10 +7,6 @@
     <div class="page-filters-sidebar">
         <form th:action="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}">
             <h5 class="mb-4">Refine Your Search</h5>
-            <div class="form-group">
-                <label>Item ID</label>
-                <input type="text" class="form-control" name="item-id" maxlength="100" th:value="${param['item-id']}">
-            </div>
             <div class="form-group">
                 <label>SKu</label>
                 <input type="text" class="form-control" name="sku" maxlength="100" th:value="${param['sku']}">
diff --git a/src/main/resources/templates/reporting/inventory-summary.html b/src/main/resources/templates/reporting/inventory-summary.html
index 527ea15..b6294d8 100644
--- a/src/main/resources/templates/reporting/inventory-summary.html
+++ b/src/main/resources/templates/reporting/inventory-summary.html
@@ -29,11 +29,25 @@
                     <td th:rowspan="${#lists.size(sku)}" th:text="${sku}" class="align-middle" rowspan="3" ></td>
                     <td th:each="dates: ${dateLimits}" class="p-0 ">
                         <table th:each="data : ${tableData.get(sku)}" class="table table-striped table-bordered table-hover font-sm  m-0  " >
+                            <thead th:if="${data.getKey() == dates.toString()}">
+                            <tr>
+                                <th>ID</th>
+                                <th>IN</th>
+                                <th>OUT</th>
+                                <th>BALANCE</th>
+                            </tr>
+                            </thead>
                             <tbody >
                                 <tr th:each="reportSummary : ${data.getValue()}"   rowspan="3"  >
                                     <td th:if="${data.getKey() == dates.toString()}" >
                                         <span th:text="${reportSummary.getParentDocumentType()} + ' ' + ${reportSummary.getParentDocumentPieceType()}"></span>
                                     </td>
+                                    <td th:if="${data.getKey() == dates.toString()}" class="w-25 text-center" >
+                                        <span th:text="${reportSummary.getTotalIn()}"></span>
+                                    </td>
+                                    <td th:if="${data.getKey() == dates.toString()}" class="w-25 text-center" >
+                                        <span th:text="${reportSummary.getTotalOut()}"></span>
+                                    </td>
                                     <td th:if="${data.getKey() == dates.toString()}" class="w-25 text-center" >
                                         <span th:text="${reportSummary.getTotalIn() - reportSummary.getTotalOut()}"></span>
                                     </td>
-- 
2.40.1


From d8777f63b0c5ddea9dcf2ef5e4f530d94db25194 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Mon, 6 Jan 2025 11:10:42 +0500
Subject: [PATCH 6/7] fixed bugs and add accounts active and in-active, Fixed
 username field

---
 .../controller/CuttingController.java         | 38 ++++++++++---------
 .../controller/FinishingController.java       | 12 +++---
 .../controller/JobCardController.java         | 17 ++++-----
 .../controller/PackagingController.java       |  6 +--
 .../controller/QualityControlController.java  |  7 ++--
 .../controller/ReportingController.java       | 13 ++-----
 .../controller/StitchingController.java       | 24 ++++--------
 .../controller/UserController.java            |  9 +++--
 .../dao/ctp/AuthorityDAO.java                 |  5 +--
 .../dao/ctp/FinishOfflineItemRowMapper.java   | 25 ------------
 .../dao/ctp/FinishedItemDAO.java              | 10 ++---
 .../dao/ctp/InventoryAccountDAO.java          |  6 +--
 .../dao/ctp/StitchingOfflineItemDAO.java      |  2 +-
 .../ctp/InventoryAccountQueryBuilder.java     |  2 +-
 .../querybuilder/ctp/JobCardQueryBuilder.java | 28 +++++++-------
 .../service/InventoryAccountService.java      |  1 +
 .../service/InventoryArtifactService.java     |  2 +-
 .../service/JobCardService.java               | 15 ++++----
 .../SummaryInventoryReportService.java        |  8 ++--
 .../utopiaindustries/service/UserService.java |  9 +++--
 .../templates/_job-card-sidebar.html          |  6 +--
 .../resources/templates/_user-fragment.html   |  4 +-
 .../templates/cutting/_bundle-sidebar.html    |  6 +--
 .../_cutting-inventory-account-sidebar.html   |  4 +-
 .../cutting/_master-bundle-sidebar.html       |  6 +--
 .../resources/templates/cutting/bundles.html  |  2 +-
 .../templates/cutting/master-bundles.html     |  2 +-
 .../finishing/segregate-inventory.html        |  1 -
 .../templates/inventory-account-list.html     |  4 +-
 .../resources/templates/job-card-list.html    |  4 +-
 .../reporting/inventory-summary-sidebar.html  |  4 +-
 .../reporting/inventory-summary.html          |  2 +-
 .../stitching/_finished-item-sidebar.html     |  6 +--
 .../stitching/stitched-offline-items.html     |  2 +-
 .../stitching/stitching-item-form.html        |  2 +-
 src/main/resources/templates/users.html       |  2 +-
 36 files changed, 125 insertions(+), 171 deletions(-)
 delete mode 100644 src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java

diff --git a/src/main/java/com/utopiaindustries/controller/CuttingController.java b/src/main/java/com/utopiaindustries/controller/CuttingController.java
index 11a922c..bddf877 100644
--- a/src/main/java/com/utopiaindustries/controller/CuttingController.java
+++ b/src/main/java/com/utopiaindustries/controller/CuttingController.java
@@ -109,7 +109,6 @@ public class CuttingController {
     @GetMapping( "/bundles" )
     public String showBundles(  @RequestParam( value = "id", required = false ) String id,
                                 @RequestParam( value = "sku", required = false) String sku,
-                                @RequestParam( value = "exceptionCheck", required = false, defaultValue = "false") boolean exceptionCheck,
                                 @RequestParam( value = "jc-id", required = false) String jobCardId,
                                 @RequestParam( value =  "master-id" , required = false ) String masterId,
                                 @RequestParam( value = "type", required = false) String type,
@@ -121,32 +120,25 @@ public class CuttingController {
 
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        model.addAttribute("startDate", startDate1);
+        model.addAttribute("endDate", endDate1);
         model.addAttribute("bundles", bundleService.getBundles( id, sku, jobCardId, masterId, type, status, startDate1.toString(), endDate1.toString() ,count ) );
         model.addAttribute("types", jobCardService.getAllPieceTypes() );
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
-            return "redirect:/cutting/bundles?id=&sku=&jc-id=&master-id=&type=&status=0&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
-        }
         return "/cutting/bundles";
     }
 
-
     @GetMapping( "/master-bundles")
     public String showMasterBundles( @RequestParam(value = "id" , required = false) String id,
                                      @RequestParam(value = "jc-id", required = false ) String jobCardId,
                                      @RequestParam(value = "start-date", required = false) String startDate,
                                      @RequestParam(value = "end-date", required = false) String endDate,
                                      @RequestParam(value = "count", required = false) Long count,
-                                     @RequestParam( value = "exceptionCheck", required = false, defaultValue = "false") boolean exceptionCheck,
-                                     Model model, RedirectAttributes redirectAttributes ){
-        if(exceptionCheck){
-            redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
-        }
+                                     Model model){
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        model.addAttribute("startDate", startDate1);
+        model.addAttribute("endDate", endDate1);
         model.addAttribute("masterBundles", bundleService.getMasterBundles( id, jobCardId, startDate1.toString(), endDate1.toString(), count ) );
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate ) || exceptionCheck ){
-            return "redirect:/cutting/master-bundles?id=&jc-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
-        }
         return "/cutting/master-bundles";
     }
 
@@ -157,12 +149,22 @@ public class CuttingController {
         return "/cutting/child-bundles";
     }
 
-
-    @PostMapping( "/generate-barcodes" )
-    public Object generateBarcode(@RequestParam( name = "ids", required = false ) Long[] ids,
-                                  @RequestParam( name = "artifactType", required = true ) String artifactType ) throws Exception {
+    @PostMapping( "/generate-bundle-barcodes" )
+    public Object generateBundleBarcode(@RequestParam( name = "ids", required = false ) Long[] ids,
+                                  @RequestParam( name = "artifactType", required = true ) String artifactType , RedirectAttributes redirectAttributes) throws Exception {
         if(ids == null){
-            return "redirect:/cutting/master-bundles?id=&jc-id=&start-date=2024-12-01&end-date=2024-12-31&count=100&exceptionCheck=true";
+            redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
+            return "redirect:/cutting/bundles";
+        }
+        return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
+    }
+
+    @PostMapping( "/generate-master-barcodes" )
+    public Object generateMasterBarcode(@RequestParam( name = "ids", required = false ) Long[] ids,
+                                  @RequestParam( name = "artifactType", required = true ) String artifactType, RedirectAttributes redirectAttributes ) throws Exception {
+        if(ids == null){
+            redirectAttributes.addFlashAttribute("error", "Please Select At least One CheckBox." );
+            return "redirect:/cutting/master-bundles";
         }
         return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
     }
diff --git a/src/main/java/com/utopiaindustries/controller/FinishingController.java b/src/main/java/com/utopiaindustries/controller/FinishingController.java
index fb853d9..ec4983a 100644
--- a/src/main/java/com/utopiaindustries/controller/FinishingController.java
+++ b/src/main/java/com/utopiaindustries/controller/FinishingController.java
@@ -50,13 +50,14 @@ public class FinishingController {
                                       @RequestParam( value = "job-card-id", required = false ) String jobCardId,
                                       @RequestParam( value = "count", required = false ) Long count,
                                       Model model ){
+
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        model.addAttribute("startDate", startDate1);
+        model.addAttribute("endDate", endDate1);
         List<FinishedItem> itemList = bundleService.getFinishedItem( id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId ,count );
         model.addAttribute("items", itemList ) ;
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
-            return "redirect:/finishing/finished-items?id=&item-id=&sku=&job-card-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
-        }
+
         return "finishing/finished-item-list";
     }
 
@@ -72,14 +73,11 @@ public class FinishingController {
                                          @RequestParam( value = "start-date", required = false ) String startDate,
                                          @RequestParam( value = "end-date", required = false ) String endDate,
                                          @RequestParam( value = "site-id", required = false ) String siteId,
-                                         @RequestParam( value = "count", required = false ) Long count,
+                                         @RequestParam( value = "count", required = false, defaultValue = "100") Long count,
                                          Model model ) {
         // 5 for Finishing
         model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count, "PROCESS", "5" , false ));
         model.addAttribute("locations", locationService.findAll() );
-        if(count == null){
-            return "redirect:/finishing/inventory-accounts?id=&title=&active=&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
-        }
         return "/finishing/inventory-accounts";
     }
 
diff --git a/src/main/java/com/utopiaindustries/controller/JobCardController.java b/src/main/java/com/utopiaindustries/controller/JobCardController.java
index 23c5175..13f0c68 100644
--- a/src/main/java/com/utopiaindustries/controller/JobCardController.java
+++ b/src/main/java/com/utopiaindustries/controller/JobCardController.java
@@ -50,17 +50,17 @@ public class JobCardController {
                                     @RequestParam( value = "created-end-date", required = false ) String createdEndDate,
                                     @RequestParam( value = "limit" , required = false) Long limit,
                                     Model model ){
-        List<JobCard> cards = jobCardService.getCards(code, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId,createdStartDate, createdEndDate, limit );
+
+        LocalDate startDate = StringUtils.isNullOrEmpty(createdStartDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(createdStartDate);
+        LocalDate endDate = StringUtils.isNullOrEmpty(createdEndDate) ? LocalDate.now() : LocalDate.parse(createdEndDate);
+        String code1 = StringUtils.isNullOrEmpty(code) ? "" : code;
+        model.addAttribute("startDate", startDate);
+        model.addAttribute("endDate", endDate);
+        List<JobCard> cards = jobCardService.getCards(code1, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId,startDate.toString(), endDate.toString(), limit );
         model.addAttribute("cards", cards );
         model.addAttribute("statuses", JobCard.Status.values() );
         model.addAttribute("invStatuses", JobCard.InventoryStatus.values() );
         model.addAttribute("locations", locationService.findAll() );
-        LocalDate startDate = StringUtils.isNullOrEmpty(createdStartDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(createdStartDate);
-        LocalDate endDate = StringUtils.isNullOrEmpty(createdEndDate) ? LocalDate.now() : LocalDate.parse(createdEndDate);
-        if(StringUtils.isNullOrEmpty( createdStartDate) || StringUtils.isNullOrEmpty( createdEndDate )){
-            return "redirect:/job-cards/?code=&status=&inventory-status=&customer=&lot-number=&purchase-order-id=&purchase-order-code=&purchaseOrderTitle=&site-id=&site-title=&created-start-date="+startDate+"&created-end-date="+endDate+"&limit=100";
-        }
-
         return "job-card-list";
     }
 
@@ -88,7 +88,6 @@ public class JobCardController {
     public String saveJobCard( @ModelAttribute JobCard jobCard,
                                RedirectAttributes redirectAttributes,
                                Model model ){
-
         try {
             jobCard.setStatus( JobCard.Status.DRAFT.name() );
             jobCard.setInventoryStatus( JobCard.InventoryStatus.NOT_RECEIVED_YET.name() );
@@ -154,7 +153,7 @@ public class JobCardController {
         return "redirect:/job-cards";
     }
 
-    @GetMapping( value = "/job-card-detail/{id}" )
+    @GetMapping( value = "/view/{id}" )
     public String showJobCardDetail( @PathVariable("id") long id,
                                        Model model ){
         List<JobCardItem> jobCardItems = jobCardService.findJobCardItemByJobCardId(id);
diff --git a/src/main/java/com/utopiaindustries/controller/PackagingController.java b/src/main/java/com/utopiaindustries/controller/PackagingController.java
index bbadbe3..8a7a597 100644
--- a/src/main/java/com/utopiaindustries/controller/PackagingController.java
+++ b/src/main/java/com/utopiaindustries/controller/PackagingController.java
@@ -42,11 +42,11 @@ public class PackagingController {
                                         @RequestParam( value = "site-id", required = false ) String siteId,
                                         @RequestParam( value = "count", required = false ) Long count,
                                         Model model ){
-        model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , null, null,true ) );
-        model.addAttribute("locations", locationService.findAll() );
-        if(count == null){
+        if(StringUtils.isNullOrEmpty( active )){
             return "redirect:/packaging/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
         }
+        model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , null, null,true ) );
+        model.addAttribute("locations", locationService.findAll() );
         return "/packaging/inventory-accounts";
     }
 }
diff --git a/src/main/java/com/utopiaindustries/controller/QualityControlController.java b/src/main/java/com/utopiaindustries/controller/QualityControlController.java
index bf4b60a..b1f88dd 100644
--- a/src/main/java/com/utopiaindustries/controller/QualityControlController.java
+++ b/src/main/java/com/utopiaindustries/controller/QualityControlController.java
@@ -64,15 +64,14 @@ public class QualityControlController {
                                     @RequestParam( value = "start-date", required = false) String startDate,
                                     @RequestParam( value = "end-date", required = false ) String endDate,
                                     @RequestParam( value = "job-card-id", required = false ) String jobCardId,
-                                    @RequestParam( value = "count", required = false ) Long count,
+                                    @RequestParam( value = "count", required = false, defaultValue = "100") Long count,
                                     Model model ){
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
+        model.addAttribute("startDate", startDate1);
+        model.addAttribute("endDate", endDate1);
         List<FinishedItem> itemList = bundleService.getFinishedItem( id, itemId, sku, startDate1.toString(), endDate1.toString(), jobCardId ,count );
         model.addAttribute("items", itemList ) ;
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
-            return "redirect:/quality-control/qc-finished-items?id=&item-id=&sku=&job-card-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
-        }
         return "/quality-control/qc-items-list";
     }
 
diff --git a/src/main/java/com/utopiaindustries/controller/ReportingController.java b/src/main/java/com/utopiaindustries/controller/ReportingController.java
index 9243511..19e6786 100644
--- a/src/main/java/com/utopiaindustries/controller/ReportingController.java
+++ b/src/main/java/com/utopiaindustries/controller/ReportingController.java
@@ -27,21 +27,16 @@ public class ReportingController {
     }
 
     @GetMapping( "/summary")
-    public String showMasterBundles(@RequestParam(value = "item-id", required = false ) String itemId,
-                                    @RequestParam(value = "sku" , required = false) String sku,
-                                     @RequestParam(value = "start-date", required = false) String startDate,
-                                     @RequestParam(value = "end-date", required = false) String endDate,
-                                     Model model ){
+    public String showMasterBundles(@RequestParam(value = "item-id", required = false ) String itemId, @RequestParam(value = "sku" , required = false) String sku, @RequestParam(value = "start-date", required = false) String startDate, @RequestParam(value = "end-date", required = false) String endDate, Model model ){
 
-        Map<String, Map<String, List<SummaryInventoryReport>>> getDataByFilteration = summaryInventoryReportService.findByFilter(itemId,sku,startDate,endDate);
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(6) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now().plusDays(1) : LocalDate.parse(endDate);
+        model.addAttribute("startDate", startDate1);
+        model.addAttribute("endDate", endDate1);
+        Map<String, Map<String, List<SummaryInventoryReport>>> getDataByFilteration = summaryInventoryReportService.findByFilter(itemId,sku,startDate,endDate);
         ArrayList<LocalDate> arrayList = generateDateList(startDate1,endDate1);
         model.addAttribute("dateLimits", arrayList);
         model.addAttribute("tableData", getDataByFilteration);
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
-            return "redirect:/reporting/summary?item-id=&sku=&start-date="+startDate1.toString()+"&end-date="+endDate1;
-        }
         return "/reporting/inventory-summary";
     }
 
diff --git a/src/main/java/com/utopiaindustries/controller/StitchingController.java b/src/main/java/com/utopiaindustries/controller/StitchingController.java
index 95797af..b96c5cd 100644
--- a/src/main/java/com/utopiaindustries/controller/StitchingController.java
+++ b/src/main/java/com/utopiaindustries/controller/StitchingController.java
@@ -95,24 +95,15 @@ public class StitchingController {
                                             @RequestParam( value = "start-date", required = false) String startDate,
                                             @RequestParam( value = "end-date", required = false ) String endDate,
                                             @RequestParam( value = "job-card-id", required = false ) String jobCardId,
-                                            @RequestParam( value = "count", required = false ) Long count,
+                                            @RequestParam( value = "count", required = false, defaultValue = "100") Long count,
                                             Model model
     ,RedirectAttributes redirect){
         LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate);
         LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate);
         List<StitchingOfflineItem> itemList = bundleService.getStitchedOfflineItems( id, itemId, sku, startDate, endDate, jobCardId ,count );
         model.addAttribute("items", itemList ) ;
-        if(model.getAttribute("message") != null){
-            if(model.getAttribute("message").equals("Finished Item Created Successfully") ){
-                redirect.addFlashAttribute("success",  model.getAttribute("message"));
-
-            }else {
-                redirect.addFlashAttribute("error",  model.getAttribute("message"));
-            }
-        }
-        if(StringUtils.isNullOrEmpty( startDate) || StringUtils.isNullOrEmpty( endDate )){
-            return "redirect:/stitching/stitching-offline-items?id=&item-id=&sku=&job-card-id=&start-date="+startDate1+"&end-date="+endDate1+"&count=100";
-        }
+        model.addAttribute("startDate", startDate1);
+        model.addAttribute("endDate", endDate1);
         return "/stitching/stitched-offline-items";
     }
 
@@ -129,10 +120,10 @@ public class StitchingController {
                                                Model model ){
         try {
             inventoryService.createStitchingOfflineItemsFromJobCard( jobCard );
-            redirectAttributes.addFlashAttribute("message", "Finished Item Created Successfully");
+            redirectAttributes.addFlashAttribute("success", "Finished Item Created Successfully");
         } catch ( Exception exception ){
             exception.printStackTrace();
-            redirectAttributes.addFlashAttribute( "message", exception.getMessage() );
+            redirectAttributes.addFlashAttribute( "error", exception.getMessage() );
         }
         return "redirect:/stitching/stitching-offline-items";
     }
@@ -141,10 +132,9 @@ public class StitchingController {
     public Object generateBarcode(@RequestParam( name = "ids" ,required = false) Long[] ids,
                                   @RequestParam( name = "artifactType"  ) String artifactType, RedirectAttributes redirectAttributes ) throws Exception {
         if (ids == null){
-            redirectAttributes.addFlashAttribute( "message", "Select At least One CheckBox" );
+            redirectAttributes.addFlashAttribute( "error", "Select At least One CheckBox" );
             return "redirect:/stitching/stitching-offline-items";
-        }else {
-            return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
         }
+        return barcodeService.generateBarcodes( Arrays.asList( ids ), artifactType );
     }
 }
diff --git a/src/main/java/com/utopiaindustries/controller/UserController.java b/src/main/java/com/utopiaindustries/controller/UserController.java
index f08e9d5..0778541 100644
--- a/src/main/java/com/utopiaindustries/controller/UserController.java
+++ b/src/main/java/com/utopiaindustries/controller/UserController.java
@@ -33,7 +33,7 @@ public class UserController {
         model.addAttribute("user", userService.createEmptyUser() );
         model.addAttribute("accounts", inventoryAccountService.findInventoryAccounts() );
         model.addAttribute("roles", Roles.values() );
-        model.addAttribute("isNew", true );
+        model.addAttribute("isNew", false );
         return "_user-fragment";
     }
 
@@ -42,6 +42,7 @@ public class UserController {
         model.addAttribute("user", userService.getUser( username ) );
         model.addAttribute("accounts", inventoryAccountService.findInventoryAccounts() );
         model.addAttribute("roles", Roles.values() );
+        model.addAttribute("isNew", true );
         return "_user-fragment";
     }
 
@@ -50,12 +51,12 @@ public class UserController {
                             @ModelAttribute User user ,
                             RedirectAttributes redirectAttributes ){
         try {
-            userService.saveUser( user );
+            userService.saveUser( user, true );
             redirectAttributes.addFlashAttribute("success", "User Successfully Saved!" );
         } catch ( Exception e ){
             redirectAttributes.addFlashAttribute("error", e.getMessage() );
         }
-        return "redirect:/users";
+        return "redirect:/users/new";
     }
 
     @PostMapping( "/edit/{username}" )
@@ -63,7 +64,7 @@ public class UserController {
                             @ModelAttribute User user,
                             RedirectAttributes redirectAttributes ){
         try {
-            userService.saveUser( user );
+            userService.saveUser( user, false );
             redirectAttributes.addFlashAttribute("success", "User Successfully Edited!" );
         } catch ( Exception e ){
             redirectAttributes.addFlashAttribute("error", e.getMessage() );
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java
index f380853..e82d950 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/AuthorityDAO.java
@@ -82,13 +82,10 @@ public class AuthorityDAO {
     // save all
     public int[] saveAll( List<Authority> authorities ) {
         List<MapSqlParameterSource> batchArgs = new ArrayList<>();
-        if (authorities == null){
-            return namedParameterJdbcTemplate.batchUpdate( INSERT_QUERY, batchArgs.toArray(new MapSqlParameterSource[0]) );
-        }
         for ( Authority authority: authorities ) {
             MapSqlParameterSource params = prepareInsertQueryParams( authority );
             batchArgs.add( params );
         }
-          return namedParameterJdbcTemplate.batchUpdate( INSERT_QUERY, batchArgs.toArray(new MapSqlParameterSource[authorities.size()]) );
+        return namedParameterJdbcTemplate.batchUpdate( INSERT_QUERY, batchArgs.toArray(new MapSqlParameterSource[authorities.size()]) );
     }
 }
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java
deleted file mode 100644
index 7bb171a..0000000
--- a/src/main/java/com/utopiaindustries/dao/ctp/FinishOfflineItemRowMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.utopiaindustries.dao.ctp;
-
-import com.utopiaindustries.model.ctp.FinishedItem;
-import org.springframework.jdbc.core.RowMapper;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class FinishOfflineItemRowMapper implements RowMapper<FinishedItem> {
-    public FinishedItem mapRow(ResultSet rs, int rowNum ) throws SQLException {
-        FinishedItem finishedItem = new FinishedItem();
-        finishedItem.setId( rs.getLong( "id" ) );
-        finishedItem.setItemId( rs.getLong( "item_id" ) );
-        finishedItem.setSku( rs.getString( "sku" ) );
-        finishedItem.setBarcode( rs.getString( "barcode" ) );
-        if ( rs.getTimestamp( "created_at" ) != null ) {
-            finishedItem.setCreatedAt( rs.getTimestamp( "created_at" ).toLocalDateTime() );
-        }
-        finishedItem.setCreatedBy( rs.getString( "created_by" ) );
-        finishedItem.setJobCardId( rs.getLong("job_card_id") );
-        finishedItem.setIsQa( rs.getBoolean("is_qa"));
-        finishedItem.setQaStatus( rs.getString("qa_status" ) );
-        return finishedItem;
-    }
-}
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
index 380df3e..cfbfdd3 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/FinishedItemDAO.java
@@ -104,10 +104,6 @@ public class FinishedItemDAO {
 		return namedParameterJdbcTemplate.query( query, new FinishedItemRowMapper() );
 	}
 
-	public List<FinishedItem> findFinishOfflineItemByQuery(String query ){
-		return namedParameterJdbcTemplate.query( query, new FinishedItemRowMapper() );
-	}
-
 	public List<FinishedItem> findByIds(List<Long> ids ){
 		if( ids == null || ids.isEmpty() ) return new ArrayList<>();
 		MapSqlParameterSource params = new MapSqlParameterSource();
@@ -139,7 +135,7 @@ public class FinishedItemDAO {
 
 	}
 
-	public HashMap<Long, Long> findTotalCount(List<Long> itemIds, long jobCardId) {
+	public HashMap<Long, Long> findTotalFinishedItems(List<Long> itemIds, long jobCardId) {
 		HashMap<Long, Long> totalCounts = new HashMap<>();
 		MapSqlParameterSource params = new MapSqlParameterSource();
 		for (long id : itemIds) {
@@ -160,9 +156,9 @@ public class FinishedItemDAO {
 		return namedParameterJdbcTemplate.query( SELECT_BY_STITCHED_ITEM_IDS, params, new FinishedItemRowMapper() );
 	}
 
-	public List<StitchingOfflineItem> findByBarcodeAndApprovedStatus( List<StitchingOfflineItem> finishedItems ){
+	public List<StitchingOfflineItem> findByBarcodeAndApprovedStatus( List<StitchingOfflineItem> stitchingOfflineItems ){
 		List<StitchingOfflineItem> items = new ArrayList<>();
-		for (StitchingOfflineItem item : finishedItems){
+		for (StitchingOfflineItem item : stitchingOfflineItems){
 			MapSqlParameterSource params = new MapSqlParameterSource();
 			params.addValue("barcode", item.getBarcode() );
 			boolean check =Boolean.TRUE.equals(namedParameterJdbcTemplate.queryForObject( SELECT_QUERY_BY_BARCODE_QA_STATUS, params, Boolean.class ));
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java
index 55cdd6d..43aa3c1 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/InventoryAccountDAO.java
@@ -22,11 +22,11 @@ public class InventoryAccountDAO {
 	private final String DELETE_QUERY = String.format( "DELETE FROM %s WHERE id = :id", TABLE_NAME );
 	private final String INSERT_QUERY = String.format( "INSERT INTO %s (id, title, parent_entity_type, parent_entity_id, active, created_by, created_at, location_site_id, notes, is_packaging) VALUES (:id, :title, :parent_entity_type, :parent_entity_id, :active, :created_by, :created_at, :location_site_id, :notes, :is_packaging) ON DUPLICATE KEY UPDATE title = VALUES(title), parent_entity_type = VALUES(parent_entity_type), parent_entity_id = VALUES(parent_entity_id), active = VALUES(active), created_by = VALUES(created_by), created_at = VALUES(created_at), location_site_id = VALUES(location_site_id), notes = VALUES(notes), is_packaging = VALUES(is_packaging)", TABLE_NAME );
 	private final String SELECT_BY_IDS =  String.format( "SELECT * FROM %s WHERE id IN (:ids)", TABLE_NAME );
-	private final String SELECT_BY_IDS_AND_PARENT_ID = String.format( "SELECT * FROM %s WHERE id IN (:ids) AND parent_entity_id = :parent_entity_id", TABLE_NAME );
-	private final String SELECT_BY_IDS_AND_PARENT_IDS = String.format( "SELECT * FROM %s WHERE id IN (:ids) AND parent_entity_id IN (:parent_entity_ids)", TABLE_NAME );
+	private final String SELECT_BY_IDS_AND_PARENT_ID = String.format( "SELECT * FROM %s WHERE active = TRUE AND id IN (:ids) AND parent_entity_id = :parent_entity_id", TABLE_NAME );
+	private final String SELECT_BY_IDS_AND_PARENT_IDS = String.format( "SELECT * FROM %s WHERE active = TRUE AND id IN (:ids) AND parent_entity_id IN (:parent_entity_ids)", TABLE_NAME );
 	private final String SELECT_BY_IDS_AND_PARENT_ENTITY_TYPE_AND_PARENT_ID_AND_COUNT = String.format( "SELECT * FROM %s WHERE id IN (:ids) AND parent_entity_id = :parent_entity_id AND parent_entity_type = :parent_entity_type LIMIT :limit", TABLE_NAME );
 	private final String SELECT_BY_IDS_PACKAGING_AND_COUNT = String.format( "SELECT * FROM %s WHERE id IN (:ids) AND is_packaging = :is_packaging LIMIT :limit", TABLE_NAME );
-	private final String SELECT_BY_PARENT_TYPE_AND_PARENT_ID = String.format( "SELECT * FROM %s WHERE parent_entity_type = :parent_entity_type AND parent_entity_id = :parent_entity_id" , TABLE_NAME );
+	private final String SELECT_BY_PARENT_TYPE_AND_PARENT_ID = String.format( "SELECT * FROM %s WHERE active = TRUE AND parent_entity_type = :parent_entity_type AND parent_entity_id = :parent_entity_id" , TABLE_NAME );
 
 	public InventoryAccountDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
 		this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
diff --git a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
index a5c8c5d..b58b11c 100644
--- a/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
+++ b/src/main/java/com/utopiaindustries/dao/ctp/StitchingOfflineItemDAO.java
@@ -125,7 +125,7 @@ public class StitchingOfflineItemDAO {
         return namedParameterJdbcTemplate.query( SELECT_BY_MASTER_ID , params, new StitchingOfflineItemRowMapper() );
     }
 
-    public HashMap<Long, Long> findTotalCount(List<Long> itemIds, long jobCardId) {
+    public HashMap<Long, Long> findTotalStitchingOfflineItems(List<Long> itemIds, long jobCardId) {
         HashMap<Long, Long> totalCounts = new HashMap<>();
         MapSqlParameterSource params = new MapSqlParameterSource();
         for (long id : itemIds) {
diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java
index aba10a7..11e5df9 100644
--- a/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java
+++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/InventoryAccountQueryBuilder.java
@@ -43,7 +43,7 @@ public class InventoryAccountQueryBuilder {
                 .setColumns("*")
                 .where()
                 .columnLikeTitle("title", title)
-                .or()
+                .and()
                 .columnEquals("id", id)
                 .and()
                 .columnEquals("active", active)
diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java
index 4eede66..6f085c0 100644
--- a/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java
+++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/JobCardQueryBuilder.java
@@ -26,30 +26,30 @@ public class JobCardQueryBuilder {
             }
         }
 
-        return ( new QueryBuilder() )
-                .setTable( "cut_to_pack.job_card" )
-                .setColumns( "*" )
+        return (new QueryBuilder())
+                .setTable("cut_to_pack.job_card")
+                .setColumns("*")
                 .where()
-                .columnEquals("created_by",createdBy)
+                .columnEquals("created_by", createdBy)
                 .and()
-                .columnLike(  "code" , "%" + code +"%" )
+                .columnLike("code", "%" + code + "%")
                 .and()
-                .columnEquals( "status", status )
+                .columnEquals("status", status)
                 .and()
-                .columnEquals( "inventory_status", inventoryStatus )
+                .columnEquals("inventory_status", inventoryStatus)
                 .and()
-                .columnEquals( "customer", customer )
+                .columnEquals("customer", customer)
                 .and()
-                .columnEquals( "lot_number", lotNumber )
+                .columnEquals("lot_number", lotNumber)
                 .and()
-                .columnEquals( "purchase_order_id", purchaseOrderId )
+                .columnEquals("purchase_order_id", purchaseOrderId)
                 .and()
-                .columnEquals( "location_site_id", locationSiteId )
+                .columnEquals("location_site_id", locationSiteId)
                 .and()
-                .columnEqualToOrGreaterThan("created_at" , startDate1 )
+                .columnEqualToOrGreaterThan("created_at", startDate1)
                 .and()
-                .columnEqualToOrLessThan( "created_at", endDate1 )
-                .limit( count.intValue() )
+                .columnEqualToOrLessThan("created_at", endDate1)
+                .limit(count.intValue())
                 .build();
     }
 }
diff --git a/src/main/java/com/utopiaindustries/service/InventoryAccountService.java b/src/main/java/com/utopiaindustries/service/InventoryAccountService.java
index c0a6b60..d83b4a7 100644
--- a/src/main/java/com/utopiaindustries/service/InventoryAccountService.java
+++ b/src/main/java/com/utopiaindustries/service/InventoryAccountService.java
@@ -98,6 +98,7 @@ public class InventoryAccountService {
     }
 
     public List<Process> getAllProcess(){
+
         return processDAO.findAll();
     }
 
diff --git a/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java b/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java
index dc0e77d..e96a1f1 100644
--- a/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java
+++ b/src/main/java/com/utopiaindustries/service/InventoryArtifactService.java
@@ -55,7 +55,7 @@ public class InventoryArtifactService {
     /*
      *  get finished Items By Job Card ID
      * */
-    public FinishedItem findFinishedItemByJobCardId( long id ){
+    public FinishedItem findByJobCardId( long id ){
         FinishedItem finishedItem = finishedItemDAO.find( id );
         finishedItem.setJobCard( jobCardDAO.find( finishedItem.getJobCardId() ) );
         return finishedItem;
diff --git a/src/main/java/com/utopiaindustries/service/JobCardService.java b/src/main/java/com/utopiaindustries/service/JobCardService.java
index aa50ab6..091cb4d 100644
--- a/src/main/java/com/utopiaindustries/service/JobCardService.java
+++ b/src/main/java/com/utopiaindustries/service/JobCardService.java
@@ -81,17 +81,18 @@ public class JobCardService {
                                    Long limit) {
         List<JobCard> jobCards = new ArrayList<>();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String createdBy = authentication.getName();
         if( limit == null ){
             limit = 100L;
         }
         if( StringUtils.isAnyNotNullOrEmpty( code, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate ) ){
-            String query = JobCardQueryBuilder.buildQuery(code, authentication.getName(), status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate, limit );
-            System.out.println( query );
             for (GrantedAuthority role : authentication.getAuthorities()){
                 if (role.toString().equals("ROLE_ADMIN")){
-                   return jobCards = jobCardDAO.findByAllWithLimit(limit);
+                    createdBy = "";
                 }
             }
+            String query = JobCardQueryBuilder.buildQuery(code, createdBy, status, inventoryStatus, customer, lotNumber, purchaseOrderId, locationSiteId, createdStartDate, createdEndDate, limit );
+            System.out.println( query );
             jobCards = jobCardDAO.findByQuery( query );
         }else {
             jobCards = jobCardDAO.findByUserAndLimit( authentication.getName(), limit );
@@ -283,11 +284,11 @@ public class JobCardService {
         return stitchingOfflineItemDAO.findByJobCardId( jobCardId );
     }
 
-    public HashMap<Long, Long> totalStitchingItem(List<Long> itemIds, long jobCardId ){
-        return stitchingOfflineItemDAO.findTotalCount( itemIds, jobCardId );
+    public Map<Long, Long> totalStitchingItem(List<Long> itemIds, long jobCardId ){
+        return stitchingOfflineItemDAO.findTotalStitchingOfflineItems( itemIds, jobCardId );
     }
 
-    public HashMap<Long, Long> totalFinishItem(List<Long> itemIds, long jobCardId ){
-        return finishedItemDAO.findTotalCount( itemIds, jobCardId );
+    public Map<Long, Long> totalFinishItem(List<Long> itemIds, long jobCardId ){
+        return finishedItemDAO.findTotalFinishedItems( itemIds, jobCardId );
     }
 }
diff --git a/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java b/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java
index 944a2ad..29b9b68 100644
--- a/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java
+++ b/src/main/java/com/utopiaindustries/service/SummaryInventoryReportService.java
@@ -44,19 +44,19 @@ public class SummaryInventoryReportService {
         }
         List<SummaryInventoryReport> summaries =  summaryInventoryReportDao.findByFilter(itemId1, sku1, startDate1, endDate1);
 
-        Map<String, Map<String, List<SummaryInventoryReport>>> tableData = new HashMap<>();
+        Map<String, Map<String, List<SummaryInventoryReport>>> skuMapDateMap = new HashMap<>();
 
        if(summaries == null) {
-        tableData = null;
+           skuMapDateMap = null;
        }else {
            for (SummaryInventoryReport summary : summaries) {
-               tableData
+               skuMapDateMap
                        .computeIfAbsent(summary.getSku(), k -> new HashMap<>()) // SKU as key
                        .computeIfAbsent(summary.getDate(), d -> new ArrayList<>()) // Date as key
                        .add(summary);
            }
        }
-        return tableData;
+        return skuMapDateMap;
     }
 
 }
diff --git a/src/main/java/com/utopiaindustries/service/UserService.java b/src/main/java/com/utopiaindustries/service/UserService.java
index 1d5d36f..1eaeadf 100644
--- a/src/main/java/com/utopiaindustries/service/UserService.java
+++ b/src/main/java/com/utopiaindustries/service/UserService.java
@@ -64,7 +64,10 @@ public class UserService {
     * save user
     * */
     @Transactional
-    public void saveUser( User user ){
+    public void saveUser( User user, boolean checkNewOrEdit ){
+        if(userDAO.findByUsername(user.getUsername()) != null && checkNewOrEdit ){
+            throw new RuntimeException("username already exists");
+        }
         // save user
         createUser( user );
         // remove previous
@@ -89,15 +92,13 @@ public class UserService {
         List<Authority> newRoles = user.getAuthorities();
         if(newRoles != null) {
             newRoles.forEach(authority -> authority.setUsername(user.getUsername()));
+            authorityDAO.saveAll( newRoles );
         }
         List<UserInventoryAccount> newInventoryAccounts = user.getInventoryAccounts();
         if( newInventoryAccounts != null ){
             newInventoryAccounts.forEach(account -> account.setUsername( user.getUsername() ));
             userInventoryAccountDAO.saveAll( newInventoryAccounts );
         }
-
-        // save
-        authorityDAO.saveAll( newRoles );
     }
 
     private void deletePreviousRolesAndAccounts( User user ){
diff --git a/src/main/resources/templates/_job-card-sidebar.html b/src/main/resources/templates/_job-card-sidebar.html
index 0c5b148..0062286 100644
--- a/src/main/resources/templates/_job-card-sidebar.html
+++ b/src/main/resources/templates/_job-card-sidebar.html
@@ -53,16 +53,16 @@
                     </div>
                     <div class="form-group">
                         <label>From Date</label>
-                        <input type="date" class="form-control" name="created-start-date" th:value="${param['created-start-date']}" >
+                        <input type="date" class="form-control" name="created-start-date" th:value="${param['created-start-date'] ?: startDate }" >
                     </div>
                     <div class="form-group">
                         <label>To Date</label>
-                        <input type="date" class="form-control" name="created-end-date" th:value="${param['created-end-date']}" >
+                        <input type="date" class="form-control" name="created-end-date" th:value="${param['created-end-date'] ?: endDate}" >
                     </div>
                     <div class="form-group">
                         <label>Count</label>
                         <input type="number" class="form-control" name="limit"
-                               th:value="(${param['limit']} != null) ? ${param['limit']} : 100">
+                               th:value="${param['limits'] ?: 100}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}"
diff --git a/src/main/resources/templates/_user-fragment.html b/src/main/resources/templates/_user-fragment.html
index 78eaae0..66eca1b 100644
--- a/src/main/resources/templates/_user-fragment.html
+++ b/src/main/resources/templates/_user-fragment.html
@@ -22,11 +22,11 @@
                             <div class="form-row">
                                 <div class="col-sm-3 form-group">
                                     <label>Username</label>
-                                    <input class="form-control" th:field="*{username}" requried>
+                                    <input class="form-control" th:readonly="${isNew}" th:field="*{username}" requried>
                                 </div>
                                 <div class="col-sm-3 form-group">
                                     <label>Password</label>
-                                    <input class="form-control" th:field="*{newPassword}" th:required="${isNew != null && isNew}">
+                                    <input class="form-control" th:field="*{newPassword}" th:readonly="${isNew}" required>
                                 </div>
                                 <div class="col-sm-3 form-group">
                                     <label for="enable">Enabled</label>
diff --git a/src/main/resources/templates/cutting/_bundle-sidebar.html b/src/main/resources/templates/cutting/_bundle-sidebar.html
index b7a6ec9..bdaf693 100644
--- a/src/main/resources/templates/cutting/_bundle-sidebar.html
+++ b/src/main/resources/templates/cutting/_bundle-sidebar.html
@@ -46,15 +46,15 @@
                     </div>
                     <div class="form-group">
                         <label>Start Date</label>
-                        <input type="date" class="form-control" name="start-date" th:value="${param['start-date']}">
+                        <input type="date" class="form-control" name="start-date" th:value="${param['start-date'] ?: startDate}">
                     </div>
                     <div class="form-group">
                         <label>End Date</label>
-                        <input type="date" class="form-control" name="end-date" th:value="${param['end-date']}">
+                        <input type="date" class="form-control" name="end-date" th:value="${param['end-date'] ?: endDate}">
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count'] ?: 100}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}" class="btn btn-secondary btn-block">Reset</a>
diff --git a/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html b/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html
index f6ae71b..527af26 100644
--- a/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html
+++ b/src/main/resources/templates/cutting/_cutting-inventory-account-sidebar.html
@@ -44,9 +44,9 @@
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" th:value="${param['count']}" min="0" step="1" />
-
+                        <input type="number" class="form-control" name="count" th:value="${param['count'] ?: 100}" min="0" step="1" />
                     </div>
+
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}"
                        class="btn btn-secondary btn-block">Reset</a>
diff --git a/src/main/resources/templates/cutting/_master-bundle-sidebar.html b/src/main/resources/templates/cutting/_master-bundle-sidebar.html
index da34147..1eb3cbd 100644
--- a/src/main/resources/templates/cutting/_master-bundle-sidebar.html
+++ b/src/main/resources/templates/cutting/_master-bundle-sidebar.html
@@ -28,16 +28,16 @@
                     <div class="form-group">
                     <div class="form-group">
                         <label>Start Date</label>
-                        <input type="date" class="form-control" name="start-date" th:value="${param['start-date']}">
+                        <input type="date" class="form-control" name="start-date" th:value="${param['start-date'] ?: startDate}">
                     </div>
                     <div class="form-group">
                         <label>End Date</label>
-                        <input type="date" class="form-control" name="end-date" th:value="${param['end-date']}">
+                        <input type="date" class="form-control" name="end-date" th:value="${param['end-date'] ?: endDate}">
                     </div>
                     <div class="form-group">
                         <label>Count</label>
                         <input type="number" class="form-control" name="count" min="0" maxlength="100"
-                               th:value="${param['count']}">
+                               th:value="${param['count'] ?: 100}">
                     </div>
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
                     <a th:href="@{${#strings.replace(#httpServletRequest.requestURI, #request.getContextPath(), '')}}"
diff --git a/src/main/resources/templates/cutting/bundles.html b/src/main/resources/templates/cutting/bundles.html
index 00f1559..de8118c 100644
--- a/src/main/resources/templates/cutting/bundles.html
+++ b/src/main/resources/templates/cutting/bundles.html
@@ -16,7 +16,7 @@
                         <h3>Bundles</h3>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <form th:action="@{/cutting/generate-barcodes}" method="post">
+                    <form th:action="@{/cutting/generate-bundle-barcodes}" method="post">
                         <input hidden="hidden" name="artifactType" value="Bundle">
                         <table class="table table-striped" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                             <thead>
diff --git a/src/main/resources/templates/cutting/master-bundles.html b/src/main/resources/templates/cutting/master-bundles.html
index 9a1aad6..e11cdb8 100644
--- a/src/main/resources/templates/cutting/master-bundles.html
+++ b/src/main/resources/templates/cutting/master-bundles.html
@@ -16,7 +16,7 @@
                         <h3>Master Bundles</h3>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <form th:action="@{/cutting/generate-barcodes}" method="post">
+                    <form th:action="@{/cutting/generate-master-barcodes}" method="post">
                         <input hidden="hidden" name="artifactType" value="MasterBundle">
                         <table class="table table-striped table-bordered" data-bundle-table
                                data-order="[[ 0, &quot;asc&quot; ]]">
diff --git a/src/main/resources/templates/finishing/segregate-inventory.html b/src/main/resources/templates/finishing/segregate-inventory.html
index d7f7e48..fa964ac 100644
--- a/src/main/resources/templates/finishing/segregate-inventory.html
+++ b/src/main/resources/templates/finishing/segregate-inventory.html
@@ -12,7 +12,6 @@
                     </div>
                     <form th:action="'/ctp/finishing/segregate-inventory'" method="post" id="finishedApp">
                         <div class="bg-light p-3 mb-3">
-                            <h6 class="mb-3">Search Finished Item</h6>
                             <div class="form-row">
                                 <div class="col-sm-3 form-group">
                                     <finished-item-search
diff --git a/src/main/resources/templates/inventory-account-list.html b/src/main/resources/templates/inventory-account-list.html
index 1d35f01..6db5c9d 100644
--- a/src/main/resources/templates/inventory-account-list.html
+++ b/src/main/resources/templates/inventory-account-list.html
@@ -17,7 +17,7 @@
                         <a th:href="@{/inventory-accounts/new}" class="btn btn-primary">Add New</a>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table th:if="${#lists.size(accounts) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${#lists != null && #lists.size(accounts) !=  0 }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>ID</th>
@@ -36,7 +36,7 @@
                                 <td th:text="*{id}"></td>
                                 <td th:text="*{title}"></td>
                                 <td th:text="*{parentEntityType}"></td>
-                                <td th:text="*{active}"></td>
+                                <td th:text="*{active}" th:classappend="*{ active } ? 'badge badge-APPROVED' : 'badge badge-warning'"></td>
                                 <td th:text="*{createdBy}"></td>
                                 <td ctp:formatdatetime="*{createdAt}"></td>
                                 <td th:text="*{locationTitle}"></td>
diff --git a/src/main/resources/templates/job-card-list.html b/src/main/resources/templates/job-card-list.html
index 6840123..37ba409 100644
--- a/src/main/resources/templates/job-card-list.html
+++ b/src/main/resources/templates/job-card-list.html
@@ -16,7 +16,7 @@
                             <a th:href="@{/job-cards/new}" class="btn btn-primary">Add New</a>
                         </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table th:if="${#lists.size(cards) !=  0 && #lists != null }" class="table table-striped font-sm" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${ #lists != null && #lists.size(cards) !=  0 }" class="table table-striped font-sm" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>Code</th>
@@ -34,7 +34,7 @@
                         </thead>
                         <tbody>
                             <tr th:each="card : ${cards}" th:object="${card}">
-                                <td><a class="text-reset" th:href="@{'job-card-detail/' + *{getId()}}" th:text="*{code}"></a></td>
+                                <td><a class="text-reset" th:href="@{'/job-cards/view/'  + *{id}}" th:text="*{code}"></a></td>
                                 <td th:text="*{jobOrderId}"></td>
                                 <td>
                                     <span class="badge" th:classappend="'badge-' + *{status}" th:if="*{status}" th:text="*{status}"></span>
diff --git a/src/main/resources/templates/reporting/inventory-summary-sidebar.html b/src/main/resources/templates/reporting/inventory-summary-sidebar.html
index f2620a1..2e93b05 100644
--- a/src/main/resources/templates/reporting/inventory-summary-sidebar.html
+++ b/src/main/resources/templates/reporting/inventory-summary-sidebar.html
@@ -13,11 +13,11 @@
             </div>
             <div class="form-group">
                 <label>Start Date</label>
-                <input type="date" class="form-control" name="start-date" th:value="${param['start-date']}">
+                <input type="date" class="form-control" name="start-date" th:value="${param['start-date'] ?: startDate}">
             </div>
             <div class="form-group">
                 <label>End Date</label>
-                <input type="date" class="form-control" name="end-date" th:value="${param['end-date']}">
+                <input type="date" class="form-control" name="end-date" th:value="${param['end-date'] ?: endDate}">
             </div>
 
             <input type="submit" class="btn btn-secondary btn-block" value="Search">
diff --git a/src/main/resources/templates/reporting/inventory-summary.html b/src/main/resources/templates/reporting/inventory-summary.html
index b6294d8..664ba98 100644
--- a/src/main/resources/templates/reporting/inventory-summary.html
+++ b/src/main/resources/templates/reporting/inventory-summary.html
@@ -11,7 +11,7 @@
         <aside class="col-sm-2" th:replace="/reporting/inventory-summary-sidebar :: sidebar"></aside>
 
         <div class="col-sm">
-            <h3 >Summary</h3>
+            <h3>Summary</h3>
 
             <table th:if="${tableData != null}" class=" table table-striped table-bordered table-hover font-sm "  data-table data-order="[[ 0, &quot;asc&quot; ]]">
                 <thead>
diff --git a/src/main/resources/templates/stitching/_finished-item-sidebar.html b/src/main/resources/templates/stitching/_finished-item-sidebar.html
index 3b958b9..5b5ff78 100644
--- a/src/main/resources/templates/stitching/_finished-item-sidebar.html
+++ b/src/main/resources/templates/stitching/_finished-item-sidebar.html
@@ -25,15 +25,15 @@
                     </div>
                     <div class="form-group">
                         <label>Start Date</label>
-                        <input type="date" class="form-control" name="start-date" th:value="${param['start-date']}">
+                        <input type="date" class="form-control" name="start-date" th:value="${param['start-date'] ?: startDate}">
                     </div>
                     <div class="form-group">
                         <label>End Date</label>
-                        <input type="date" class="form-control" name="end-date" th:value="${param['end-date']}">
+                        <input type="date" class="form-control" name="end-date" th:value="${param['end-date'] ?: endDate}">
                     </div>
                     <div class="form-group">
                         <label>Count</label>
-                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count']}">
+                        <input type="number" class="form-control" name="count" maxlength="100" min="0" th:value="${param['count'] ?: 100}">
                     </div>
 
                     <input type="submit" class="btn btn-secondary btn-block" value="Search">
diff --git a/src/main/resources/templates/stitching/stitched-offline-items.html b/src/main/resources/templates/stitching/stitched-offline-items.html
index 915f142..3b6f2bc 100644
--- a/src/main/resources/templates/stitching/stitched-offline-items.html
+++ b/src/main/resources/templates/stitching/stitched-offline-items.html
@@ -19,7 +19,7 @@
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
                     <form th:action="@{/stitching/generate-barcodes}" method="post">
                         <input hidden="hidden" name="artifactType" value="FinishedItem">
-                        <table th:if="${#lists.size(items) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table
+                        <table th:if="${ #lists != null && #lists.size(items) !=  0 }" class="table table-striped table-bordered" data-table
                                data-order="[[ 0, &quot;asc&quot; ]]">
                             <thead>
                                 <tr>
diff --git a/src/main/resources/templates/stitching/stitching-item-form.html b/src/main/resources/templates/stitching/stitching-item-form.html
index 5b5b69f..3547c15 100644
--- a/src/main/resources/templates/stitching/stitching-item-form.html
+++ b/src/main/resources/templates/stitching/stitching-item-form.html
@@ -98,7 +98,7 @@
                         </div>
                         <div>
                             <button class="btn btn-primary" type="submit">Receive Inventory</button>
-                            <a th:href="@{/job-cards}" class="btn btn-light">Cancel</a>
+                            <a th:href="@{/stitching/stitching-offline-items}" class="btn btn-light">Cancel</a>
                         </div>
                     </form>
                     <script th:inline="javascript">
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index cc48a0e..be83a48 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -17,7 +17,7 @@
                         <a th:href="@{/users/new}" class="btn btn-primary">Add New</a>
                     </div>
                     <div th:replace="_fragments :: table-loading-skeleton"></div>
-                    <table th:if="${#lists.size(users) !=  0 && #lists != null }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
+                    <table th:if="${ #lists != null && #lists.size(users) !=  0 }" class="table table-striped table-bordered" data-table data-order="[[ 0, &quot;asc&quot; ]]">
                         <thead>
                             <tr>
                                 <th>User</th>
-- 
2.40.1


From 759f6882640c4f9e5521380fe819d2a61103cfe4 Mon Sep 17 00:00:00 2001
From: "usama.jameel" <usama.jameel@utopia.pk>
Date: Mon, 6 Jan 2025 11:15:23 +0500
Subject: [PATCH 7/7] fixed redirect

---
 .../com/utopiaindustries/controller/CuttingController.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/utopiaindustries/controller/CuttingController.java b/src/main/java/com/utopiaindustries/controller/CuttingController.java
index bddf877..d608c7e 100644
--- a/src/main/java/com/utopiaindustries/controller/CuttingController.java
+++ b/src/main/java/com/utopiaindustries/controller/CuttingController.java
@@ -61,12 +61,11 @@ public class CuttingController {
                                          @RequestParam( value = "site-id", required = false ) String siteId,
                                          @RequestParam( value = "count", required = false ) Long count,
                                          Model model ){
-
-        model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , "PROCESS", "1", false) );
-        model.addAttribute("locations", locationService.findAll() );
         if(StringUtils.isNullOrEmpty( active )){
             return "redirect:/cutting/inventory-accounts?id=&title=&active=1&created-by=&start-date=&end-date=&site-id=&site-title=&count=100";
         }
+        model.addAttribute("accounts", inventoryAccountService.getInventoryAccounts( id, title, active, createdBy, startDate, endDate, siteId, count , "PROCESS", "1", false) );
+        model.addAttribute("locations", locationService.findAll() );
         return "/cutting/inventory-accounts";
     }
 
-- 
2.40.1