Skip to content

merging dev to test #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ffrose merged 6 commits into from
Feb 18, 2026
Merged

merging dev to test #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a26b56b
fix(639): Added Missing Translations
1AhmedYasser Feb 18, 2026
612cf6f
chore(623): Removed burokrat check
1AhmedYasser Feb 18, 2026
59a4ee5
chore(1714): Make isFiveRatingScale Global
1AhmedYasser Feb 18, 2026
643c4c0
Merge pull request #642 from 1AhmedYasser/Make-isFiveRatingScale-Global
ffrose Feb 18, 2026
f53cf09
Merge pull request #640 from 1AhmedYasser/fix-missing-history-transla…
ffrose Feb 18, 2026
70e2741
Merge pull request #641 from 1AhmedYasser/Enhancement-SQL-Overview-to…
ffrose Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/feedback-avg-feedback-to-buerokratt-chats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
)
SELECT date_trunc(:metric, ended) AS date_time,
Expand Down
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/feedback-buerokratt-chats-nps.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
chat_buerokratt AS (
Expand Down
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/feedback-chats-distribution.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
chats_filtered AS (
Expand Down
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/feedback-chats-with-negative-feedback.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
MaxChatHistoryComments AS (
Expand Down
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/feedback-csa-chats-feedback-nps.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
chat_csas AS (
Expand Down
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/feedback-selected-csa-feedback-nps.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
ranked_chats AS (
Expand Down
3 changes: 2 additions & 1 deletion DSL/Resql/analytics/POST/get-chat-by-id.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
MaxChatHistoryComments AS (
Expand Down
5 changes: 3 additions & 2 deletions DSL/Resql/analytics/POST/get-cs-all-ended-chats.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ WITH rating_config AS (
SELECT value AS is_five_rating_scale
FROM configuration
WHERE key = 'isFiveRatingScale'
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' GROUP BY key)
AND "domain" IS NULL
AND id IN (SELECT max(id) FROM configuration WHERE key = 'isFiveRatingScale' AND "domain" IS NULL)
AND NOT deleted
),
MaxChatHistoryComments AS (
Expand Down Expand Up @@ -93,7 +94,7 @@ MaxChats AS (
AND c.ended::timestamptz BETWEEN :start::timestamptz AND :end::timestamptz
AND CASE
WHEN (SELECT COALESCE(is_five_rating_scale, 'false') = 'true' FROM rating_config)
THEN c.feedback_rating_five IS NOT NULL AND c.feedback_rating_five <= 5
THEN c.feedback_rating_five IS NOT NULL AND c.feedback_rating_five <= 3
ELSE c.feedback_rating IS NOT NULL AND c.feedback_rating <= 5
END
GROUP BY base_id
Expand Down
6 changes: 0 additions & 6 deletions DSL/Resql/analytics/POST/overview-total-chats-no-csa.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ WHERE EXISTS (
WHERE message.chat_base_id = c.base_id
AND message.author_role = 'backoffice-user'
)
AND EXISTS (
SELECT 1
FROM message
WHERE message.chat_base_id = c.base_id
AND message.author_role = 'buerokratt'
)
AND (c.ended AT TIME ZONE :timezone) >= date_trunc(
:group_period,
(current_date AT TIME ZONE :timezone - concat('1 ', :group_period)::INTERVAL)
Expand Down
3 changes: 2 additions & 1 deletion GUI/src/i18n/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,8 @@
"rating": "Rating",
"feedback": "Feedback",
"chosenCsa": "Chosen csa(s)",
"chosenColumn": "Chosen column(s)"
"chosenColumn": "Chosen column(s)",
"statusAddedDate": "Status added date"
},
"plainEvents": {
"answered": "Answered",
Expand Down
3 changes: 2 additions & 1 deletion GUI/src/i18n/et/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@
"rating": "Hinnang",
"chosenCsa": "Valitud nõustaja(d)",
"chosenColumn": "Valitud tulba(d)",
"feedback": "Tagasiside"
"feedback": "Tagasiside",
"statusAddedDate": "Staatuse lisamise kuupäev"
},
"plainEvents": {
"answered": "Vastatud",
Expand Down
Loading