dma

app/report/gen_report.py

@@ -242,13 +242,15 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                             cell.value = value
 
         for key, value in data.items():
-            if isinstance(value, str) and re.match(r"^\d+\[\d+:\d+\]$", value):
+            # if isinstance(value, str) and re.match(r"^\d+\[\d+:\d+\]$", value):
+            if isinstance(value, str) and re.match(r"^[0-9\s]+\[\d+:\d+\]$", value):
                 # Parse the prefix and row range
                 prefix, row_range = value.split("[")
                 row_start, row_end = map(int, row_range[:-1].split(":"))
                 
                 # Hide rows if the prefix matches the condition
-                if prefix == "0":  # Adjust the condition as needed
+                # if prefix == "0":  # Adjust the condition as needed
+                if " " in prefix or prefix.strip() == "0":
                     sheet.row_dimensions.group(row_start, row_end, hidden=True)
         
 

app/report/templates/report/coi.html

@@ -18,6 +18,7 @@
         🔍
       </button>
     </div>
+  </form>
       <button class="bg-blue-100 text-blue-700 px-4 py-2 rounded hover:bg-blue-200">
         Option for Export :
       </button>
@@ -73,12 +74,10 @@
           </div>
           <!-- TODO: add download here -->
           <div class=" text-center" x-show="downloadUrl">
-            <a :href="downloadUrl"  class="block px-4 py-2 bg-green-600 text-white  rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2" download>
-              Download Report
+            <a :href="downloadUrl"  class="block px-4 py-2 bg-green-600 text-white  rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2" download x-text="downText">
             </a>
           </div>
         </div>
-  </form>
   {{ result }}
   
   <div class="bg-white shadow-md rounded-md p-4">
