blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

* changed some { to [ for PHP 7.4 compatibility

Browse Source 
* added some PrimeVUE 3 components to composer (currently used in organization chart of PV21 extension)
This commit is contained in:
Werner Masik
2022-07-06 10:37:10 +02:00
parent 74b0fc5662
commit 6c618c9a20
4 changed files with 146 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/person/Person_model.php
+1 -1
View File
@@ -82,7 +82,7 @@ class Person_model extends DB_Model
}
else
{
$person['svnr'] = $person['svnr'] . 'v' . ($result->retval[0]->svnr{11} + 1);
$person['svnr'] = $person['svnr'] . 'v' . ($result->retval[0]->svnr[11] + 1);
}
}
}
composer.json
+78 -5
View File
@@ -163,7 +163,7 @@
{
"type": "package",
"package": {
"name": "json-forms",
"name": "brutusin/json-forms",
"version": "1.4.0",
"dist": {
"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
@@ -174,7 +174,7 @@
{
"type": "package",
"package": {
"name": "jsoneditor",
"name": "josdejong/jsoneditor",
"version": "5.5.6",
"dist": {
"url": "https://github.com/josdejong/jsoneditor/archive/v5.5.6.zip",
@@ -336,6 +336,72 @@
"type": "file"
}
}
},
{
"type": "package",
"package": {
"name": "primevue3/core",
"version": "3.15.1",
"dist": {
"url": "https://unpkg.com/primevue@^3/core/core.min.js",
"type": "file"
}
}
},
{
"type": "package",
"package": {
"name": "primevue3/organizationchart",
"version": "3.15.1",
"dist": {
"url": "https://unpkg.com/primevue@^3/organizationchart/organizationchart.min.js",
"type": "file"
}
}
},
{
"type": "package",
"package": {
"name": "primevue3/treetable",
"version": "3.15.1",
"dist": {
"url": "https://unpkg.com/primevue@^3/treetable/treetable.min.js",
"type": "file"
}
}
},
{
"type": "package",
"package": {
"name": "primevue3/column",
"version": "3.15.1",
"dist": {
"url": "https://unpkg.com/primevue@^3/column/column.min.js",
"type": "file"
}
}
},
{
"type": "package",
"package": {
"name": "primevue3/calendar",
"version": "3.15.1",
"dist": {
"url": "https://unpkg.com/primevue@^3/calendar/calendar.min.js",
"type": "file"
}
}
},
{
"type": "package",
"package": {
"name": "primevue3/skeleton",
"version": "3.15.1",
"dist": {
"url": "https://unpkg.com/primevue@^3/skeleton/skeleton.min.js",
"type": "file"
}
}
}
],
"require": {
@@ -370,8 +436,8 @@
"jquery/jquery2": "2.*",
"jquery/sizzle": "1.0.*",
"jquery-archive/jquery-metadata": "1.0.*",
"json-forms": "1.4.0",
"jsoneditor": "5.5.6",
"brutusin/json-forms": "1.4.0",
"josdejong/jsoneditor": "5.5.6",
"kingsquare/json-schema-form": "*",
@@ -402,7 +468,14 @@
"twbs/bootstrap3": "3.4.*",
"twbs/bootstrap5": "5.1.*",
"vuejs/vuejs3": "3.2.33"
"vuejs/vuejs3": "3.2.33",
"primevue3/core": "3.1.15",
"primevue3/organizationchart": "3.1.15",
"primevue3/treetable": "3.1.15",
"primevue3/column": "3.1.15",
"primevue3/calendar": "3.1.15",
"primevue3/skeleton": "3.1.15"
},
"config": {
"bin-dir": "vendor/bin"
composer.lock
Generated
+66
View File
@@ -1743,6 +1743,72 @@
"shasum": null
},
"type": "library"
},
{
"name": "primevue3/core",
"version": "3.1.15",
"dist": {
"type": "file",
"url": "https://unpkg.com/primevue@^3/core/core.min.js",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "primevue3/organizationchart",
"version": "3.1.15",
"dist": {
"type": "file",
"url": "https://unpkg.com/primevue@^3/organizationchart/organizationchart.min.js",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "primevue3/treetable",
"version": "3.1.15",
"dist": {
"type": "file",
"url": "https://unpkg.com/primevue@^3/treetable/treetable.min.js",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "primevue3/column",
"version": "3.1.15",
"dist": {
"type": "file",
"url": "https://unpkg.com/primevue@^3/column/column.min.js",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "primevue3/calendar",
"version": "3.1.15",
"dist": {
"type": "file",
"url": "https://unpkg.com/primevue@^3/calendar/calendar.min.js",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "primevue3/skeleton",
"version": "3.1.15",
"dist": {
"type": "file",
"url": "https://unpkg.com/primevue@^3/skeleton/skeleton.min.js",
"reference": null,
"shasum": null
},
"type": "library"
}
],
"packages-dev": [
include/person.class.php
+1 -1
View File
@@ -284,7 +284,7 @@ class person extends basis_db
//Quersumme bilden
for ($i = 0; $i < 10; $i++)
{
$erg += $gewichtung[$i] * $this->svnr{$i};
$erg += $gewichtung[$i] * $this->svnr[$i];
}
if ($this->svnr[3] != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11