Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config/module.config.php
#	src/Controller/InstallController.php
#	src/Module.php

.gitignore

@@ -0,0 +1,12 @@
+.vagrant/
+.idea/
+vendor/
+config/development.config.php
+public/themes/vuze
+public/themes/ablepro
+data/cache/*
+!data/cache/.gitkeep
+phpunit.xml
+composer.lock
+.phpunit.result.cache
+docs/html/

COPYRIGHT.md

@@ -0,0 +1,2 @@
+Copyright (c) 2019-2020, Verein onePlace
+All rights reserved. (https://1plc.ch/)

composer.json

@@ -9,7 +9,7 @@
     "mvc",
     "oneplace-module",
     "oneplace",
-    "skeleton",
+    "autoincrement",
     "framework"
   ],
   "require-dev": {

src/Controller/NumberController.php

@@ -40,7 +40,7 @@ class NumberController extends CoreEntityController {
      */
     public function __construct(AdapterInterface $oDbAdapter,ArticleTable $oTableGateway,$oServiceManager) {
         $this->oTableGateway = $oTableGateway;
-        $this->sSingleForm = 'worktime-single';
+        $this->sSingleForm = 'article-single';
         parent::__construct($oDbAdapter,$oTableGateway,$oServiceManager);
 
         if($oTableGateway) {

view/one-place/article/autoincrement/install/checkdb.phtml

@@ -0,0 +1,46 @@
+<div class="row">
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header">
+                <h2>Check for installation</h2>
+            </div>
+            <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(file_exists('vendor/'.$sVendor.'/'.$sModule.'/data/structure_extended.sql')) {
+                            ?> <br/><input type="radio" name="plc_module_setup_config" value="extended" /> Simple
+                            <?php
+                        }
+                    }
+                    ?>
+                    </div>
+
+                    <?php if (! $bTableExists) { ?>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-primary">
+                            <?=$this->translate('Update Database')?>
+                        </button>
+                    </div>
+                    <?php } ?>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>