Design update

LICENSE.md

@@ -60,7 +60,7 @@ version:
    b) under the GNU GPL, with none of the additional permissions of
    this License applicable to that copy.
 
-  3. Object Code Incorporating Material from Library Header Files.
+  3. Object Code Incorporating Material from Library Header GoToIcon.
 
   The object code form of an Application may incorporate material from
 a header file that is part of the Library.  You may convey such object

lib/Controller/API/V3/QualityReportControllerAPI.php

@@ -189,6 +189,7 @@ private function _formatSegments(array $segments, array $ttlArray, array $filesI
             $seg['ice_modified'] = $segment->ice_modified;
             $seg['is_pre_translated'] = $segment->is_pre_translated;
             $seg['issues'] = $segment->issues;
+            $seg['history'] = $segment->history;
             $seg['last_revisions'] = $segment->last_revisions;
             $seg['last_translation'] = $segment->last_translation;
             $seg['locked'] = $segment->locked;

lib/Model/QualityReport/HistoryElementStruct.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Model\QualityReport;
+
+use Model\DataAccess\AbstractDaoObjectStruct;
+use Model\DataAccess\IDaoStruct;
+
+/**
+ * @property int $id_segment
+ * @property string $translation
+ * @property int $version_number
+ * @property int $source_page
+ */
+class HistoryElementStruct extends AbstractDaoObjectStruct implements IDaoStruct
+{
+    public int $id_segment;
+    public string $translation;
+    public int $version_number;
+    public ?int $source_page = null;
+    public ?string $status = null;
+    public ?string $create_date = null;
+    public ?string $creation_date = null;
+}

lib/Model/QualityReport/QualityReportDao.php

@@ -185,6 +185,7 @@ public static function getIssuesBySegments(array $segments_id, int $job_id): arr
 
         $sql = "SELECT
 
+  issues.translation_version as translation_version,
   issues.id_segment as segment_id,
   issues.id as issue_id,
   issues.create_date as issue_create_date,

lib/Model/QualityReport/QualityReportSegmentModel.php

@@ -50,17 +50,8 @@ public function __construct(JobStruct $chunk)
      */
     public function getSegmentsIdForQR($step, int $ref_segment, $where = "after", $options = [])
     {
-        if (isset($options['filter']['issue_category']) && $options['filter']['issue_category'] != 'all') {
-            $subCategories = (new CategoryDao())->findByIdModelAndIdParent(
-                $this->chunk->getProject()->id_qa_model,
-                $options['filter']['issue_category']
-            );
-
-            if (!empty($subCategories) > 0) {
-                $options['filter']['issue_category'] = array_map(function (CategoryStruct $subcat) {
-                    return $subcat->id;
-                }, $subCategories);
-            }
+        if (isset($options['filter']['issue_category'])) {
+            $options['filter']['issue_category'] = $this->issueCategoryIds($options['filter']['issue_category']);
         }
 
         /**
@@ -90,6 +81,39 @@ public function getSegmentsIdForQR($step, int $ref_segment, $where = "after", $o
         return $segments_id;
     }
 
+    /**
+     * Processes a string of issue category IDs, converting them into an array of integers,
+     * and expands the list by including IDs of subcategories if applicable.
+     *
+     * @param string $issue_category A comma-separated string of issue category IDs.
+     *                                If it contains 'all', the method returns null.
+     *
+     * @return array|null Returns an array of category IDs, including subcategory IDs, or null if 'all' is present.
+     */
+    private function issueCategoryIds(string $issue_category): ?array
+    {
+        if (str_contains($issue_category, 'all')){
+            return null;
+        }
+
+        $issue_category = array_map('intval', explode(',', $issue_category));
+
+        foreach ($issue_category as $issue_category_id) {
+            $subCategories = (new CategoryDao())->findByIdModelAndIdParent(
+                $this->chunk->getProject()->id_qa_model,
+                $issue_category_id
+            );
+
+            if (!empty($subCategories)) {
+                foreach ($subCategories as $subcat) {
+                    $issue_category[] = (int)$subcat->id;
+                }
+            }
+        }
+
+        return $issue_category;
+    }
+
     /**
      * @param QualityReportSegmentStruct $seg
      * @param MateCatFilter $Filter
@@ -180,10 +204,9 @@ public function getSegmentsForQR(array $segment_ids, $isForUI = false)
         $commentsDao = new CommentDao;
         $comments = $commentsDao->getThreadsBySegments($segment_ids, $this->chunk->id);
 
-        $all_events = [];
-
         $translationVersionDao = new TranslationVersionDao;
         $all_events = $translationVersionDao->getAllRelevantEvents($segment_ids, $this->chunk->id);
+        $history_events = $translationVersionDao->historyEvents($segment_ids, $this->chunk->id);
 
         $segments = [];
 
@@ -205,7 +228,8 @@ public function getSegmentsForQR(array $segment_ids, $isForUI = false)
             $this->_commonSegmentAssignments($seg, $Filter, $featureSet, $this->chunk, $isForUI);
             $this->_assignIssues($seg, $issues ?? [], $issue_comments);
             $this->_assignComments($seg, $comments);
-            $this->_populateLastTranslationAndRevision($seg, $Filter, $all_events, $isForUI);
+            $this->_populateLastTranslationAndRevision($seg, $Filter, $all_events,  $isForUI);
+            $this->_populateHistory($seg, $Filter, $history_events,$issues ?? [], $isForUI);
 
             $seg->pee_translation_revise = $seg->getPEEBwtTranslationRevise();
             $seg->pee_translation_suggestion = $seg->getPEEBwtTranslationSuggestion();
@@ -216,6 +240,55 @@ public function getSegmentsForQR(array $segment_ids, $isForUI = false)
         return $segments;
     }
 
+    /**
+     * Populates the history for a given quality report segment by organizing events and associated issues.
+     *
+     * @param QualityReportSegmentStruct $seg The segment structure where the history will be populated.
+     * @param MateCatFilter $Filter The filter used to process translations for UI rendering.
+     * @param array $events An array of SegmentEventsStruct objects representing the events related to the segment.
+     * @param array $issues An array of issue objects to associate with the events, filtered by segment and version.
+     * @param bool $isForUI Indicates whether the translation should be processed for UI display purposes.
+     *
+     * @return void
+     */
+    protected function _populateHistory(
+        QualityReportSegmentStruct $seg,
+        MateCatFilter $Filter,
+        array $events = [],
+        array $issues = [],
+        bool $isForUI = false
+    )
+    {
+        $elements = [];
+
+        $eventsForThisSegment = array_filter($events, function (HistoryElementStruct $event) use ($seg) {
+            return $event->id_segment == $seg->sid;
+        });
+
+        /** @var HistoryElementStruct $event */
+        foreach ($eventsForThisSegment as $event) {
+            $translation = ($isForUI) ? $Filter->fromLayer0ToLayer2($event->translation) : $event->translation;
+
+            $elements[] = [
+                'status' => $event->status,
+                'date' => $event->creation_date ?? $event->create_date,
+                'revision_number' => ReviewUtils::sourcePageToRevisionNumber($event->source_page),
+                'source_page' => $event->source_page,
+                'version_number' => $event->version_number,
+                'translation' => $translation,
+                'issues' => array_filter($issues, function ($issue) use ($event) {
+                    return
+                        $issue->deleted_at === null &&
+                        $event->id_segment == $issue->segment_id &&
+                        $event->version_number == $issue->translation_version
+                    ;
+                })
+            ];
+        }
+
+        $seg->history = $elements;
+    }
+
     /**
      * @return ChunkReviewStruct[]
      */

lib/Model/QualityReport/QualityReportSegmentStruct.php

@@ -95,6 +95,8 @@ class QualityReportSegmentStruct extends AbstractDaoObjectStruct implements IDao
 
     protected string $tm_analysis_status;
 
+    public array $history = [];
+
     /**
      * @return string
      */

lib/Model/QualityReport/SegmentEventsStruct.php

@@ -20,7 +20,6 @@
  */
 class SegmentEventsStruct extends AbstractDaoObjectStruct implements IDaoStruct
 {
-
     /**
      * @var int
      */
@@ -37,5 +36,4 @@ class SegmentEventsStruct extends AbstractDaoObjectStruct implements IDaoStruct
      * @var int
      */
     protected int $source_page;
-
 }

lib/Plugins/Features/TranslationVersions/Model/TranslationVersionDao.php

@@ -6,6 +6,7 @@
 use Model\DataAccess\Database;
 use Model\DataAccess\ShapelessConcreteStruct;
 use Model\Jobs\JobStruct;
+use Model\QualityReport\HistoryElementStruct;
 use Model\QualityReport\SegmentEventsStruct;
 use Model\Translations\SegmentTranslationStruct;
 use PDO;
@@ -249,6 +250,56 @@ public function getVersionsForRevision($id_job, $id_segment)
         );
     }
 
+    /**
+     * @param $id_job
+     * @param $id_segment
+     *
+     * @return TranslationVersionStruct[]
+     */
+    public function getVersionsForTranslationBySegment($id_job, $id_segment)
+    {
+        $sql = "SELECT * FROM segment_translation_versions " .
+            " WHERE id_job = :id_job AND id_segment = :id_segment " .
+            " ORDER BY creation_date DESC ";
+    }
+    public function historyEvents(array $segments_id, int $job_id)
+    {
+        $db = Database::obtain()->getConnection();
+
+        $prepare_str_segments_id = implode(', ', array_fill(0, count($segments_id), '?'));
+
+        $query = "SELECT 
+            id_segment,
+            first_sv.version_number, 
+            null as source_page,
+            null as status,
+            null as create_date,
+            first_sv.creation_date, 
+            first_sv.translation
+            FROM segment_translation_versions first_sv WHERE id_segment IN ( $prepare_str_segments_id ) AND id_job = ? AND version_number = 0
+            UNION
+            SELECT ste.id_segment, ste.version_number, ste.source_page, ste.status, ste.create_date, stv.creation_date, stv.translation FROM segment_translation_events ste 
+            INNER JOIN (
+            SELECT creation_date, id_segment, translation, version_number, id_job
+                 FROM segment_translation_versions
+                 WHERE id_segment IN ( $prepare_str_segments_id )
+                   AND id_job = ?
+                 UNION
+                 SELECT null as creation_date, id_segment, translation, version_number, id_job
+                 FROM segment_translations
+                 WHERE id_segment IN ( $prepare_str_segments_id )
+                   AND id_job = ?
+            ) AS stv ON stv.version_number = ste.version_number AND stv.id_segment = ste.id_segment
+
+            WHERE ste.id_segment IN ( $prepare_str_segments_id ) GROUP BY version_number, source_page;";
+
+        $stmt = $db->prepare($query);
+        $stmt->setFetchMode(PDO::FETCH_CLASS, HistoryElementStruct::class);
+        $stmt->execute(array_merge($segments_id, [$job_id], $segments_id, [$job_id], $segments_id, [$job_id], $segments_id));
+
+        return $stmt->fetchAll();
+    }
+
     /**
      * @param array $segments_id
      * @param int $job_id
@@ -279,7 +330,7 @@ public function getAllRelevantEvents(array $segments_id, int $job_id): array
                    AND id_job = ?
             ) AS stv
             JOIN (
-                   SELECT MAX(version_number) AS version_number, ste.id_segment, ste.source_page
+                   SELECT MAX(version_number) AS version_number, ste.id, ste.id_segment, ste.source_page
                    FROM segment_translation_events ste
                    WHERE id_segment IN ( $prepare_str_segments_id )
                      AND ste.id_job = ?

lib/View/templates/_manage.html

@@ -39,9 +39,7 @@
 </header>
 
 <div id="manage-container" class="new-container">
-    <div class="ui active inverted dimmer">
-        <div class="ui massive text loader">Loading Projects</div>
-    </div>
+
 </div>
 
 

public/css/sass/activity-log-main.scss

@@ -18,7 +18,7 @@
 .activity-log-table {
   height: 100%;
   overflow-y: auto;
-  border: 1px solid colors.$grey8;
+  border: 1px solid colors.$grey200;
 
   .activity-log-table-columns-name,
   .activity-log-table-columns-content {
@@ -47,7 +47,7 @@
   .activity-log-table-columns-content {
     > * {
       height: 40px;
-      border: 1px solid colors.$grey8;
+      border: 1px solid colors.$grey200;
       border-top: unset;
       padding: 10px;
       border-left: unset;
@@ -58,13 +58,13 @@
     }
 
     &:nth-child(odd) {
-      background-color: colors.$grey5;
+      background-color: colors.$grey50;
     }
   }
 
   .activity-table-column-order {
-    background-color: colors.$grey9;
-    border: 1px solid colors.$grey8;
+    background-color: colors.$grey75;
+    border: 1px solid colors.$grey200;
     padding: 5px;
     justify-content: space-between;
     cursor: pointer;
@@ -97,15 +97,15 @@
       width: 160px;
 
       label {
-        color: colors.$grey6;
+        color: colors.$grey700;
       }
 
       .select {
         font-size: 14px;
         padding: 5px;
 
         &:hover {
-          border-color: rgba(colors.$grey8, 0.8);
+          border-color: rgba(colors.$grey200, 0.8);
           box-shadow: none;
         }
       }
@@ -115,7 +115,7 @@
       width: 250px;
       font-size: 14px;
       border-radius: 2px;
-      border: 1px solid colors.$grey2;
+      border: 1px solid colors.$grey300;
       padding: 7px;
     }
   }