micord/ervu-business-metrics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets

Browse source 
* origin/develop:
  replace view_convert_info_sent_to_lk_epgu
  /
  micord.env
This commit is contained in:
Фоат Саляхов 2024-12-10 17:58:28 +03:00
commit 07083a0910
7 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
backend/src/main/resources/config/v_1.0/20241210-ERVU-edit_view_convert_info_sent_to_lk_epgu.xml Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
<changeSet id="0001" author="hairullin">
<comment>replace view_convert_info_sent_to_lk_epgu</comment>
<sql>
CREATE OR REPLACE VIEW metrics.view_convert_info_sent_to_lk_epgu
AS
SELECT convert_info_sent_to_lk_epgu.convert_info_sent_to_lk_epgu_id,
coalesce(round(convert_info_sent_to_lk_epgu.count_status_formed::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_status_formed,
coalesce(round(convert_info_sent_to_lk_epgu.count_status_not_formed::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_status_not_formed,
coalesce(round(convert_info_sent_to_lk_epgu.count_sended::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_sended,
coalesce(round(convert_info_sent_to_lk_epgu.count_delivered::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_delivered,
coalesce(round(convert_info_sent_to_lk_epgu.count_error::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_error,
coalesce(round(convert_info_sent_to_lk_epgu.count_viewed::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_viewed,
coalesce(round(convert_info_sent_to_lk_epgu.count_not_viewed::numeric * 100::numeric / NULLIF((convert_info_sent_to_lk_epgu.count_status_formed + convert_info_sent_to_lk_epgu.count_status_not_formed)::numeric,0)),0) AS percent_not_viewed
FROM metrics.convert_info_sent_to_lk_epgu;
ALTER TABLE metrics.view_convert_info_sent_to_lk_epgu
OWNER TO ervu_business_metrics;
</sql>
</changeSet>
</databaseChangeLog>

1
backend/src/main/resources/config/v_1.0/changelog-1.0.xml
View file

@ -9,5 +9,6 @@
<include file="20241125-ERVU-194_edit_view_criminal_administrative_liability.xml" relativeToChangelogFile="true"/>
<include file="20241126-ERVU-193_edit_tables.xml" relativeToChangelogFile="true"/>
<include file="20241203-ERVU-db_changes.xml" relativeToChangelogFile="true"/>
<include file="20241210-ERVU-edit_view_convert_info_sent_to_lk_epgu.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

2
config/micord.env
View file

@ -4,4 +4,4 @@ DB_APP_USERNAME=ervu_business_metrics
DB_APP_PASSWORD=ervu_business_metrics
DB_APP_HOST=10.10.31.119
DB_APP_PORT=5432
DB_APP_NAME=ervu_business_metrics
DB_APP_NAME=ervu-dashboard-copy

2
frontend/index.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Дашборд</title>
<title>Бизнес-метрики</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="src/resources/img/logo.png"/>

2
frontend/index.webpack.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Дашборд</title>
<title>Бизнес-метрики</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="src/resources/img/logo.png"/>

2
frontend/preview.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Дашборд</title>
<title>Бизнес-метрики</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="src/resources/img/logo.png"/>

1
frontend/src/resources/css/components-business-metrics.css
View file

@ -481,6 +481,7 @@
color: var(--color-text-primary);
font-size: var(--size-text-secondary);
line-height: normal;
max-width: 400px;
padding: var(--indent-small) var(--indent-base);
border: 1px solid var(--border);
border-radius: var(--indent-mini);