forlogic-core 2.5.2 → 2.5.4

package/docs/sql/import/validate_occurrences.sql

@@ -55,44 +55,81 @@ BEGIN
        AND o.removed = 0
     WHERE os.id_batch = @id_batch;
 
-    -- INSERÇÃO: Apenas registros válidos
     INSERT INTO occurrences.occurrences
         (
-        code,
-        name,
-        id_type,
-        id_category,
-        description,
-        id_creation_user,
-        id_responsible,
-        start_date,
-        end_date,
-        id_status,
-        id_company,
-        root_cause_identification_required,
-        checker_responsible_equals_in_occurrences,
-        creation_date,
-        last_modified,
-        removed
+            id_company,
+            id_status,
+            id_method,
+            code,
+            name,
+            description,
+            description_text,
+            id_type,
+            id_category,
+            id_creation_user,
+            id_responsible,
+            start_date,
+            end_date,
+            creation_date,
+            last_modified,
+            sketch,
+            removed,
+            is_mobile,
+            id_days_work,
+            allow_plan_before_analyze,
+            complete_actions_before_advance,
+            checker_actions_required,
+            checker_responsible_equals,
+            allow_define_action_plan_out_deadline,
+            ishikawa_diagram_required,
+            tree_5why_diagram_required,
+            allow_tree_diagram,
+            canceled_by_audit,
+            has_module,
+            removed_by_audit,
+            mandatory_attachment,
+            root_cause_identification_required,
+            checker_responsible_equals_in_occurrences,
+            allow_attachments_before_approval
         )
     SELECT
+        os.id_company,
+        os.id_status,
+        1 AS id_method,
         os.code,
         os.name,
+        NULLIF(os.description, ''),
+        NULLIF(os.description, ''),
         os.id_type,
         os.id_category,
-        os.description,
         os.id_creation_user,
         os.id_responsible,
         os.start_date,
         os.end_date,
-        os.id_status,
-        os.id_company,
-        1,
-        0,
-        SYSDATETIMEOFFSET(),
-        SYSDATETIMEOFFSET(),
-        0
+        SYSDATETIMEOFFSET() AS creation_date,
+        SYSDATETIMEOFFSET() AS last_modified,
+        0 AS sketch,
+        0 AS removed,
+        0 AS is_mobile,
+        ISNULL(c.id_days_work, 1) AS id_days_work,
+        0 AS allow_plan_before_analyze,
+        0 AS complete_actions_before_advance,
+        0 AS checker_actions_required,
+        0 AS checker_responsible_equals,
+        0 AS allow_define_action_plan_out_deadline,
+        0 AS ishikawa_diagram_required,
+        0 AS tree_5why_diagram_required,
+        0 AS allow_tree_diagram,
+        0 AS canceled_by_audit,
+        0 AS has_module,
+        0 AS removed_by_audit,
+        0 AS mandatory_attachment,
+        1 AS root_cause_identification_required,
+        0 AS checker_responsible_equals_in_occurrences,
+        0 AS allow_attachments_before_approval
     FROM import.occurrences_staging os WITH (NOLOCK)
+    LEFT JOIN occurrences.configurations c WITH (NOLOCK) 
+        ON c.id_company COLLATE Latin1_General_CS_AS = os.id_company
     WHERE os.id_batch = @id_batch
       AND NOT EXISTS (
           SELECT 1
@@ -155,7 +192,6 @@ BEGIN
     WHERE os.id_batch = @id_batch
       AND o.id_category IS NOT NULL;
  
-    -- create a record table that will hold one row per phase, calculated sequentially
     CREATE TABLE #phase_records (
         id_company CHAR(8),
         id_occurrence CHAR(8),
@@ -167,80 +203,38 @@ BEGIN
  
     -- evaluation
     INSERT INTO #phase_records
-    SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        2,
-        days_evaluation,
-        dbo.AddDays(days_evaluation, start_date, id_days_work, 0)
+    SELECT id_company, id_occurrence, id_responsible, 2, days_evaluation, dbo.AddDays(days_evaluation, start_date, id_days_work, 0)
     FROM #occurrence_phases;
  
-    -- cause analysis (cumulative)
+    -- cause analysis
     INSERT INTO #phase_records
-    SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        3,
-        days_causes_analysis,
-        dbo.AddDays(days_evaluation + days_causes_analysis, start_date, id_days_work, 0)
+    SELECT id_company, id_occurrence, id_responsible, 3, days_causes_analysis, dbo.AddDays(days_evaluation + days_causes_analysis, start_date, id_days_work, 0)
     FROM #occurrence_phases;
  
-    -- action plan elaboration (cumulative)
+    -- action plan elaboration
     INSERT INTO #phase_records
-    SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        4,
-        days_action_plan_elaboration,
-        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration, start_date, id_days_work, 0)
+    SELECT id_company, id_occurrence, id_responsible, 4, days_action_plan_elaboration, dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration, start_date, id_days_work, 0)
     FROM #occurrence_phases;
  
