Skip to content

Commit

Permalink
Dia Hora Minut
Browse files Browse the repository at this point in the history
  • Loading branch information
Juanjo Ortilles committed May 24, 2023
1 parent c2479e2 commit 1b9a7ef
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 6 deletions.
6 changes: 6 additions & 0 deletions eda/eda_api/lib/services/query-builder/qb-systems/bigquery-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@ export class BigQueryBuilderService extends QueryBuilderService {
} else if (_.isEqual(el.format, 'day')) {
columns.push(`FORMAT_DATETIME( '%Y-%m-%d',\`${el.table_id}\`.\`${el.column_name}\`) as \`${el.display_name}\``);

}else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`FORMAT_DATETIME( '%Y-%m-%d %H',\`${el.table_id}\`.\`${el.column_name}\`) as \`${el.display_name}\``);

}else if (_.isEqual(el.format, 'day_hour_minute')) {
columns.push(`FORMAT_DATETIME( '%Y-%m-%d %H:%i',\`${el.table_id}\`.\`${el.column_name}\`) as \`${el.display_name}\``);

}else if (_.isEqual(el.format, 'timestamp')) {
columns.push(`FORMAT_DATETIME( '%Y-%m-%d %H:%i:%s',\`${el.table_id}\`.\`${el.column_name}\`) as \`${el.display_name}\``);

Expand Down
14 changes: 13 additions & 1 deletion eda/eda_api/lib/services/query-builder/qb-systems/mySql-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,16 @@ export class MySqlBuilderService extends QueryBuilderService {
} else if (_.isEqual(el.format, 'week_day')) {
columns.push(`WEEKDAY(\`${el.table_id}\`.\`${el.column_name}\`) + 1 as \`${el.display_name}\``);

}else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d %H') as \`${el.display_name}\``);

}else if (_.isEqual(el.format, 'day_hour_minute')) {
columns.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d %H:%i') as \`${el.display_name}\``);

}else if (_.isEqual(el.format, 'timestamp')) {
columns.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d %H:%i:%s') as \`${el.display_name}\``);

} else {
} else {
columns.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d') as \`${el.display_name}\``);
}
} else {
Expand Down Expand Up @@ -300,6 +306,12 @@ export class MySqlBuilderService extends QueryBuilderService {
} else if (_.isEqual(el.format, 'day')) {
grouping.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d')`);

}else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d %H') `);

}else if (_.isEqual(el.format, 'day_hour_minute')) {
grouping.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d %H:%i') `);

}else if (_.isEqual(el.format, 'timestamp')) {
grouping.push(`DATE_FORMAT(\`${el.table_id}\`.\`${el.column_name}\`, '%Y-%m-%d %H:%i:%s')`);

Expand Down
10 changes: 9 additions & 1 deletion eda/eda_api/lib/services/query-builder/qb-systems/oracle-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,13 @@ export class OracleBuilderService extends QueryBuilderService {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'D') as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD') as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH24') as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'day_hour_minute')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH24:MI') as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'timestamp')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH24:MI:SS') as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'No')) {
} else if (_.isEqual(el.format, 'No')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD') as "${el.display_name}"`);
}
} else {
Expand All @@ -273,6 +277,10 @@ export class OracleBuilderService extends QueryBuilderService {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'D')`);
} else if (_.isEqual(el.format, 'day')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD')`);
}else if (_.isEqual(el.format, 'day_hour')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH24') `);
}else if (_.isEqual(el.format, 'day_hour_minute')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH24:MI') `);
} else if (_.isEqual(el.format, 'timestamp')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH24:MI:SS')`);
} else if (_.isEqual(el.format, 'No')) {
Expand Down
9 changes: 8 additions & 1 deletion eda/eda_api/lib/services/query-builder/qb-systems/pg-builder-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ export class PgBuilderService extends QueryBuilderService {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'IYYY-IW') as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD') as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH') as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'day_hour_minute')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH:MI') as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'timestamp')) {
columns.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH:MI:SS') as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'week_day')) {
Expand Down Expand Up @@ -283,7 +287,10 @@ export class PgBuilderService extends QueryBuilderService {
}
else if (_.isEqual(el.format, 'day')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD')`);

}else if (_.isEqual(el.format, 'day_hour')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH') `);
}else if (_.isEqual(el.format, 'day_hour_minute')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH:MI') `);
}else if (_.isEqual(el.format, 'timestamp')) {
grouping.push(`to_char("${el.table_id}"."${el.column_name}", 'YYYY-MM-DD HH:MI:SS')`);

Expand Down
12 changes: 10 additions & 2 deletions eda/eda_api/lib/services/query-builder/qb-systems/snowflake-builder.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ export class SnowFlakeBuilderService extends QueryBuilderService {
columns.push(`DAYOFWEEKISO(CAST("${el.table_id}"."${el.column_name}" AS DATE) ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day')) {
columns.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'timestamp')) {
} else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH24' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day_hour_minute')) {
columns.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH24:MI' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'timestamp')) {
columns.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH24:MI:SS' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'No')) {
columns.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd' ) as "${el.display_name}"`);
Expand All @@ -273,7 +277,11 @@ export class SnowFlakeBuilderService extends QueryBuilderService {
grouping.push(`DAYOFWEEKISO(CAST("${el.table_id}"."${el.column_name}" AS DATE))`);
} else if (_.isEqual(el.format, 'day')) {
grouping.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd' )`);
} else if (_.isEqual(el.format, 'timestamp')) {
} else if (_.isEqual(el.format, 'day_hour')) {
grouping.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH24' ) `);
} else if (_.isEqual(el.format, 'day_hour_minute')) {
grouping.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH24:MI' ) `);
}else if (_.isEqual(el.format, 'timestamp')) {
grouping.push(`TO_CHAR(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH24:MI:SS' )`);
} else if (_.isEqual(el.format, 'No')) {
grouping.push(`"${el.table_id}"."${el.column_name}"`);
Expand Down
10 changes: 9 additions & 1 deletion eda/eda_api/lib/services/query-builder/qb-systems/sqlserver-builder-service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ export class SQLserviceBuilderService extends QueryBuilderService {
columns.push(`DATEPART(weekday, CAST("${el.table_id}"."${el.column_name}" AS DATE) ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day')) {
columns.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day_hour')) {
columns.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'day_hour_minute')) {
columns.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH:mm' ) as "${el.display_name}"`);
} else if (_.isEqual(el.format, 'timestamp')) {
columns.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH:mm:ss' ) as "${el.display_name}"`);
}else if (_.isEqual(el.format, 'No')) {
Expand All @@ -274,7 +278,11 @@ export class SQLserviceBuilderService extends QueryBuilderService {
grouping.push(`DATEPART(weekday, CAST("${el.table_id}"."${el.column_name}" AS DATE))`);
} else if (_.isEqual(el.format, 'day')) {
grouping.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd' )`);
}else if (_.isEqual(el.format, 'timestamp')) {
} else if (_.isEqual(el.format, 'day_hour')) {
grouping.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH' ) `);
} else if (_.isEqual(el.format, 'day_hour_minute')) {
grouping.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH:mm' ) `);
} else if (_.isEqual(el.format, 'timestamp')) {
grouping.push(`FORMAT(CAST("${el.table_id}"."${el.column_name}" AS DATE), 'yyyy-MM-dd HH:mm:ss' )`);
} else if (_.isEqual(el.format, 'No')) {
grouping.push(`"${el.table_id}"."${el.column_name}"`);
Expand Down
2 changes: 2 additions & 0 deletions eda/eda_app/src/app/services/utils/chart-utils.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ export class ChartUtilsService {
{ display_name: $localize`:@@dates5:SEMANA`, value: 'week', selected: false },
{ display_name: $localize`:@@dates3:DIA`, value: 'day', selected: false },
{ display_name: $localize`:@@dates6:DIA DE LA SEMANA`, value: 'week_day', selected: false },
{ display_name: $localize`:@@dates8:DIA HORA`, value: 'day_hour', selected: false },
{ display_name: $localize`:@@dates9:DIA HORA MINUTO`, value: 'day_hour_minute', selected: false },
{ display_name: $localize`:@@dates7:FECHA COMPLETA`, value: 'timestamp', selected: false },
{ display_name: $localize`:@@dates4:NO`, value: 'No', selected: false }
];
Expand Down
9 changes: 9 additions & 0 deletions eda/eda_app/src/locale/messages.ca.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2018,6 +2018,15 @@ Entrar<x id="CLOSE_BOLD_TEXT" ctype="x-b" equiv-text="&lt;/b&gt;"/>
<source>FECHA COMPLETA</source>
<target>DATA COMPLETA</target>
</trans-unit>
<trans-unit id="dates8">
<source>DIA HORA</source>
<target>DIA HORA</target>
</trans-unit>
<trans-unit id="dates9">
<source>DIA HORA MINUTO</source>
<target>DIA HORA MINUT</target>
</trans-unit>

<trans-unit id="ChartProps">
<source>PROPIEDADES DEL gráfico</source>
<target>PROPIETATS DEL GRÀFIC</target>
Expand Down
8 changes: 8 additions & 0 deletions eda/eda_app/src/locale/messages.en.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2016,6 +2016,14 @@ Login<x id="CLOSE_BOLD_TEXT" ctype="x-b" equiv-text="&lt;/b&gt;"/>
<source>FECHA COMPLETA</source>
<target>TIMESTAMP</target>
</trans-unit>
<trans-unit id="dates8">
<source>DIA HORA</source>
<target>DAY HOUR</target>
</trans-unit>
<trans-unit id="dates9">
<source>DIA HORA MINUTO</source>
<target>DAY HOUR MINUTE</target>
</trans-unit>

<trans-unit id="ChartProps">
<source>PROPIEDADES DEL gráfico</source>
Expand Down
8 changes: 8 additions & 0 deletions eda/eda_app/src/locale/messages.pl.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2002,6 +2002,14 @@ Login<x id="CLOSE_BOLD_TEXT" ctype="x-b" equiv-text="&lt;/b&gt;"/>
<target>TIMESTAMP</target>
</trans-unit>

<trans-unit id="dates8">
<source>DIA HORA</source>
<target>DIA HORA</target>
</trans-unit>
<trans-unit id="dates9">
<source>DIA HORA MINUTO</source>
<target>DAY HOUR MINUTE</target>
</trans-unit>
<trans-unit id="ChartProps">
<source>PROPIEDADES DEL gráfico</source>
<target>CHART PROPERTIES</target>
Expand Down

0 comments on commit 1b9a7ef

Please sign in to comment.