Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
e-epal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Χάρης Παπαδόπουλος
e-epal
Commits
b17b1149
Commit
b17b1149
authored
Aug 07, 2017
by
Σταύρος Παπαδάκης
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add labels to csv exports; Fix NaN annoyance
parent
bb87322b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
7 deletions
+24
-7
source/components/minister/csv-creator.ts
source/components/minister/csv-creator.ts
+1
-1
source/components/minister/report-all-stat.ts
source/components/minister/report-all-stat.ts
+17
-5
source/components/minister/reports-schema.ts
source/components/minister/reports-schema.ts
+5
-0
source/containers/globalstyles.css
source/containers/globalstyles.css
+1
-1
No files found.
source/components/minister/csv-creator.ts
View file @
b17b1149
...
...
@@ -74,7 +74,7 @@ export class CsvCreator {
// Set utf-8 header to let excel recognize its encoding
let
blob
=
new
Blob
([
"
\
ufeff
"
,
encodedStr
],
{
type
:
"
text/csv
"
});
a
.
href
=
window
.
URL
.
createObjectURL
(
blob
);
a
.
download
=
(
this
.
settings
.
fileName
||
"
epalSystemReport
"
)
+
"
all_stat
"
+
"
.csv
"
;
a
.
download
=
(
this
.
settings
.
fileName
||
"
epalSystemReport
"
)
+
"
_
all_stat
"
+
"
.csv
"
;
a
.
click
();
});
}
...
...
source/components/minister/report-all-stat.ts
View file @
b17b1149
...
...
@@ -300,11 +300,13 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
route
=
"
/ministry/report-all-stat/
"
;
this
.
distribFinalized
=
1
;
this
.
settings
=
this
.
reportSchema
.
reportAllStatSchema
;
this
.
settings
.
fileName
=
"
e-ΕΠΑΛ Αριθμός Μαθητών και Πληρότητα σχολικών μονάδων ΕΠΑΛ
"
;
}
else
if
(
this
.
reportId
===
5
)
{
route
=
"
/ministry/report-all-stat/
"
;
this
.
distribFinalized
=
0
;
this
.
settings
=
this
.
reportSchema
.
reportAllStatSchema
;
this
.
settings
.
fileName
=
"
e-ΕΠΑΛ Ολιγομελή τμήματα - Προσωρινά τοποθετημένοι μαθητές
"
;
}
let
regSel
=
0
,
admSel
=
0
,
schSel
=
0
;
...
...
@@ -326,8 +328,9 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
if
(
this
.
userLoggedIn
===
PDE_ROLE
)
{
regSel
=
this
.
regionSelected
;
}
else
if
(
this
.
userLoggedIn
===
DIDE_ROLE
)
else
if
(
this
.
userLoggedIn
===
DIDE_ROLE
)
{
admSel
=
this
.
adminAreaSelected
;
}
this
.
generalReportSub
=
this
.
_hds
.
makeReport
(
this
.
minedu_userName
,
this
.
minedu_userPassword
,
route
,
regSel
,
admSel
,
schSel
,
clSel
,
secSel
,
courSel
,
this
.
distribFinalized
).
subscribe
(
data
=>
{
this
.
generalReport$
.
next
(
data
);
...
...
@@ -339,8 +342,17 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
this
.
data
[
i
].
percTotal
=
Number
(
data
[
i
].
percTotal
);
this
.
data
[
i
].
percA
=
Number
(
data
[
i
].
percA
);
if
(
Number
.
isNaN
(
this
.
data
[
i
].
percA
))
{
this
.
data
[
i
].
percA
=
"
-
"
;
}
this
.
data
[
i
].
percB
=
Number
(
data
[
i
].
percB
);
if
(
Number
.
isNaN
(
this
.
data
[
i
].
percB
))
{
this
.
data
[
i
].
percB
=
"
-
"
;
}
this
.
data
[
i
].
percC
=
Number
(
data
[
i
].
percC
);
if
(
Number
.
isNaN
(
this
.
data
[
i
].
percC
))
{
this
.
data
[
i
].
percC
=
"
-
"
;
}
}
this
.
validCreator
=
1
;
this
.
source
=
new
LocalDataSource
(
this
.
data
);
...
...
@@ -353,10 +365,10 @@ import { ReportsSchema, TableColumn } from "./reports-schema";
// this.prepareColumnMap();
this
.
csvObj
.
prepareColumnMap
();
},
error
=>
{
this
.
generalReport$
.
next
([{}]);
console
.
log
(
"
Error Getting generalReport
"
);
});
error
=>
{
this
.
generalReport$
.
next
([{}]);
console
.
log
(
"
Error Getting generalReport
"
);
});
}
navigateBack
()
{
...
...
source/components/minister/reports-schema.ts
View file @
b17b1149
...
...
@@ -12,6 +12,7 @@ export class ReportsSchema {
ReportUsersSchema
=
{
actions
:
false
,
fileName
:
"
e-ΕΠΑΛ Αριθμός Αιτήσεων - Εγγεγραμμένων Χρηστών
"
,
noDataMessage
:
"
Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης
"
,
columns
:
{
name
:
{
...
...
@@ -27,6 +28,7 @@ export class ReportsSchema {
genReportSchema
=
{
actions
:
false
,
fileName
:
"
e-ΕΠΑΛ Κατανομή Μαθητών με Βάση τη Σειρά Προτίμησης
"
,
noDataMessage
:
"
Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης
"
,
columns
:
{
name
:
{
...
...
@@ -42,6 +44,7 @@ export class ReportsSchema {
reportAllStatSchema
=
{
actions
:
false
,
fileName
:
"
e-ΕΠΑΛ Αναφορά
"
,
pager
:
{
display
:
true
,
perPage
:
10
...
...
@@ -88,6 +91,7 @@ export class ReportsSchema {
reportNoCapacity
=
{
actions
:
false
,
fileName
:
"
e-ΕΠΑΛ Σχολικές μονάδες που δεν έχουν δηλώσει Χωρητικότητα τμημάτων
"
,
pager
:
{
display
:
true
,
perPage
:
10
...
...
@@ -124,6 +128,7 @@ export class ReportsSchema {
reportCompletenessSchema
=
{
actions
:
false
,
fileName
:
"
e-ΕΠΑΛ Συνολική Πληρότητα σχολικών μονάδων ΕΠΑΛ ανά τάξη
"
,
noDataMessage
:
"
Δεν υπάρχουν δεδομένα που περιέχουν το κείμενο αναζήτησης
"
,
columns
:
{
name
:
{
...
...
source/containers/globalstyles.css
View file @
b17b1149
...
...
@@ -236,7 +236,7 @@ div.changecolorbalck {
.d3-chart
{
width
:
100%
;
/* height: 400px; */
height
:
550px
;
}
.d3-chart
.axis
path
,
.d3-chart
.axis
line
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment