hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-04-14 19:22:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1190 from openclassify/dia

Browse Source 
#4601 Membership Resources Report
This commit is contained in:
profstyle1 2021-10-08 12:10:42 +03:00 committed by GitHub
commit 3925be1db1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 178 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/advs-module/resources/images/sort-arrow.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.com/svgjs" width="512" height="512" x="0" y="0" viewBox="0 0 64 64" style="enable-background:new 0 0 512 512" xml:space="preserve" class=""><g><g xmlns="http://www.w3.org/2000/svg" id="Layer_87" data-name="Layer 87"><path d="m60.94 42.17-28-22.67a1.5 1.5 0 0 0 -1.88 0l-28 22.67a1.47 1.47 0 0 0 -.47 1.66 1.49 1.49 0 0 0 1.41 1h56a1.49 1.49 0 0 0 1.41-1 1.47 1.47 0 0 0 -.47-1.66z" fill="#ffffff" data-original="#ffffff" style="" class=""></path></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 584 B

1
addons/default/visiosoft/advs-module/resources/js/admin/dashboard/report.js
View File

@ -48,6 +48,7 @@ $(document).ready( function () {
processing: true,
serverSide: true,
columns: [
{ data: 'id', orderable: false },
{
data: 'name',
render: function ( data, type, row, meta ) {

1
addons/default/visiosoft/advs-module/resources/lang/en/field.php
View File

@ -395,4 +395,5 @@ return [
'pages_without_meta_information_report' => 'Pages Without Meta Information Report',
'page' => 'Page',
'undefined_page' => 'Undefined Page',
'id' => 'ID',
];

117
addons/default/visiosoft/advs-module/resources/views/admin/dashboard/report.twig
View File

@ -1,66 +1,65 @@
<div class="row">
{% set reports = [
{
'title': trans('visiosoft.module.advs::field.product_stock_report'),
'id': 'stockReport',
'columns': [
trans('visiosoft.module.advs::field.product'),
trans('visiosoft.module.advs::field.stock.name'),
],
},
{
'title': trans('visiosoft.module.advs::field.active_passive_products_report'),
'id': 'activePassiveReport',
'columns': [
trans('visiosoft.module.advs::field.status.name'),
trans('visiosoft.module.advs::field.count'),
],
},
{
'title': trans('visiosoft.module.advs::field.unexplained_products_report'),
'id': 'unexplainedReport',
'columns': [
trans('visiosoft.module.advs::field.product'),
],
},
{
'title': trans('visiosoft.module.advs::field.non_image_products_report'),
'id': 'noImageReport',
'columns': [
trans('visiosoft.module.advs::field.product'),
],
},
{
'title': trans('visiosoft.module.advs::field.pages_without_meta_information_report'),
'id': 'metaPageReport',
'columns': [
trans('visiosoft.module.advs::field.page'),
],
},
] %}
{% set reports = [
{
'title': trans('visiosoft.module.advs::field.product_stock_report'),
'id': 'stockReport',
'columns': [
trans('visiosoft.module.advs::field.product'),
trans('visiosoft.module.advs::field.stock.name'),
],
},
{
'title': trans('visiosoft.module.advs::field.active_passive_products_report'),
'id': 'activePassiveReport',
'columns': [
trans('visiosoft.module.advs::field.status.name'),
trans('visiosoft.module.advs::field.count'),
],
},
{
'title': trans('visiosoft.module.advs::field.unexplained_products_report'),
'id': 'unexplainedReport',
'columns': [
trans('visiosoft.module.advs::field.id'),
trans('visiosoft.module.advs::field.product'),
],
},
{
'title': trans('visiosoft.module.advs::field.non_image_products_report'),
'id': 'noImageReport',
'columns': [
trans('visiosoft.module.advs::field.product'),
],
},
{
'title': trans('visiosoft.module.advs::field.pages_without_meta_information_report'),
'id': 'metaPageReport',
'columns': [
trans('visiosoft.module.advs::field.page'),
],
},
] %}
{% for report in reports %}
<div class="col-md-12">
<div class="card">
<div class="card-header bg-primary">
<h5 class="card-title text-white">{{ report.title }}</h5>
</div>
{% for report in reports %}
<div class="col-md-12">
<div class="card">
<div class="card-header bg-primary">
<h5 class="card-title text-white">{{ report.title }}</h5>
</div>
<div class="card-block">
<table id="{{ report.id }}" class="display">
<thead>
<tr>
{% for column in report.columns %}
<th>{{ column }}</th>
{% endfor %}
</tr>
</thead>
</table>
</div>
<div class="card-block">
<table id="{{ report.id }}" class="display">
<thead>
<tr>
{% for column in report.columns %}
<th>{{ column }}</th>
{% endfor %}
</tr>
</thead>
</table>
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
<script>
const productsReportTrans = {

2
addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
View File

@ -46,7 +46,7 @@
{% endif %}
<div class="action-data d-flex align-items-center text-truncate">
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context})|raw }}
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }}
</div>
</td>

1
addons/default/visiosoft/cats-module/resources/js/admin/dashboard/report.js
View File

