fill_values

app/legacy/filters.py

@@ -5,10 +5,18 @@ from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, Data
 class DataFilter(django_filters.FilterSet):
     lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
     code = django_filters.CharFilter(field_name='code', lookup_expr='icontains')
+    r_type = django_filters.CharFilter(method='filter_r_type')
+
 
     class Meta:
         model = Data
-        fields = ['lot_no', 'code']  # Add fields you want to filter
+        fields = ['lot_no', 'code', 'r_type']  # Add fields you want to filter
+    
+    def filter_r_type(self, queryset, name, value):
+        # Split the comma-separated values into a list
+        r_type_list = [v.strip() for v in value.split(',') if v.strip()]
+        # Filter the queryset using the list
+        return queryset.filter(**{f"{name}__in": r_type_list})
 
 class DataMsFilter(django_filters.FilterSet):
     lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')

app/legacy/models.py

@@ -120,7 +120,7 @@ class Data(models.Model):
     row_no = models.IntegerField(blank=True, null=True)
     lot_no = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     code = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
-    header = models.CharField(max_length=10, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
+    r_type = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     p1 = models.FloatField(blank=True, null=True)
     p2 = models.FloatField(blank=True, null=True)
     p3 = models.FloatField(blank=True, null=True)
@@ -134,7 +134,7 @@ class Data(models.Model):
     avg = models.FloatField(blank=True, null=True)
     grade = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     rgrade = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
-    r_type = models.CharField(max_length=50, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
+    header = models.CharField(max_length=10, db_collation='SQL_Latin1_General_CP1_CI_AS', blank=True, null=True)
     created_at = models.DateTimeField(blank=True, null=True)
     updated_at = models.DateTimeField(blank=True, null=True)
     ndata = models.IntegerField(blank=True, null=True)

app/legacy/templates/legacy/data_list.html

@@ -78,12 +78,26 @@
         </div>
         <div class="space-x-2">
             {% if page_obj.has_previous %}
-                <a href="?page=1" class="text-blue-500 hover:underline">First</a>
-                <a href="?page={{ page_obj.previous_page_number }}" class="text-blue-500 hover:underline">Previous</a>
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page=1" 
+                   class="text-blue-500 hover:underline">First</a>
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.previous_page_number }}" 
+                   class="text-blue-500 hover:underline">Previous</a>
             {% endif %}
+            {% for page_num in page_obj.paginator.page_range %}
+                {% if page_num == page_obj.number %}
+                    <span class="font-bold text-gray-700">{{ page_num }}</span>
+                {% elif page_num == 1 or page_num == page_obj.paginator.num_pages or page_num >= page_obj.number|add:"-2" and page_num <= page_obj.number|add:"2" %}
+                    <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_num }}" 
+                       class="text-blue-500 hover:underline">{{ page_num }}</a>
+                {% elif page_num == page_obj.number|add:-3 or page_num == page_obj.number|add:3 %}
+                    <span class="mx-1">...</span>
+                {% endif %}
+            {% endfor %}
             {% if page_obj.has_next %}
-                <a href="?page={{ page_obj.next_page_number }}" class="text-blue-500 hover:underline">Next</a>
-                <a href="?page={{ page_obj.paginator.num_pages }}" class="text-blue-500 hover:underline">Last</a>
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.next_page_number }}" 
+                   class="text-blue-500 hover:underline">Next</a>
+                <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.paginator.num_pages }}" 
+                   class="text-blue-500 hover:underline">Last</a>
             {% endif %}
         </div>
     </div>

app/legacy/templates/legacy/datacrud_list.html

@@ -81,6 +81,16 @@
                 <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.previous_page_number }}" 
                    class="text-blue-500 hover:underline">Previous</a>
             {% endif %}
+            {% for page_num in page_obj.paginator.page_range %}
+                {% if page_num == page_obj.number %}
+                    <span class="font-bold text-gray-700">{{ page_num }}</span>
+                {% elif page_num == 1 or page_num == page_obj.paginator.num_pages or page_num >= page_obj.number|add:"-2" and page_num <= page_obj.number|add:"2" %}
+                    <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_num }}" 
+                       class="text-blue-500 hover:underline">{{ page_num }}</a>
+                {% elif page_num == page_obj.number|add:-3 or page_num == page_obj.number|add:3 %}
+                    <span class="mx-1">...</span>
+                {% endif %}
+            {% endfor %}
             {% if page_obj.has_next %}
                 <a href="?{% for key, value in request.GET.items %}{% if key != 'page' %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.next_page_number }}" 
                    class="text-blue-500 hover:underline">Next</a>

