From 2b3261641b17c497b182f0d5d21a633a6663dae4 Mon Sep 17 00:00:00 2001
From: JBinggi <juerg.binggeli@gmail.com>
Date: Sat, 7 Mar 2020 00:16:11 +0100
Subject: [PATCH] update add language

---
 composer.json                                |   2 +-
 config/module.config.php                     |   2 +-
 data/install.sql                             |   5 +
 language/de_DE.mo                            | Bin 0 -> 842 bytes
 language/de_DE.po                            |  48 +++++++++
 view/one-place/project/install/checkdb.phtml |  45 ++++-----
 view/one-place/project/project/index.phtml   |  37 ++++++-
 view/one-place/project/search/index.phtml    | 101 ++++++++++++-------
 8 files changed, 172 insertions(+), 68 deletions(-)
 create mode 100644 language/de_DE.mo
 create mode 100644 language/de_DE.po

diff --git a/composer.json b/composer.json
index 2a06e5c..e02c301 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "onePlace Project Module",
     "type": "oneplace-module",
     "license": "BSD-3-Clause",
-		"version": "1.0.4",
+    "version": "1.0.4",
     "keywords": [
         "laminas",
         "mvc",
diff --git a/config/module.config.php b/config/module.config.php
index 5f1898c..91768e9 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -86,7 +86,7 @@
                     'route' => '/project/search[/:action[/:id]]',
                     'constraints' => [
                         'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                        'id'     => '[0-9]+',
+                        'id'     => '[a-zA-Z0-9_-]+',
                     ],
                     'defaults' => [
                         'controller' => Controller\SearchController::class,
diff --git a/data/install.sql b/data/install.sql
index 5167e3c..e0977ea 100644
--- a/data/install.sql
+++ b/data/install.sql
@@ -71,4 +71,9 @@ INSERT INTO `user_xp_activity` (`Activity_ID`, `xp_key`, `label`, `xp_base`) VAL
 (NULL, 'project-edit', 'Edit Project', '5'),
 (NULL, 'project-export', 'Edit Project', '5');
 
+--
+-- module icon
+--
+INSERT INTO `settings` (`settings_key`, `settings_value`) VALUES ('project-icon', 'fas fa-sitemap');
+
 COMMIT;
\ No newline at end of file
diff --git a/language/de_DE.mo b/language/de_DE.mo
new file mode 100644
index 0000000000000000000000000000000000000000..834db0d1fe5a685781b39dbffe78bb96c29da9b3
GIT binary patch
literal 842
zcmYk3zityj5XKh>{|-<fLeNm`3!F(TieQw&N-iiO1}iZU9a`Uw?M=>m*3MoM=#Y2>
z5Dg`CRH^9GKtoT%6CfS|@y*#eGt%7eW^VSIx!GS!3-1-|2K*lUE&LYzH(YG_oKn}o
z6>t$;1FwJ`@H)6R%cr1dFt`N10WX8^K&k%-O8sZ>B6tFd-dFGk_zk=bemJkx9q<b%
zb*G@zeFx?H&sqEjyovZPD18<$O#9pgWqu7_0-K=JJp|FB%E=t^Pgmh$kf==N7h8af
zCXQ6I11f^cJgS{#y6cO5N<;PT=%|j@OAf`Dyh<_~>TGg6DSREW+O)2gVAUnhh0~sR
zQaHB#oYa~8jI4IeA=Prb!30v1+&D*>-l3cf*Jt9bEZ&2nEnG`S-DmL*9a@Rv4V*%1
z+i-|`-Z;)pD14Q1!_o{X?vWWI?re3ExyDLkIa)7VActeGCXfhp9PXpNb&qs9GM*`{
zJ@0MCtMfXMACQj|mlm0I!<Js{+koEFPA#3$%Z(&@5kDqJemY0DAX!?o(QG`3RNME-
z27Zl)CO<ID<kV9tiKlxw_%HpWblGeHNS}T}<lS_M2Z1zI>$l{gP;FF_1Ka^(tjf4>
lgzL#|I>N=x3eGr}<q1_4PRagDR_#8gqr7C+J@RAg)Iaad&@=!5

literal 0
HcmV?d00001

diff --git a/language/de_DE.po b/language/de_DE.po
new file mode 100644
index 0000000..4038ab7
--- /dev/null
+++ b/language/de_DE.po
@@ -0,0 +1,48 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de_DE\n"
+"X-Generator: Poedit 2.2.4\n"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Projects"
+msgstr "Projekte"
+
+msgid "Add Project"
+msgstr "Arbeitszeit erfassen"
+
+msgid "Add new Project"
+msgstr "Neues Projekt erfassen"
+
+msgid "Save Project"
+msgstr "Projekt speichern"
+
+msgid "Edit Project"
+msgstr "Projekt ändern"
+
+msgid "Export Projects"
+msgstr "Projekte exportieren"
+
+msgid "Find Projects"
+msgstr "Projekte finden"
+
+msgid "State"
+msgstr "Status"
+
+msgid "Customer"
+msgstr "Kunde"
+
+msgid "Person responsible"
+msgstr "Verantwortlicher"
+
+msgid "planned Release"
+msgstr "Abschluss Termin"
diff --git a/view/one-place/project/install/checkdb.phtml b/view/one-place/project/install/checkdb.phtml
index 65ef269..0c9de87 100644
--- a/view/one-place/project/install/checkdb.phtml
+++ b/view/one-place/project/install/checkdb.phtml
@@ -7,37 +7,34 @@
             <div class="card-body">
                 <form action="" method="POST">
                     <div class="form-group">
-                    <?php
-                    ?>
-                    <?php
-                    if($bTableExists) { ?>
-                        <div class="alert alert-success py-2 px-2">
-                            <?=$this->translate('Database is up-to-date')?>
-                        </div>
-                    <?php
-                    } else { ?>
-                        <div class="alert alert-warning py-2 px-2">
-                            <?=$this->translate('Database needs update. Please choose config')?>
-                        </div>
                         <?php
-                        if(file_exists('vendor/'.$sVendor.'/'.$sModule.'/data/structure_simple.sql')) {
-                            ?> <br/><input type="radio" name="plc_module_setup_config" value="simple" checked /> Simple
+                        ?>
+                        <?php
+                        if($bTableExists) { ?>
+                            <div class="alert alert-success py-2 px-2">
+                                <?=$this->translate('Database is up-to-date')?>
+                            </div>
                             <?php
-                        }
-                        if(file_exists('vendor/'.$sVendor.'/'.$sModule.'/data/structure_extended.sql')) {
-                            ?> <br/><input type="radio" name="plc_module_setup_config" value="extended" /> Simple
+                        } else { ?>
+                            <div class="alert alert-warning py-2 px-2">
+                                <?=$this->translate('Database needs update. Please choose config')?>
+                            </div>
                             <?php
+                            foreach(glob('vendor/'.$sVendor.'/'.$sModule.'/data/structure_*.sql') as $sConfig) {
+                                $sConfig = str_replace(['.sql'],[],explode('_',basename($sConfig))[1]); ?>
+                                <br/><input type="radio" name="plc_module_setup_config" value="<?=$sConfig?>" checked /> <?=$sConfig?>
+                                <?php
+                            }
                         }
-                    }
-                    ?>
+                        ?>
                     </div>
 
                     <?php if (! $bTableExists) { ?>
-                    <div class="form-group">
-                        <button type="submit" class="btn btn-primary">
-                            <?=$this->translate('Update Database')?>
-                        </button>
-                    </div>
+                        <div class="form-group">
+                            <button type="submit" class="btn btn-primary">
+                                <?=$this->translate('Update Database')?>
+                            </button>
+                        </div>
                     <?php } ?>
                 </form>
             </div>
diff --git a/view/one-place/project/project/index.phtml b/view/one-place/project/project/index.phtml
index 669e3fb..6b43b6b 100644
--- a/view/one-place/project/project/index.phtml
+++ b/view/one-place/project/project/index.phtml
@@ -1,11 +1,42 @@
+<?php
+use Application\Controller\CoreController;
+?>
 <div class="card">
     <div class="card-header">
-        <?= $this->partial('partial/indexheader',['sTitle'=>'Projects']) ?>
+        <div class="row">
+            <div class="col-md-10">
+                <?php
+                $sIcon = (array_key_exists('project-icon',CoreController::$aGlobalSettings))
+                    ?  CoreController::$aGlobalSettings['project-icon'] : '';
+                ?>
+                <?= $this->partial('partial/indexheader',['sTitle'=>'Project','sIcon' => $sIcon]) ?>
+            </div>
+            <div class="col-md-2 text-right">
+                <select class="form-control plc-index-load-saved-search">
+                    <option>-- <?=$this->translate('All')?> --</option>
+                    <?php
+                    if (count($aSavedSearches) > 0) {
+                        foreach($aSavedSearches as $oSearch) { ?>
+                            <option value="<?=$oSearch->Search_ID?>">
+                                <?=$oSearch->label?>
+                            </option>
+                            <?php
+                        }
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
     </div>
     <div class="card-body py-0">
-        <?= $this->partial('partial/indextable', ['sTableName'=>$sTableName,'aItems'=>$aItems]); ?>
+        <?= $this->partial('partial/indextable', [
+            'sTableName' => $sTableName,
+            'aItems' => $aItems,
+            'aFilters' => $aFilters,
+            'sRoute' => $sRoute
+        ]); ?>
     </div>
     <div class="card-footer">
-        <?= $this->partial('partial/indexpager', ['aItems'=>$aItems,'sRoute'=>(isset($sRoute)) ? $sRoute : explode('-',$sTableName)[0]]); ?>
+        <?= $this->partial('partial/indexpager', ['aItems'=>$aItems,'sRoute'=>$sRoute]); ?>
     </div>
 </div>
\ No newline at end of file
diff --git a/view/one-place/project/search/index.phtml b/view/one-place/project/search/index.phtml
index 4cf21ee..f8ec488 100644
--- a/view/one-place/project/search/index.phtml
+++ b/view/one-place/project/search/index.phtml
@@ -1,47 +1,70 @@
-<div class="row">
-    <div class="col-md-12">
-        <div class="card">
-            <div class="card-header">
-                <h2>Find Project</h2>
-            </div>
-            <?php if(isset($aResults)) { ?>
-
-            <?php } else { ?>
-            <form action="" method="post">
-                <div class="card-body">
-                    <?= $this->partial('partial/basictabs', ['sFormName'=>$this->sFormName]); ?>
-                    <?= $this->partial('partial/searchtabcontents', ['sFormName'=>$this->sFormName]); ?>
-                </div>
-                <div class="card-footer">
-                    <button class="btn btn-primary" type="submit">
-                        Start Search
-                    </button>
-                </div>
-            </form>
-            <?php } ?>
+<?php
+if(isset($sTableName)) {
+    $sRoute = (isset($sRoute)) ? $sRoute : explode('-',$sTableName)[0];
+    ?>
+    <div class="card">
+        <div class="card-header">
+            <?= $this->partial('partial/indexheader',['sTitle'=>'Project']) ?>
+        </div>
+        <div class="card-body py-0">
+            <?= $this->partial('partial/indextable', [
+                'sTableName' => $sTableName,
+                'aItems' => $aItems,
+                'aFilters' => $aFilters,
+                'sRoute' => $sRoute
+            ]); ?>
+        </div>
+        <div class="card-footer">
+            <?= $this->partial('partial/indexpager', ['aItems' => $aItems,'sRoute' => $sRoute]); ?>
         </div>
     </div>
-    <?php if(isset($aResults)) { ?>
+<?php } else { ?>
+    <div class="row">
         <div class="col-md-12">
             <div class="card">
                 <div class="card-header">
-                    <h2>Results</h2>
-                </div>
-                <div class="card-body">
-                    <ul class="list-group">
-                    <?php
-                    foreach($aResults as $oProject) { ?>
-                        <li class="list-group-item">
-                            <a href="<?=$this->url('project',['action'=>'view','id'=>$oProject->getID()])?>" title="<?=$this->translate('View Project')?>">
-                                <?=$oProject->getLabel();?>
-                            </a>
-                        </li>
-                    <?php
-                    }
-                    ?>
-                    </ul>
+                    <h2>Find Project</h2>
                 </div>
+                <?php if(isset($aResults)) { ?>
+
+                <?php } else { ?>
+                    <form action="" method="post">
+                        <div class="card-body">
+                            <?= $this->partial('partial/basictabs', ['sFormName'=>$this->sFormName]); ?>
+                            <?= $this->partial('partial/searchtabcontents', ['sFormName'=>$this->sFormName]); ?>
+                        </div>
+                        <div class="card-footer">
+                            <button class="btn btn-primary" type="submit">
+                                Start Search
+                            </button>
+                        </div>
+                    </form>
+                <?php } ?>
             </div>
         </div>
-    <?php } ?>
-</div>
+        <?php if(isset($aResults)) { ?>
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <h2>Results - <?=$aResults->getTotalItemCount()?></h2>
+                    </div>
+                    <div class="card-body">
+                        <ul class="list-group">
+                            <?php
+                            foreach($aResults as $oProject) { ?>
+                                <li class="list-group-item">
+                                    <a href="<?=$this->url('project',['action'=>'view','id'=>$oProject->getID()])?>" title="<?=$this->translate('View Project')?>">
+                                        <?=$oProject->getLabel();?>
+                                    </a>
+                                </li>
+                                <?php
+                            }
+                            ?>
+                        </ul>
+                        <?= $this->partial('partial/indexpager', ['aItems'=>$aResults,'sRoute'=>'project-search']); ?>
+                    </div>
+                </div>
+            </div>
+        <?php } ?>
+    </div>
+<?php } ?>