-    -- action plan execution (cumulative)
+    -- action plan execution
     INSERT INTO #phase_records
-    SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        5,
-        days_action_plan_execution,
-        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution, start_date, id_days_work, 0)
+    SELECT id_company, id_occurrence, id_responsible, 5, days_action_plan_execution, dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution, start_date, id_days_work, 0)
     FROM #occurrence_phases;
  
-    -- effectiveness check (cumulative)
+    -- effectiveness check
     INSERT INTO #phase_records
-    SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        6,
-        days_effectiveness_check,
-        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution + days_effectiveness_check, start_date, id_days_work, 0)
+    SELECT id_company, id_occurrence, id_responsible, 6, days_effectiveness_check, dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution + days_effectiveness_check, start_date, id_days_work, 0)
     FROM #occurrence_phases;
  
-    -- standardization (cumulative)
+    -- standardization
     INSERT INTO #phase_records
-    SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        7,
-        days_standardization,
-        dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution + days_effectiveness_check + days_standardization, start_date, id_days_work, 0)
+    SELECT id_company, id_occurrence, id_responsible, 7, days_standardization, dbo.AddDays(days_evaluation + days_causes_analysis + days_action_plan_elaboration + days_action_plan_execution + days_effectiveness_check + days_standardization, start_date, id_days_work, 0)
     FROM #occurrence_phases;
  
-    -- finally insert all records into production at once
     INSERT INTO occurrences.phase_associations
         (id_company, id_occurrence, id_responsible, id_status, duration_days, end_date)
     SELECT
-        id_company,
-        id_occurrence,
-        id_responsible,
-        phase_status,
-        phase_duration,
-        phase_end_date
+        id_company, id_occurrence, id_responsible, phase_status, phase_duration, phase_end_date
     FROM #phase_records;
  
     DROP TABLE #occurrence_phases;
@@ -249,8 +243,8 @@ BEGIN
 END
 GO
 
-use [qualiex_common]
-go
+USE [qualiex_common]
+GO
 
 CREATE OR ALTER PROCEDURE import.get_errors_occurrences
 (
@@ -292,4 +286,4 @@ BEGIN
         os.id_status
     ORDER BY e.row_num;
 END
-GO
+GO

package/docs/sql/import/validate_occurrences_categories.sql

@@ -132,20 +132,25 @@ BEGIN
       AND ocs.active_standardization = 'Sim'
       AND (ocs.days_standardization IS NULL OR LTRIM(RTRIM(ocs.days_standardization)) = '');
 
-    -- Validação 9: Regra de priorização informada deve existir
+    -- Validação 9: Regra de priorização informada deve existir e estar ativa
     INSERT INTO import.errors (id_batch, row_num, error_msg)
-    SELECT @id_batch, ocs.row_num, 'Regra de priorização não encontrada'
+    SELECT @id_batch, ocs.row_num, 'Regra de priorização não encontrada ou inativa'
     FROM import.occurrences_categories_staging ocs WITH (NOLOCK)
     WHERE ocs.id_batch = @id_batch
       AND ocs.id_rule_prioritization IS NOT NULL
       AND LTRIM(RTRIM(ocs.id_rule_prioritization)) <> ''
       AND NOT EXISTS (
-          SELECT 1 FROM occurrences.rules_prioritization rp WITH (NOLOCK)
-          -- Correção: Collation explícito aqui também!
-          WHERE rp.id COLLATE Latin1_General_CS_AS = ocs.id_rule_prioritization 
-            AND rp.id_company COLLATE Latin1_General_CS_AS = ocs.id_company 
+          SELECT 1 FROM dbo.prioritization_rules_template rp WITH (NOLOCK)
+          WHERE rp.id COLLATE Latin1_General_CS_AS = LTRIM(RTRIM(ocs.id_rule_prioritization)) COLLATE Latin1_General_CS_AS
+            AND rp.removed = 0
+            AND rp.is_active = 1
+            AND (
+                 rp.id_company IS NULL
+              OR rp.id_company COLLATE Latin1_General_CS_AS = ocs.id_company COLLATE Latin1_General_CS_AS
+            )
       );
 
+
     -- INSERÇÃO DOS DADOS VÁLIDOS
     INSERT INTO occurrences.categories
         (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forlogic-core",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -126,7 +126,6 @@
     "@tiptap/extension-underline": "^3.14.0",
     "@tiptap/react": "^3.14.0",
     "@tiptap/starter-kit": "^3.14.0",
-    "@types/dompurify": "^3.2.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "date-fns": "^3.6.0",