@@ -157,6 +156,7 @@ th, td {
       gen_report_url: '{% url "report:gen_report" %}', 
       acceptStatus: 'accepted', 
       downloadUrl: null, // Stores the download link after export success
+      downText: "Download Excel",
       init() {
         //alert("COI Report");
         this.qa1 = '';
@@ -189,14 +189,18 @@ th, td {
                       qa2: this.qa2,
                       acceptStatus: this.acceptStatus
                   });
-
+                  this.downText = "Processing ..."
                   if (response.status === 200) {
                       const result = response.data;
-                      alert(`Report generated successfully: ${result.file_url}`);
+                      //alert(`Report generated successfully: ${result.file_url}`);
+                      this.downText = "Download Excel"
                       console.log('File URL:', result.file_url);
                       this.downloadUrl = result.file_url; // Set the download URL
+                  }else {
+                      this.downText = "Error ..."
                   }
               } catch (error) {
+                  this.downText = "Error ..."
                   if (error.response) {
                       // Server responded with a status other than 2xx
                       alert(`Error: ${error.response.data.message || 'Failed to generate report'}`);

app/report/views.py

@@ -22,6 +22,9 @@ from django.contrib.auth.models import User
 from legacy.models import Data
 from django.conf import settings
 
+from itertools import chain
+
+
 def index(request):
     reports = Report.objects.all()
     report_filter = ReportFilter(request.GET, queryset=reports)
@@ -166,7 +169,7 @@ def clear_values(n, m):
     placeholders = {}
     for i in range(1, n + 1):
         for j in range(1, m + 1):
-            placeholders[f'v{i}_{j}'] = 0
+            placeholders[f'v{i}_{j}'] = " "
     return placeholders
 
 # # Example usage:
@@ -283,12 +286,12 @@ def generate_dimension_app_values(lot_no):
             placeholders[f'v3_2'] = r.hsize
             placeholders[f'v3_3'] = r.hsizeok
 
-            if is_ok(r):
-                placeholders[f'v4_1'] = 'OK'
-                placeholders[f'v4_2'] = 'OK'
-            else:
-                placeholders[f'v4_1'] = 'NG'
-                placeholders[f'v4_2'] = 'OK'
+            # if is_ok(r):
+                # placeholders[f'v4_1'] = 'OK'
+                # placeholders[f'v4_2'] = 'OK'
+            # else:
+                # placeholders[f'v4_1'] = 'NG'
+                # placeholders[f'v4_2'] = 'OK'
         
         if r.row_no == 2:
             placeholders[f'v5_2'] = r.dsize
@@ -300,16 +303,133 @@ def generate_dimension_app_values(lot_no):
             placeholders[f'v7_2'] = r.hsize
             placeholders[f'v7_3'] = r.hsizeok
 
-            if is_ok(r):
-                placeholders[f'v8_1'] = 'OK'
-                placeholders[f'v8_2'] = 'OK'
-            else:
-                placeholders[f'v8_1'] = 'NG'
-                placeholders[f'v8_2'] = 'NG'
+            # if is_ok(r):
+                # placeholders[f'v8_1'] = 'OK'
+                # placeholders[f'v8_2'] = 'OK'
+            # else:
+                # placeholders[f'v8_1'] = 'NG'
+                # placeholders[f'v8_2'] = 'NG'
 
     hide_con(placeholders, "v5_1", "26:32")
     return placeholders
 
+def generate_dim_bal_app_hard_values(lot_no, first_result):
+    """
+    Fetch dimension records from manualSize and DataMs models
+    and generate placeholder values for Standard, Actual, and Judgement.
+    Supports two row_no entries per lot.
+    """
+    # Fetch standard values from manualSize (limit to 2 rows)
+    manual_size_records = Manualsize.objects.filter(lotno=lot_no)
+
+    # Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')[:2]
+    data_wb = DataWb.objects.filter(lot_no=lot_no).order_by('row_no')[:2]
+    
+    data_h1 = list(Data.objects.filter(lot_no=lot_no).order_by('row_no')[:2])
+    data_h2 = list(DataRl.objects.filter(lot_no=lot_no).order_by('row_no')[:2])
+
+    data_ho = list(chain(data_h1, data_h2))
+
+    if first_result:
+        out_limit = f"Out 外  ({first_result.MI18} - {first_result.MI19})"
+        in_limit = f"In 内 ({first_result.MI22} - {first_result.MI23})"
+        mid_limit = f"Middle   中  -"
+    else:
+        out_limit = f"Out 外"
+        in_limit = f"In 内"
+        mid_limit = f"Middle   中"
+    
+    
+
+    # Prepare placeholders
+
+    # placeholders = {}
+    placeholders = clear_values(16,5)
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # placeholders[f'v{i}_{j}'] = 0
+    placeholders['v6_0'] = placeholders['v14_0'] = out_limit
+    placeholders['v7_0'] = placeholders['v15_0'] = mid_limit
+    placeholders['v18_0'] = placeholders['v16_0'] = in_limit
+
+    pprint(placeholders)
+    pprint(manual_size_records) 
+    if first_result:
+        w = first_result.PRO6
+        placeholders['v4_1'] = placeholders['v12_1'] = w
+
+    for m in manual_size_records:
+        if m.size_name == "D":
+            placeholders['v1_1'] = placeholders['v9_1'] = f'D{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "T":
+            placeholders['v2_1'] = placeholders['v10_1'] = f'T{m.std} +{m.tolup} {m.tolun}'
+        if m.size_name == "H":
+            placeholders['v3_1'] = placeholders['v11_1'] = f'H{m.std} +{m.tolup} {m.tolun}'
+
+
+
+    # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    for r in data_ms_records:
+        if r.row_no == 1:
+            placeholders[f'v1_2'] = r.dsize
+            placeholders[f'v1_3'] = r.dsizeok
+            
+            placeholders[f'v2_2'] = r.tsize
+            placeholders[f'v2_3'] = r.tsizeok
+            
+            placeholders[f'v3_2'] = r.hsize
+            placeholders[f'v3_3'] = r.hsizeok
+
+            # if is_ok(r):
+                # placeholders[f'v4_1'] = 'OK'
+                # placeholders[f'v4_2'] = 'OK'
+            # else:
+                # placeholders[f'v4_1'] = 'NG'
+                # placeholders[f'v4_2'] = 'OK'
+        
+        if r.row_no == 2:
+            placeholders[f'v9_2'] = r.dsize
+            placeholders[f'v9_3'] = r.dsizeok
+            
+            placeholders[f'v10_2'] = r.tsize
+            placeholders[f'v10_3'] = r.tsizeok
+            
+            placeholders[f'v11_2'] = r.hsize
+            placeholders[f'v11_3'] = r.hsizeok
+
+            # if is_ok(r):
+                # placeholders[f'v8_1'] = 'OK'
+                # placeholders[f'v8_2'] = 'OK'
+            # else:
+                # placeholders[f'v8_1'] = 'NG'
+                # placeholders[f'v8_2'] = 'NG'
+
+    for r in data_wb:
+        if r.row_no == 1:
+            placeholders["v4_2"] = r.weight
+            placeholders["v4_3"] = r.judgement
+        if r.row_no == 2:
+            placeholders["v12_2"] = r.weight
+            placeholders["v12_3"] = r.judgement
+
+    for r in data_ho:
+        if r.row_no == 1:
+            rmap = {'OUT': 6, 'MID': 7, 'IN': 8}
+            for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
+                idx = rmap.get(r.r_type, None)
+                if idx:
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v) 
+        if r.row_no == 2:
+            rmap = {'OUT': 14, 'MID': 15, 'IN': 16}
+            for index, v in enumerate(["p1", "p2", "p3", "avg", "rgrade"], start=1):
+                idx = rmap.get(r.r_type, None)
+                if idx:
+                    placeholders[f'v{idx}_{index}']  = getattr(r, v)
+
+    # hide_con(placeholders, "v5_1", "26:32")
+    return placeholders
+
 def generate_centering_values(lot_no):
     """
     Fetch dimension records from manualSize and DataMs models
@@ -341,6 +461,43 @@ def generate_centering_values(lot_no):
 
     return placeholders
 
+def generate_t8_values(lot_no):
+    """
+    Fetch dimension records from manualSize and DataMs models
+    and generate placeholder values for Standard, Actual, and Judgement.
+    Supports two row_no entries per lot.
+    """
+    # Fetch standard values from manualSize (limit to 2 rows)
+    placeholders = clear_values(8,10)
+    
+    manual_size_records = Manualsize.objects.filter(lotno=lot_no)
+    # pprint(f"manual_size = {manual_size_records}")
+    for m in manual_size_records:
+        if m.size_name == "Thickness":
+            for i in range(1,9):
+                placeholders[f'v{i}_1'] = f'{m.std} +{m.tolup} {m.tolun}'
+                # pprint("set std")
+    # Fetch actual and judgement values from DataMs ordered by row_no (limit to 2 rows)
+    data_ms_records = DataMs.objects.filter(lot_no=lot_no).order_by('row_no')
+
+    # Prepare placeholders
+
+    # placeholders = {}
+    # for i in range(1,7):
+        # for j in range(1,4):
+            # placeholders[f'v{i}_{j}'] = 0
+    
+
+    # Ensure that we map each manualSize entry to a corresponding DataMs entry
+    for i,r in enumerate(data_ms_records, start=1):
+        placeholders[f'v{i}_2'] = r.tpoint1
+        placeholders[f'v{i}_3'] = r.tpoint2
+        placeholders[f'v{i}_4'] = r.tpoint3
+        placeholders[f'v{i}_5'] = r.tpoint4
+        placeholders[f'v{i}_10'] = r.tdiff
+
+    return placeholders
+
 def merge_sheet_data_with_data(sheet_data, data):
     """
     Merge `sheet_data` with `data`.
@@ -370,6 +527,9 @@ def create_coi_file(lot_no, sheets, user, md):
     pprint(qa1)
     pprint(qa2)
     
+    results = queryFromMaster(lot_no)
+    first_result = results[0] if results else None
+    
     sheet_data = {}
     for sheet_name in sheets:
         match sheet_name:
@@ -383,14 +543,20 @@ def create_coi_file(lot_no, sheets, user, md):
                 sheet_data[sheet_name] = generate_dimension_app_values(lot_no)
             case 'centering':
                 sheet_data[sheet_name] = generate_centering_values(lot_no)
+            case 'centering':
+                sheet_data[sheet_name] = generate_centering_values(lot_no)
+            case 'thickness_8_point':
+                sheet_data[sheet_name] = generate_t8_values(lot_no)
+            case 'dim_bal_app_hard':
+                sheet_data[sheet_name] = generate_dim_bal_app_hard_values(lot_no, first_result)
     
     converted_data = convert_sheet_data(sheet_data)
 
     print(f"sheet_data \n {sheet_data}") 
     print(f"converted_data \n {converted_data}")
 
-    results = queryFromMaster(lot_no)
-    first_result = results[0] if results else None
+    # results = queryFromMaster(lot_no)
+    # first_result = results[0] if results else None
     try:
         pcs = int(first_result.PRO5) - int(first_result.PRO27)
     except:
@@ -403,8 +569,8 @@ def create_coi_file(lot_no, sheets, user, md):
         spec = ""
 
     data = {
-        "code": first_result.PRO1,
-        "customer": first_result.PRO1C,
+        "code": first_result.PRO1 if first_result else "-",
+        "customer": first_result.PRO1C if first_result else "-",
         "inspect_date": "2025-01-15",
         "lot_no": lot_no,
         "size": size_str,
@@ -430,7 +596,7 @@ def create_coi_file(lot_no, sheets, user, md):
     output_file = gen_xlsx(
         template_file=f"{settings.BASE_DIR}/report/coi_templates.xlsx",
         selected_sheets=sheets,  # Replace with your actual sheet names
-        prefix_filename=f"{settings.BASE_DIR}/media/coi",
+        prefix_filename=f"{settings.BASE_DIR}/media/coi_{lot_no}_",
         data=merged_data
     )
     report = Report.objects.create(