Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
SMS Bereinigung/Responsive Anpassungen/Zeiterfassung

See merge request fronk/thetool!163
This commit is contained in:
Frank Schubert
2024-01-10 20:57:43 +00:00
parent 4d57759686 ff2e311666
commit ce756cb8a1
10 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Layout/default/TimerecordingCategories/Form.php
View File

@@ -76,7 +76,16 @@
<div class="col-lg-3">
<div class="form-check">
<input class="form-check-input" <?php if ($timerecordingcategoriess->require_comment) echo 'checked="checked"'; ?>
type="checkbox" name="require_comment" value="1" id="olt">
type="checkbox" name="require_comment" value="1">
</div>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="only_admin">Nur für Buchhaltung zu buchen</label>
<div class="col-lg-3">
<div class="form-check">
<input class="form-check-input" <?php if ($timerecordingcategoriess->only_admin) echo 'checked="checked"'; ?>
type="checkbox" name="only_admin" value="1">
</div>
</div>
</div>

5
Layout/default/TimerecordingCategories/Index.php
View File

@@ -41,6 +41,7 @@
<th class="text-center">Buchungszeitraum</th>
<th class="text-center">Genehmigungspflichtig</th>
<th class="text-center">Anmerkung Pflichtfeld</th>
<th class="text-center">Nur Buchhaltung</th>
<th class="edit-width"></th>
</tr>
<tr id="filterrow">
@@ -50,6 +51,7 @@
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
@@ -60,6 +62,7 @@
<td><?= $timerecordingcategorieshourday[$timerecordingcategories->hourday] ?></td>
<td><?= $timerecordingcategoriesapproval[$timerecordingcategories->approval] ?></td>
<td><?= $timerecordingcategoriesrequire_comment[$timerecordingcategories->require_comment] ?></td>
<td><?= $timerecordingcategoriesrequire_comment[$timerecordingcategories->only_admin] ?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?= self::getUrl("TimerecordingCategory", "edit", ["id" => $timerecordingcategories->id]) ?>"><i
class="far fa-edit" title="Bearbeiten"></i></a>
@@ -80,7 +83,7 @@
<script type="text/javascript">
var hidesearch = [5];
var hidesearch = [6];
$(document).ready(function () {

2
Layout/default/UserProfile/Form.php
View File

@@ -94,7 +94,7 @@ if ($twofa == 0) {
</div>
<?php if ($twofa == 2) : ?>
<div class="col-lg-4 ">
<span class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</span>
<div class="info-span alert alert-info"> Um die Mobilnummer zu ändern bitte 2FA auf Email umschalten.</div>
</div>
<?php endif; ?>
</div>

2
Layout/default/header.php
View File

@@ -57,7 +57,7 @@
<!-- End Navigation Bar-->
<div class="wrapper">
<div class="wrapper pl-0 pl-lg-1 pr-0 pr-lg-1 ">
<div class="container-fluid">
<?php if(isset($_flash_set) && $_flash_set == true): ?>

4
Layout/default/mfLogin/Index.php
View File

@@ -133,10 +133,10 @@ if ($requesttype == "2fa" || $requesttype == "false2fa") {
<?= $twoFactorInput ?>
<?= $error ?>
<div class="row">
<div class="col-8">
<div class="col-6 col-lg-8">
</div>
<!-- /.col -->
<div class="col-4">
<div class="col-6 col-lg-4">
<button type="submit" class="btn btn-primary btn-block">Einloggen</button>
</div>
<!-- /.col -->

4
application/TimerecordingCategory/TimerecordingCategoryController.php
View File

@@ -81,6 +81,7 @@ class TimerecordingCategoryController extends mfBaseController
$data['hourday'] = trim($r->hourday);
$data['approval'] = trim($r->approval);
$data['require_comment'] = trim($r->require_comment);
$data['only_admin'] = trim($r->only_admin);
if (!$data['name']) {
@@ -95,6 +96,9 @@ class TimerecordingCategoryController extends mfBaseController
if (!$data['require_comment']) {
$data['require_comment'] = 0;
}
if (!$data['only_admin']) {
$data['only_admin'] = 0;
}
// var_dump($_FILES);
// var_dump($upload);

1
application/TimerecordingCategory/TimerecordingCategoryModel.php
View File

@@ -7,6 +7,7 @@ class TimerecordingCategoryModel
private $hourday;
private $approval;
private $require_comment;
private $only_admin;
public static $hourday_definition = array(1 => "Uhrzeit (von/bis)", 2 => "Tage (von/bis)", 3 => "Startdatum", 4 => "Enddatum");
public static $approval_definition = array(0 => "Nein", 1 => "Ja");
public static $require_comment_definition = array(0 => "Nein", 1 => "Ja");

2
application/UserProfile/UserProfileController.php
View File

@@ -68,6 +68,7 @@ class UserProfileController extends mfBaseController
$id = $this->me->id;
$emailaddress = $this->me->email;
$mobile = str_replace('+', '', $this->me->mobile);
$mobile = str_replace(' ', '', $mobile);
$verification = $r->twofactor;
$User = new User($id);
@@ -207,6 +208,7 @@ class UserProfileController extends mfBaseController
$id = $this->me->id;
$emailaddress = $this->me->email;
$mobile = str_replace('+', '', $this->me->mobile);
$mobile = str_replace(' ', '', $mobile);
$verification = $r->twofactor;
$User = new User($id);

1
application/UserTwofactor/UserTwofactor.php
View File

@@ -61,6 +61,7 @@ class UserTwofactor
$User = new User($id);
$emailaddress = $User->email;
$mobile = str_replace('+', '', $User->mobile);
$mobile = str_replace(' ', '', $mobile);
$data = [];
$data['twofactorcode'] = $code;

32
db/migrations/20240109195730_timerecording_category_add_only_admin.php Normal file
View File

@@ -0,0 +1,32 @@
<?php
declare(strict_types=1);
use Phinx\Migration\AbstractMigration;
final class TimerecordingCategoryAddOnlyadmin extends AbstractMigration
{
public function up(): void
{
if ($this->getEnvironment() == "thetool") {
$timerecordingCategory = $this->table("TimerecordingCategory");
$timerecordingCategory->addColumn("only_admin", "integer", ["null" => false, "default" => "0", "after" => "require_comment"]);
$timerecordingCategory->update();
}
if ($this->getEnvironment() == "addressdb") {
}
}
public function down(): void
{
if ($this->getEnvironment() == "thetool") {
$timerecordingCategory = $this->table("TimerecordingCategory");
$timerecordingCategory->removeColumn("only_admin");
$timerecordingCategory->save();
}
if ($this->getEnvironment() == "addressdb") {
}
}
}