@ -12,6 +12,7 @@ $(document).ready( function () {
processing: true,
serverSide: true,
columns: [
{ data: 'id', orderable: false },
{
data: 'name',
render: function ( data, type, row, meta ) {

1
addons/default/visiosoft/cats-module/resources/lang/en/field.php
View File

@ -43,4 +43,5 @@ return [
'undefined_category' => 'Undefined Category',
'categories_with_no_meta_report' => 'Categories with No Meta Report',
'category' => 'Category',
'id' => 'ID',
];

57
addons/default/visiosoft/cats-module/resources/views/admin/dashboard/report.twig
View File

@ -1,36 +1,35 @@
<div class="row">
{% set reports = [
{
'title': trans('visiosoft.module.cats::field.categories_with_no_meta_report'),
'id': 'metaCategoryReport',
'columns': [
trans('visiosoft.module.cats::field.category'),
],
},
] %}
{% set reports = [
{
'title': trans('visiosoft.module.cats::field.categories_with_no_meta_report'),
'id': 'metaCategoryReport',
'columns': [
trans('visiosoft.module.cats::field.category'),
trans('visiosoft.module.cats::field.id'),
],
},
] %}
{% for report in reports %}
<div class="col-md-12">
<div class="card">
<div class="card-header bg-danger">
<h5 class="card-title text-white">{{ report.title }}</h5>
</div>
{% for report in reports %}
<div class="col-md-12">
<div class="card">
<div class="card-header bg-danger">
<h5 class="card-title text-white">{{ report.title }}</h5>
</div>
<div class="card-block">
<table id="{{ report.id }}" class="display">
<thead>
<tr>
{% for column in report.columns %}
<th>{{ column }}</th>
{% endfor %}
</tr>
</thead>
</table>
</div>
<div class="card-block">
<table id="{{ report.id }}" class="display">
<thead>
<tr>
{% for column in report.columns %}
<th>{{ column }}</th>
{% endfor %}
</tr>
</thead>
</table>
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
<script>
const categoryReportTrans = {

39
addons/default/visiosoft/profile-module/migrations/2021_10_07_090830_visiosoft.module.profile__create_utm_source_field.php Normal file
View File

@ -0,0 +1,39 @@
<?php
use Anomaly\Streams\Platform\Database\Migration\Migration;
class VisiosoftModuleProfileCreateUtmSourceField extends Migration
{
public function up()
{
if (!$this->fields()->findBySlugAndNamespace('utm_source', 'users')) {
$field = $this->fields()
->create(
[
'slug' => 'utm_source',
'namespace' => 'users',
'type' => 'anomaly.field_type.text',
'name' => 'visiosoft.module.profile::field.utm_source.name',
'locked' => false,
]
);
$stream = $this->streams()->findBySlugAndNamespace('users', 'users');
$this->assignments()
->create(
[
'field' => $field,
'stream' => $stream,
]
);
}
}
public function down()
{
if ($field = $this->fields()->findBySlugAndNamespace('utm_source', 'users')) {
$field->delete();
}
}
}

74
addons/default/visiosoft/profile-module/resources/views/admin/dashboard/report.twig
View File

@ -1,45 +1,43 @@
<div class="row">
{% set reports = [
{
'title': trans('visiosoft.module.profile::field.new_membership_report'),
'id': 'newMemberReport',
'columns': [
trans('visiosoft.module.profile::field.member'),
trans('visiosoft.module.profile::field.registered_at'),
],
},
{
'title': trans('visiosoft.module.profile::field.member_login_reports'),
'id': 'loginMemberReport',
'columns': [
trans('visiosoft.module.profile::field.member'),
trans('visiosoft.module.profile::field.login_at'),
],
},
] %}
{% set reports = [
{
'title': trans('visiosoft.module.profile::field.new_membership_report'),
'id': 'newMemberReport',
'columns': [
trans('visiosoft.module.profile::field.member'),
trans('visiosoft.module.profile::field.registered_at'),
],
},
{
'title': trans('visiosoft.module.profile::field.member_login_reports'),
'id': 'loginMemberReport',
'columns': [
trans('visiosoft.module.profile::field.member'),
trans('visiosoft.module.profile::field.login_at'),
],
},
] %}
{% for report in reports %}
<div class="col-md-12">
<div class="card">
<div class="card-header bg-warning">
<h5 class="card-title text-white">{{ report.title }}</h5>
</div>
{% for report in reports %}
<div class="col-md-12">
<div class="card">
<div class="card-header bg-warning">
<h5 class="card-title text-white">{{ report.title }}</h5>
</div>
<div class="card-block">
<table id="{{ report.id }}" class="display">
<thead>
<tr>
{% for column in report.columns %}
<th>{{ column }}</th>
{% endfor %}
</tr>
</thead>
</table>
</div>
<div class="card-block">
<table id="{{ report.id }}" class="display">
<thead>
<tr>
{% for column in report.columns %}
<th>{{ column }}</th>
{% endfor %}
</tr>
</thead>
</table>
</div>
</div>
{% endfor %}
</div>
</div>
{% endfor %}
<script>
const usersReportTrans = {

5
addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
View File

@ -40,6 +40,11 @@ class Register2FormHandler
$fields = $builder->getPostData();
$fields['display_name'] = $fields['first_name'] . " " . $fields['last_name'];
$fields['gsm_phone'] = $builder->getPostValue('phone');
if (isset($_COOKIE['utm_source'])) {
$fields['utm_source'] = $_COOKIE['utm_source'];
}
unset(
$fields['phone'],
$fields['accept_protection_law'],

7
addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php
View File

@ -153,7 +153,12 @@ class UsersFieldsSeeder extends Seeder
'name' => 'visiosoft.module.profile::field.google_address.name',
'slug' => 'google_address',
'type' => 'anomaly.field_type.text',
]
],
[
'name' => 'visiosoft.module.profile::field.utm_source.name',
'slug' => 'utm_source',
'type' => 'anomaly.field_type.text',
],
];
foreach ($customFields as $customField) {