From 0cc305302aa6a92556bc1db3f2b60c192732ce90 Mon Sep 17 00:00:00 2001 From: bilal Date: Mon, 15 Jun 2020 13:03:14 +0200 Subject: [PATCH 1/3] move notice to the top; change style --- app/views/task_requests/_form.html.erb | 10 +++++----- config/locales/en.yml | 1 + config/locales/es.yml | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/task_requests/_form.html.erb b/app/views/task_requests/_form.html.erb index 56e796f..19bedd6 100644 --- a/app/views/task_requests/_form.html.erb +++ b/app/views/task_requests/_form.html.erb @@ -1,6 +1,11 @@ <%= errors_summary_for task_request %> <%= bootstrap_form_with model: model, local: true do |form| %> +
+ <%= fa_icon "info-circle" %> + <%= t '.info_message' %> +
+ <%= form.text_area :description, label: t('.labels.description') %> <%= form.text_field :deadline, class: "datepicker-control", label: t('.labels.deadline') %> <%= form.text_field :time_allowed, label: t('.labels.time_allowed') %> @@ -24,11 +29,6 @@ data-placeholder="<%= dropzone_placeholder_message_for(task_request) %>" data-submit-button="#submit_folder"> <% end %> - -
- <%= fa_icon "info-circle" %> - After you submit this information you will immediately be connected with a BIG representative who will be able to collect any additional information needed, answer your questions, etc. -
<%= link_to t("shared.cancel"), [project, :task_requests], class: "col-3 text-reset" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 0af5c39..88f55e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -951,6 +951,7 @@ en: description: Please describe the task. files: Please attach any files related to this task time_allowed: How many hours would like spend on this task? + info_message: After submitting this task request, you'll be connected via chat with a BIG representative. index: actions: new: Create Task Request diff --git a/config/locales/es.yml b/config/locales/es.yml index 80514a6..29c4787 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -187,3 +187,5 @@ es: actions: manage: Manage (ES) open_deliverable: Open Deliverable (ES) + form: + info_message: After submitting this task request, you'll be connected via chat with a BIG representative. (ES) -- 2.47.3 From f1e662879daaf945b1d54064c72bdadab2d158c8 Mon Sep 17 00:00:00 2001 From: bilal Date: Fri, 19 Jun 2020 10:27:49 +0200 Subject: [PATCH 2/3] change text --- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 88f55e8..b5b5e02 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -951,7 +951,7 @@ en: description: Please describe the task. files: Please attach any files related to this task time_allowed: How many hours would like spend on this task? - info_message: After submitting this task request, you'll be connected via chat with a BIG representative. + info_message: After submitting this task request, you'll be connected via chat with a ME Suite representative. index: actions: new: Create Task Request diff --git a/config/locales/es.yml b/config/locales/es.yml index 29c4787..080e7bf 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -188,4 +188,4 @@ es: manage: Manage (ES) open_deliverable: Open Deliverable (ES) form: - info_message: After submitting this task request, you'll be connected via chat with a BIG representative. (ES) + info_message: After submitting this task request, you'll be connected via chat with a ME Suite representative. (ES) -- 2.47.3 From 7b319d424795fc04a6de2807fd59e7009d45dc6e Mon Sep 17 00:00:00 2001 From: bilal Date: Fri, 19 Jun 2020 10:30:10 +0200 Subject: [PATCH 3/3] update structure.sql --- db/structure.sql | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/db/structure.sql b/db/structure.sql index e1fe1e4..31bf054 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -43,14 +43,14 @@ COMMENT ON EXTENSION pg_trgm IS 'text similarity measurement and index searching CREATE FUNCTION public.pg_search_dmetaphone(text) RETURNS text LANGUAGE sql IMMUTABLE STRICT - AS $_$ - SELECT array_to_string(ARRAY(SELECT dmetaphone(unnest(regexp_split_to_array($1, E'\\s+')))), ' ') + AS $_$ + SELECT array_to_string(ARRAY(SELECT dmetaphone(unnest(regexp_split_to_array($1, E'\\s+')))), ' ') $_$; SET default_tablespace = ''; -SET default_table_access_method = heap; +SET default_with_oids = false; -- -- Name: account_auths; Type: TABLE; Schema: public; Owner: - @@ -615,15 +615,6 @@ CREATE SEQUENCE public.contract_templates_id_seq ALTER SEQUENCE public.contract_templates_id_seq OWNED BY public.contract_templates.id; --- --- Name: data_migrations; Type: TABLE; Schema: public; Owner: - --- - -CREATE TABLE public.data_migrations ( - version character varying NOT NULL -); - - -- -- Name: directories; Type: TABLE; Schema: public; Owner: - -- @@ -1181,6 +1172,7 @@ CREATE TABLE public.settings ( -- CREATE SEQUENCE public.settings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1216,6 +1208,7 @@ CREATE TABLE public.taggings ( -- CREATE SEQUENCE public.taggings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1246,6 +1239,7 @@ CREATE TABLE public.tags ( -- CREATE SEQUENCE public.tags_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1597,9 +1591,9 @@ CREATE TABLE public.zoom_meetings ( created_at timestamp(6) without time zone NOT NULL, updated_at timestamp(6) without time zone NOT NULL, broadcast_id bigint, - status integer DEFAULT 0, zoom_user_id bigint, - project_id bigint + project_id bigint, + status integer DEFAULT 0 ); @@ -2053,14 +2047,6 @@ ALTER TABLE ONLY public.contract_templates ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id); --- --- Name: data_migrations data_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: - --- - -ALTER TABLE ONLY public.data_migrations - ADD CONSTRAINT data_migrations_pkey PRIMARY KEY (version); - - -- -- Name: directories directories_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- -- 2.47.3