From 4b630cdae2d5be2f034b45f3a7b0cd5b0b026146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?=
- <%= ops_button "Podporte nás", url_for('/podporte-nas') %> + <%= ops_button "Podporte nás", cms_page_url('podporte-nas') %>
diff --git a/app/views/notification_mailer/issue_rejected.html.erb b/app/views/notification_mailer/issue_rejected.html.erb index cfb97c97..b27abf36 100644 --- a/app/views/notification_mailer/issue_rejected.html.erb +++ b/app/views/notification_mailer/issue_rejected.html.erb @@ -14,7 +14,7 @@ <% end %>- Ak sa chcete dozvedieť viac o tom, aké podnety a pochvaly zverejňujeme, pozrite si našu sekciu <%= link_to "Pravidlá", url_for('/pravidla'), class: "ops-email-link", target: "_blank" %>. + Ak sa chcete dozvedieť viac o tom, aké podnety a pochvaly zverejňujeme, pozrite si našu sekciu <%= link_to "Pravidlá", cms_page_url('pravidla'), class: "ops-email-link", target: "_blank" %>.
<%= render "signature" %> <%= render "unsubscribe" %> From f736c8938ea07165842941e14631f60bfb582955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?=+ Stav podnetu bol zmenený z + <%= change.previous_state&.name || "neznámeho stavu" %> + na + <%= change.new_state.name %> +
++ <% if @issue.author == @user %> + Dobrý deň, samospráva začala aktívne pracovať na Vašom podnete <%= ops_issue_link @issue %>. + <% else %> + Dobrý deň, samospráva začala aktívne pracovať na podnete <%= ops_issue_link @issue %>, ktorý sledujete. + <% end %> + Detailné informácie o postupe prác nájdete v <%= link_to "detaile podnetu", issue_url(@issue), class: "ops-email-link", target: "_blank" %>. +
++ <%= ops_button "Reagovať na nový status", "#{issue_url(@issue)}#new_issue_activity" %> +
+<%= render "signature" %> +<%= render "unsubscribe" %> diff --git a/app/views/notification_mailer/issue_responsible_subject_changed.html.erb b/app/views/notification_mailer/issue_responsible_subject_changed.html.erb new file mode 100644 index 00000000..864c0c17 --- /dev/null +++ b/app/views/notification_mailer/issue_responsible_subject_changed.html.erb @@ -0,0 +1,27 @@ +<%= ops_title "Zmena zodpovedného subjektu" %> ++ Dobrý deň, + <% if @issue.author == @user %> + radi by sme Vás informovali, že pri Vašom podnete <%= ops_issue_link @issue %> + <% else %> + radi by sme Vás informovali, že pri podnete <%= ops_issue_link @issue %>, ktorý sledujete, + <% end %> + došlo k zmene zodpovedného subjektu. +
++ Podnet bol presunutý + <% if @previous_rs %> + z kompetencie <%= @previous_rs.subject_name %> + <% end %> + na <%= @new_rs&.subject_name || "iný subjekt" %>. Zvolený subjekt bol o podnete informovaný a v najbližšej dobe sa ním bude zaoberať. +
++ <%= ops_button "Zobraziť podnet", "#{issue_url(@issue)}#new_issue_activity" %> +
+<% if @issue.author == @user %> ++ Ďakujeme za Vašu spoluprácu. +
+<% end %> +<%= render "signature" %> +<%= render "unsubscribe" %> diff --git a/app/views/notification_mailer/issue_accepted.html.erb b/app/views/notification_mailer/issue_sent_to_responsible.html.erb similarity index 88% rename from app/views/notification_mailer/issue_accepted.html.erb rename to app/views/notification_mailer/issue_sent_to_responsible.html.erb index b435e386..d6af009d 100644 --- a/app/views/notification_mailer/issue_accepted.html.erb +++ b/app/views/notification_mailer/issue_sent_to_responsible.html.erb @@ -1,6 +1,6 @@ <%= ops_title "Váš podnet bol zverejnený" %>- Dobrý deň, Váš podnet <%= ops_issue_link @issue %>, ktorý ste pridali <%= @issue.created_at.strftime("%d.%m.%Y") %> na portál Odkaz pre starostu, bol zverejnený a odoslaný zodpovedným pracovníkom a pracovníčkam samosprávy. + Dobrý deň, Váš podnet <%= ops_issue_link @issue %>, ktorý ste pridali <%= @issue.created_at.strftime("%d.%m.%Y") %> na portál Odkaz pre starostu, bol odoslaný zodpovednému subjektu.
Ak v súčasnosti, alebo v budúcnosti budete mať doplňujúcu informáciu o aktuálnom stave alebo o riešení Vášho podnetu, môžete nám ju poskytnúť pridaním komentára k podnetu, ideálne aj s priložením fotografie aktuálneho stavu. diff --git a/app/views/notification_mailer/issue_waiting.html.erb b/app/views/notification_mailer/issue_waiting.html.erb new file mode 100644 index 00000000..63019bca --- /dev/null +++ b/app/views/notification_mailer/issue_waiting.html.erb @@ -0,0 +1,14 @@ +<%= ops_title "Podnet čaká na riešenie" %> +
+ <% if @issue.author == @user %> + Dobrý deň, status Vášho podnetu <%= ops_issue_link @issue %> bol zmenený na Čakajúci. Samospráva o probléme vie, no jeho riešenie aktuálne vyžaduje viac času. + <% else %> + Dobrý deň, status podnetu <%= ops_issue_link @issue %>, ktorý sledujete, bol zmenený na Čakajúci. + <% end %> + Dôvod zmeny stavu nájdete v <%= link_to "detaile podnetu", issue_url(@issue), class: "ops-email-link", target: "_blank" %>. +
++ <%= ops_button "Reagovať na nový status", "#{issue_url(@issue)}#new_issue_activity" %> +
+<%= render "signature" %> +<%= render "unsubscribe" %> diff --git a/db/structure.sql b/db/structure.sql index 4e93c401..902138b5 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -275,7 +275,8 @@ CREATE TABLE public.cms_pages ( updated_at timestamp(6) without time zone NOT NULL, tags character varying[] DEFAULT '{}'::character varying[], category_id bigint NOT NULL, - raw text NOT NULL + raw text NOT NULL, + thumbnail_url character varying ); @@ -1113,6 +1114,41 @@ CREATE SEQUENCE public.issues_subtypes_id_seq ALTER SEQUENCE public.issues_subtypes_id_seq OWNED BY public.issues_subtypes.id; +-- +-- Name: issues_system_responsible_subject_changes; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.issues_system_responsible_subject_changes ( + id bigint NOT NULL, + activity_id bigint NOT NULL, + previous_responsible_subject_id bigint, + new_responsible_subject_id bigint, + hidden boolean DEFAULT false NOT NULL, + uuid uuid NOT NULL, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: issues_system_responsible_subject_changes_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.issues_system_responsible_subject_changes_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: issues_system_responsible_subject_changes_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.issues_system_responsible_subject_changes_id_seq OWNED BY public.issues_system_responsible_subject_changes.id; + + -- -- Name: issues_updates; Type: TABLE; Schema: public; Owner: - -- @@ -2008,9 +2044,9 @@ CREATE TABLE public.users ( imported_at timestamp(6) without time zone, responsible_subject_id bigint, type character varying, - CONSTRAINT valid_email CHECK ((email OPERATOR(public.~) '^[^,;@ -]+@[^,@; -]+\.[^,@; + CONSTRAINT valid_email CHECK ((email OPERATOR(public.~) '^[^,;@ +]+@[^,@; +]+\.[^,@; ]+$'::public.citext)) ); @@ -2202,6 +2238,13 @@ ALTER TABLE ONLY public.issues_subcategories ALTER COLUMN id SET DEFAULT nextval ALTER TABLE ONLY public.issues_subtypes ALTER COLUMN id SET DEFAULT nextval('public.issues_subtypes_id_seq'::regclass); +-- +-- Name: issues_system_responsible_subject_changes id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.issues_system_responsible_subject_changes ALTER COLUMN id SET DEFAULT nextval('public.issues_system_responsible_subject_changes_id_seq'::regclass); + + -- -- Name: issues_updates id; Type: DEFAULT; Schema: public; Owner: - -- @@ -2603,6 +2646,14 @@ ALTER TABLE ONLY public.issues_subtypes ADD CONSTRAINT issues_subtypes_pkey PRIMARY KEY (id); +-- +-- Name: issues_system_responsible_subject_changes issues_system_responsible_subject_changes_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.issues_system_responsible_subject_changes + ADD CONSTRAINT issues_system_responsible_subject_changes_pkey PRIMARY KEY (id); + + -- -- Name: issues_updates issues_updates_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -2795,6 +2846,20 @@ ALTER TABLE ONLY public.users ADD CONSTRAINT users_pkey PRIMARY KEY (id); +-- +-- Name: idx_on_new_responsible_subject_id_b929640653; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX idx_on_new_responsible_subject_id_b929640653 ON public.issues_system_responsible_subject_changes USING btree (new_responsible_subject_id); + + +-- +-- Name: idx_on_previous_responsible_subject_id_1816f9df1b; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX idx_on_previous_responsible_subject_id_1816f9df1b ON public.issues_system_responsible_subject_changes USING btree (previous_responsible_subject_id); + + -- -- Name: idx_on_responsible_subject_author_id_fe1507ef42; Type: INDEX; Schema: public; Owner: - -- @@ -3481,6 +3546,13 @@ CREATE UNIQUE INDEX index_issues_subtypes_on_legacy_id ON public.issues_subtypes CREATE INDEX index_issues_subtypes_on_subcategory_id ON public.issues_subtypes USING btree (subcategory_id); +-- +-- Name: index_issues_system_responsible_subject_changes_on_activity_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_issues_system_responsible_subject_changes_on_activity_id ON public.issues_system_responsible_subject_changes USING btree (activity_id); + + -- -- Name: index_issues_updates_on_activity_id; Type: INDEX; Schema: public; Owner: - -- @@ -4061,6 +4133,14 @@ ALTER TABLE ONLY public.issues_drafts ADD CONSTRAINT fk_rails_4a07ddfeff FOREIGN KEY (issue_id) REFERENCES public.issues(id); +-- +-- Name: issues_system_responsible_subject_changes fk_rails_4bf8e52711; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.issues_system_responsible_subject_changes + ADD CONSTRAINT fk_rails_4bf8e52711 FOREIGN KEY (previous_responsible_subject_id) REFERENCES public.responsible_subjects(id); + + -- -- Name: issues fk_rails_4e60020611; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -4141,6 +4221,14 @@ ALTER TABLE ONLY public.connector_users ADD CONSTRAINT fk_rails_5f56c261d9 FOREIGN KEY (connector_tenant_id) REFERENCES public.connector_tenants(id); +-- +-- Name: issues_system_responsible_subject_changes fk_rails_640fabb1c2; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.issues_system_responsible_subject_changes + ADD CONSTRAINT fk_rails_640fabb1c2 FOREIGN KEY (activity_id) REFERENCES public.issues_activities(id); + + -- -- Name: streets fk_rails_64249db34e; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -4301,6 +4389,14 @@ ALTER TABLE ONLY public.cms_pages ADD CONSTRAINT fk_rails_9e7d844076 FOREIGN KEY (category_id) REFERENCES public.cms_categories(id) ON DELETE CASCADE; +-- +-- Name: issues_system_responsible_subject_changes fk_rails_a18c2a245d; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.issues_system_responsible_subject_changes + ADD CONSTRAINT fk_rails_a18c2a245d FOREIGN KEY (new_responsible_subject_id) REFERENCES public.responsible_subjects(id); + + -- -- Name: legacy_agents fk_rails_a641dfc204; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -4524,11 +4620,13 @@ ALTER TABLE ONLY public.cms_categories SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES +('20260627093621'), ('20260524143000'), ('20260524134500'), ('20260524113000'), ('20260522170432'), ('20260522000002'), +('20260501141746'), ('20260424105720'), ('20260417220948'), ('20260328185530'), From a9b26b435ee4c93522ee3e1b10c45338cfcc1300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?=- Dobrý deň, Váš podnet <%= ops_issue_link @issue %>, ktorý ste pridali <%= @issue.created_at.strftime("%d.%m.%Y") %> na portál Odkaz pre starostu, bol odoslaný zodpovednému subjektu. + Dobrý deň, Váš podnet <%= ops_issue_link @issue %>, ktorý ste pridali <%= @issue.created_at.strftime("%d.%m.%Y") %> na portál Odkaz pre starostu, bol zverejnený a odoslaný zodpovedným pracovníkom a pracovníčkam samosprávy.
Ak v súčasnosti, alebo v budúcnosti budete mať doplňujúcu informáciu o aktuálnom stave alebo o riešení Vášho podnetu, môžete nám ju poskytnúť pridaním komentára k podnetu, ideálne aj s priložením fotografie aktuálneho stavu.
diff --git a/db/migrate/20260227123031_create_issues_responsible_subject_changes.rb b/db/migrate/20260227123031_create_issues_responsible_subject_changes.rb
index 61064e5e..435ef138 100644
--- a/db/migrate/20260227123031_create_issues_responsible_subject_changes.rb
+++ b/db/migrate/20260227123031_create_issues_responsible_subject_changes.rb
@@ -11,6 +11,7 @@ def change
t.integer :change_type, null: false
t.uuid :uuid, null: false
+ t.integer :triage_external_id
t.timestamps
end
diff --git a/db/structure.sql b/db/structure.sql
index 44c2ea00..f1c9ca40 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -940,6 +940,7 @@ CREATE TABLE public.issues_responsible_subject_changes (
hidden boolean DEFAULT false NOT NULL,
change_type integer NOT NULL,
uuid uuid NOT NULL,
+ triage_external_id integer,
created_at timestamp(6) without time zone NOT NULL,
updated_at timestamp(6) without time zone NOT NULL
);
From 239e6ae4164094efdf05f205e28de8d963a0b9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?=
- <% if @issue.author == @user %>
- Dobrý deň, status Vášho podnetu <%= ops_issue_link @issue %> bol zmenený na Čakajúci. Samospráva o probléme vie, no jeho riešenie aktuálne vyžaduje viac času.
- <% else %>
- Dobrý deň, status podnetu <%= ops_issue_link @issue %>, ktorý sledujete, bol zmenený na Čakajúci.
- <% end %>
- Dôvod zmeny stavu nájdete v <%= link_to "detaile podnetu", issue_url(@issue), class: "ops-email-link", target: "_blank" %>.
-
- <%= ops_button "Reagovať na nový status", "#{issue_url(@issue)}#new_issue_activity" %>
-
<% if @issue.author == @user %>
- Dobrý deň, samospráva začala aktívne pracovať na Vašom podnete <%= ops_issue_link @issue %>.
+ Dobrý deň, zodpovedný subjekt začal aktívne pracovať na Vašom podnete <%= ops_issue_link @issue %>.
<% else %>
- Dobrý deň, samospráva začala aktívne pracovať na podnete <%= ops_issue_link @issue %>, ktorý sledujete.
+ Dobrý deň, zodpovedný subjekt začal aktívne pracovať na podnete <%= ops_issue_link @issue %>, ktorý sledujete.
<% end %>
Detailné informácie o postupe prác nájdete v <%= link_to "detaile podnetu", issue_url(@issue), class: "ops-email-link", target: "_blank" %>.
Diskusia
+ Aktivita