Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gredu_labs
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
itminedu
gredu_labs
Commits
3951a5c0
Commit
3951a5c0
authored
Oct 10, 2016
by
Aspasia Katsi
Committed by
Σταύρος Παπαδάκης
Oct 11, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated CSV exports for old and new applications
parent
23ea9a1f
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
209 additions
and
73 deletions
+209
-73
module/application_form/src/Action/ApplicationForm.php
module/application_form/src/Action/ApplicationForm.php
+0
-1
module/application_form/src/Middleware/SchoolApplicationForm.php
...application_form/src/Middleware/SchoolApplicationForm.php
+0
-2
module/csv_export/bootstrap.php
module/csv_export/bootstrap.php
+182
-60
module/open_data/templates/open_data/index.twig
module/open_data/templates/open_data/index.twig
+27
-10
No files found.
module/application_form/src/Action/ApplicationForm.php
View file @
3951a5c0
...
...
@@ -134,7 +134,6 @@ class ApplicationForm {
$items_version
=
array_values
(
$appForm
[
'items'
])[
0
][
'version'
];
}
$this
->
container
[
'logger'
]
->
info
(
"DO THE MIGRATION CHECK TO VERSION [
{
$this
->
version
}
] FROM VERSION [
{
$items_version
}
]"
);
if
(
$this
->
version
!=
$items_version
&&
isset
(
$appForm
[
'items'
])
&&
isset
(
$this
->
container
[
'settings'
][
'application_form'
][
'itemcategory'
][
'map'
])
&&
...
...
module/application_form/src/Middleware/SchoolApplicationForm.php
View file @
3951a5c0
...
...
@@ -53,8 +53,6 @@ class SchoolApplicationForm
$items_version
=
array_values
(
$appForm
[
'items'
])[
0
][
'version'
];
}
$this
->
container
[
'logger'
]
->
info
(
"DO THE MIGRATION CHECK TO VERSION [
{
$currentVersion
}
] FROM VERSION [
{
$items_version
}
]"
);
$appForm
[
'items'
]
=
array_reduce
(
$appForm
[
'items'
],
function
(
$aggr
,
$item
)
use
(
$currentVersion
,
$items_version
)
{
$category
=
$item
[
'itemcategory_id'
];
if
(
!
isset
(
$aggr
[
$category
]))
{
...
...
module/csv_export/bootstrap.php
View file @
3951a5c0
This diff is collapsed.
Click to expand it.
module/open_data/templates/open_data/index.twig
View file @
3951a5c0
...
...
@@ -12,7 +12,8 @@
<table
class=
"table"
>
<thead>
<tr>
<th
colspan=
"2"
>
Λίστα αρχείων
</th>
<th>
Δεδομένα
</th>
<th>
Μεταφόρτωση αρχείου
</th>
<tr>
</thead>
<tbody>
...
...
@@ -21,16 +22,16 @@
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'schools'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Μεταφόρτωση αρχείου
.csv
Αρχείο
.csv
</a>
</td>
</tr>
</tr>
<tr>
<td>
Χώροι μονάδων που καταγράφηκαν από τη δράση
</td>
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'labs'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Μεταφόρτωση αρχείου
.csv
Αρχείο
.csv
</a>
</td>
</tr>
...
...
@@ -39,7 +40,7 @@
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'assets'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Μεταφόρτωση αρχείου
.csv
Αρχείο
.csv
</a>
</td>
</tr>
...
...
@@ -48,7 +49,7 @@
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'software'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Μεταφόρτωση αρχείου
.csv
Αρχείο
.csv
</a>
</td>
</tr>
...
...
@@ -57,21 +58,35 @@
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'appforms'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Μεταφόρτωση αρχείου
.csv
Αρχείο
.csv
</a>
</td>
</tr>
<tr>
<tr>
<td>
Εξοπλισμός που αιτήθηκαν οι μονάδες
</td>
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'appforms_items'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Μεταφόρτωση αρχείου .csv
Αρχείο .csv
</a>
</td>
</tr>
<tr>
<td>
Νές αιτήσεις που συγκεντρώθηκαν από τις μονάδες
</td>
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'appnewforms'
}
)
}}
"
>
<i
class=
"fa fa-download"
></i>
Αρχείο .csv
</a>
</td>
</tr>
<tr>
<tr>
<td>
Εξοπλισμός που αιτήθηκαν οι μονάδες με τις νέες αιτήσεις
</td>
<td>
<a
href=
"
{{
path_for
(
'export.csv'
,
{
type
:
'newapplication'
}
)
}}
"
>
...
...
@@ -81,6 +96,8 @@
</td>
</tr>
</tbody>
<tfoot>
<tr><th
colspan=
"2"
></th><tr>
...
...
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