app/legacy/templatetags/legacy_filters.py

@@ -32,8 +32,15 @@ def render_breadcrumbs(context, breadcrumbs):
 @register.filter
 def safe_floatformat(value, decimal_places):
     try:
-        # Attempt to convert the value to a float and format it
-        return floatformat(float(value), decimal_places)
+        # Attempt to convert the value to a float
+        value = float(value)
+        
+        # Check if the value is an integer
+        if value.is_integer():
+            return int(value)  # Return as an integer
+        
+        # Otherwise, format as a float with the specified decimal places
+        return floatformat(value, decimal_places)
     except (ValueError, TypeError):
         # If the value is not a number, return it as is
         return value

app/legacy/views.py

@@ -25,8 +25,9 @@ from core.utils import ConfigurableCRUDView
 class DataListView(FilterView, ListView):
     model = Data
     template_name = 'legacy/data_list.html'
+    ordering = ['id', 'row_no']  # Order by id (ascending), then row_no (ascending)
     # context_object_name = 'data_list'
-    paginate_by = 10  # Enable pagination
+    paginate_by = 50  # Enable pagination
 
     # Specify the filter class
     filterset_class = DataFilter

app/report/gen_report.py

@@ -234,6 +234,11 @@ def gen_xlsx(template_file, selected_sheets, prefix_filename, data):
                             cell.value = None  # Remove the placeholder text
                         else:
                             # Insert the text value directly
+                            # cell.value = value
+                            if isinstance(value, str) and "[" in value and "]" in value:
+                                # Extract the part before "[i:j]"
+                                value = value.split("[")[0]
+                            # Insert the cleaned value into the cell
                             cell.value = value
 
         for key, value in data.items():

app/report/templates/report/coi.html

@@ -6,11 +6,12 @@
 <div class="container mx-auto px-4 py-8" x-data="COIReport">
 
   <h1 class="text-2xl font-bold text-gray-800">Export Center</h1>
+  {{ lot_no }}
   <form method='post'>
     {% csrf_token %}
     <div class="flex items-center gap-2 mb-4">
       <label for="lot-number" class="text-gray-700 font-medium">Lot No. :</label>
-      <input id="lot-number" type="text" class="border border-gray-300 rounded px-4 py-2 focus:outline-blue-500" placeholder="Enter Lot No." name='lot_no' required x-model="lot_no">
+      <input id="lot-number" type="text" class="border border-gray-300 rounded px-4 py-2 focus:outline-blue-500" placeholder="Enter Lot No." name='lot_no' required x-model="lot_no" value="{{ lot_no }}">
       <button class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" type="submit" name="search_lot">
         🔍
       </button>
@@ -131,7 +132,7 @@
 <script type="text/javascript">
   function COIReport() {
     return {
-      lot_no: '', // Bind this to the input value
+      lot_no: '{{ lot_no }}', // Bind this to the input value
       exports: [],
       qa1: null,
       qa2: null,

app/report/views.py

@@ -85,6 +85,19 @@ def convert_sheet_data(sheet_data):
 
     return converted_data
 
+def hide_con(placeholders, mark_value, hide_rows):
+    """
+    Updates the 'placeholders' dictionary with a mark value and hide rows range.
+
+    :param placeholders: The dictionary to update.
+    :param mark_value: The key to check or update in the placeholders.
+    :param hide_rows: The row range to append in the format '[start:end]'.
+    """
+    if mark_value in placeholders:
+        placeholders[mark_value] = f"{placeholders[mark_value]}[{hide_rows}]"
+    else:
+        placeholders[mark_value] = f"0[{hide_rows}]"
+
 def generate_hardness_out_values(lot_no):
     """
     Generate a dictionary of placeholder values for a given lot_no.
@@ -108,6 +121,44 @@ def generate_hardness_out_values(lot_no):
 
     return placeholders
 
+def generate_hardness_out_in_values(lot_no):
+    # Fetch records from the Data model
+    records = Data.objects.filter(lot_no=lot_no).order_by('row_no')
+    out_data = []
+    in_data = []
+
+    # Separate OUT and IN data
+    for record in records:
+        if record.r_type.upper() in ["OUT", "TOP", "FA1", "UPP", "UPPE", "RIM"]:
+            out_data.append(record)
+        elif record.r_type.upper() in ["IN", "UNDER", "UND", "FA2", "LOW", "LOWE", "BASE", "SOKO", "IN*"]:
+            in_data.append(record)
+
+    # Prepare placeholders
+    placeholders = {}
+    for idx, record in enumerate(out_data, start=1):
+        placeholders[f'v{idx}_1'] = record.p1
+        placeholders[f'v{idx}_2'] = record.p2
+        placeholders[f'v{idx}_3'] = record.p3
+        placeholders[f'v{idx}_4'] = record.avg
+        placeholders[f'v{idx}_5'] = record.rgrade
+
+    for idx, record in enumerate(in_data, start=1):
+        placeholders[f'v{len(out_data) + idx}_1'] = record.p1
+        placeholders[f'v{len(out_data) + idx}_2'] = record.p2
+        placeholders[f'v{len(out_data) + idx}_3'] = record.p3
+        placeholders[f'v{len(out_data) + idx}_4'] = record.avg
+        placeholders[f'v{len(out_data) + idx}_5'] = record.rgrade
+
+    # if "v3_1" in placeholders:
+        # placeholders["v3_1"] = f"{placeholders['v3_1']}[25:28]"
+    # else:
+        # placeholders[f"v3_1"] = "0[25:28]"
+
+    hide_con(placeholders, "v3_1", "25:28")
+    
+    return placeholders
+
 def merge_sheet_data_with_data(sheet_data, data):
     """
     Merge `sheet_data` with `data`.
@@ -132,8 +183,12 @@ def create_coi_file(lot_no, sheets, user, md):
     
     sheet_data = {}
     for sheet_name in sheets:
-        if sheet_name == 'hardness_out':
-            sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
+        match sheet_name:
+            case 'hardness_out':
+                sheet_data[sheet_name] = generate_hardness_out_values(lot_no)
+            case 'hardness_out_in':
+                sheet_data[sheet_name] = generate_hardness_out_in_values(lot_no)
+    
     converted_data = convert_sheet_data(sheet_data)
 
     print(f"sheet_data \n {sheet_data}") 
@@ -156,10 +211,6 @@ def create_coi_file(lot_no, sheets, user, md):
         # "hardness_out.qa2": f"{qa2.first_name} {qa2.last_name}",
         "qa1": f"{qa1.first_name} {qa1.last_name}",
         "qa2": f"{qa2.first_name} {qa2.last_name}",
-        "dimension_app.d1_act": "33",
-        "dimension_app.d2_act": "0[26:32]",  # Hide rows 24 to 28 if the prefix is "0"
-        "dimension_app.acc": True,  # Hide rows 24 to 28 if the prefix is "0"
-        "dimension_app.spe_acc": True,  # Hide rows 24 to 28 if the prefix is "0"
         "sign1": qa1.profile.signed_picture,
         "sign2": qa2.profile.signed_picture,
         "pos1": qa1.profile.get_position_display(),
@@ -264,6 +315,7 @@ def coi_view(request):
                 return render(request, 'report/coi.html', {'result': first_result, 
                                                            'pcs':pcs, 
                                                            'size_str': size_str,
+                                                           'lot_no': lot_no,
                                                            'spec': spec, 'users': users, 'SHEET_NAMES': SHEET_NAMES})
 
         messages.success(request, "Request Sent")
@@ -275,7 +327,7 @@ def coi_view(request):
 @login_required
 def gen_report_view(request):
     if request.method == "POST":
-        try:
+        # try:
             # Parse JSON data from the request body
             data = json.loads(request.body)
             lot_no = data.get("lot_no").strip()
@@ -297,11 +349,11 @@ def gen_report_view(request):
                 "file_url": report.file.url if report.file else None,
             })
 
-        except json.JSONDecodeError:
-            return HttpResponseBadRequest("Invalid JSON data")
-        except Exception as e:
-            pprint(e)
-            return JsonResponse({"error": str(e)}, status=500)
+        # except json.JSONDecodeError:
+            # return HttpResponseBadRequest("Invalid JSON data")
+        # except Exception as e:
+            # pprint(e)
+            # return JsonResponse({"error": str(e)}, status=500)
     else:
         return HttpResponseBadRequest("Only POST requests are allowed")