Merge pull request #20 from jweiland-net/addCategoryColumnToEmployee

Add category column to employee
jweiland-net · Jan 19, 2024 · 769da1f · 769da1f
2 parents 65a6fc6 + 0d9ed5b
commit 769da1f
Show file tree

Hide file tree

Showing 16 changed files with 126 additions and 79 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,25 +1,64 @@
 # EditorConfig is awesome: http://EditorConfig.org
-#
-# Use as master: https://github.com/TYPO3-Documentation/T3DocTeam/blob/master/.editorconfig
 
 # top-most EditorConfig file
 root = true
 
-[{*.rst,*.rst.txt}]
+# Unix-style newlines with a newline ending every file
+[*]
 charset = utf-8
 end_of_line = lf
+indent_style = space
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
-indent_style = space
+
+# TS/JS-Files
+[*.{ts,js,mjs}]
+indent_size = 2
+
+# JSON-Files
+[*.json]
+indent_style = tab
+
+# ReST-Files
+[*.{rst,rst.txt}]
 indent_size = 4
 max_line_length = 80
 
-# MD-Files
+# Markdown-Files
 [*.md]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-indent_style = space
-indent_size = 4
 max_line_length = 80
+
+# YAML-Files
+[*.{yaml,yml}]
+indent_size = 2
+
+# NEON-Files
+[*.neon]
+indent_size = 2
+indent_style = tab
+
+# stylelint
+[.stylelintrc]
+indent_size = 2
+
+# package.json
+[package.json]
+indent_size = 2
+
+# TypoScript
+[*.{typoscript,tsconfig}]
+indent_size = 2
+
+# XLF-Files
+[*.xlf]
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,7 @@
 /.github/ export-ignore
 /Build/ export-ignore
 /Tests/ export-ignore
+/.crowdin.yml export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
diff --git a/Documentation/AdministratorManual/Index.rst b/Documentation/AdministratorManual/Index.rst
@@ -1,15 +1,15 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _admin-manual:
+..  _admin-manual:
 
 ====================
 Administrator manual
 ====================
 
 This chapter describes how to manage the extension from a superuser point of view.
 
-.. toctree::
-   :maxdepth: 2
+..  toctree::
+    :maxdepth: 2
 
-   Upgrade/Index
+    Upgrade/Index
diff --git a/Documentation/AdministratorManual/Upgrade/Index.rst b/Documentation/AdministratorManual/Upgrade/Index.rst
@@ -1,7 +1,7 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _upgrade:
+..  _upgrade:
 
 =======
 Upgrade

diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -1,12 +1,17 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _changelog:
+..  _changelog:
 
 ==========
 Change log
 ==========
 
+Version 4.0.1
+=============
+
+*   Add module_sys_dmail_category to employee
+
 Version 4.0.0
 =============
 

diff --git a/Documentation/Configuration/Index.rst b/Documentation/Configuration/Index.rst
@@ -1,13 +1,13 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _configuration:
+..  _configuration:
 
 =============
 Configuration
 =============
 
-.. _custom_fluid_templates:
+..  _custom_fluid_templates:
 
 Use your own fluid templates
 ============================

diff --git a/Documentation/Includes.rst.txt b/Documentation/Includes.rst.txt
@@ -1,34 +1,34 @@
-.. More information about this file:
-https://docs.typo3.org/m/typo3/docs-how-to-document/main/en-us/GeneralConventions/FileStructure.html#includes-rst-txt
+..  More information about this file:
+    https://docs.typo3.org/m/typo3/docs-how-to-document/main/en-us/GeneralConventions/FileStructure.html#includes-rst-txt
 
-.. ----------
-.. text roles
-.. ----------
+..  ----------
+..  text roles
+..  ----------
 
-.. role:: aspect(emphasis)
-.. role:: bash(code)
-.. role:: html(code)
-.. role:: js(code)
-.. role:: php(code)
-.. role:: rst(code)
-.. role:: sep(strong)
-.. role:: sql(code)
+..  role:: aspect(emphasis)
+..  role:: bash(code)
+..  role:: html(code)
+..  role:: js(code)
+..  role:: php(code)
+..  role:: rst(code)
+..  role:: sep(strong)
+..  role:: sql(code)
 
-.. role:: tsconfig(code)
-   :class: typoscript
+..  role:: tsconfig(code)
+    :class: typoscript
 
-.. role:: typoscript(code)
-.. role:: xml(code)
-   :class: html
+..  role:: typoscript(code)
+..  role:: xml(code)
+    :class: html
 
-.. role:: yaml(code)
+..  role:: yaml(code)
 
-.. default-role:: code
+..  default-role:: code
 
-.. ---------
-.. highlight
-.. ---------
+..  ---------
+..  highlight
+..  ---------
 
-.. By default, code blocks use PHP syntax highlighting
+..  By default, code blocks use PHP syntax highlighting
 
-.. highlight:: php
+..  highlight:: php
diff --git a/Documentation/Index.rst b/Documentation/Index.rst
@@ -1,7 +1,7 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _start:
+..  _start:
 
 ==================
 Telephonedirectory

diff --git a/Documentation/Installation/Index.rst b/Documentation/Installation/Index.rst
@@ -1,7 +1,7 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _installation:
+..  _installation:
 
 ============
 Installation
@@ -15,32 +15,32 @@ Composer
 
 You can install `telephonedirectory` with following shell command:
 
-.. code-block:: bash
+..  code-block:: bash
 
-   composer req jweiland/telephonedirectory
+    composer req jweiland/telephonedirectory
 
 Extensionmanager
 ----------------
 
 If you want to install `telephonedirectory` traditionally with Extensionmanager,
 follow these steps:
 
-#. Visit ExtensionManager
+#.  Visit ExtensionManager
 
-#. Switch over to `Get Extensions`
+#.  Switch over to `Get Extensions`
 
-#. Search for `telephonedirectory`
+#.  Search for `telephonedirectory`
 
-#. Install extension
+#.  Install extension
 
 DEV Version (GIT)
 -----------------
 
 You can install the latest DEV Version with following GIT command:
 
-.. code-block:: bash
+..  code-block:: bash
 
-   git clone https://github.com/jweiland-net/telephonedirectory.git
+    git clone https://github.com/jweiland-net/telephonedirectory.git
 
 Scheduler Task
 ==============

diff --git a/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst
@@ -1,7 +1,7 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _introduction:
+..  _introduction:
 
 ============
 Introduction

diff --git a/Documentation/KnownProblems/Index.rst b/Documentation/KnownProblems/Index.rst
@@ -1,10 +1,11 @@
-.. include:: /Includes.rst.txt
+..  include:: /Includes.rst.txt
 
 
-.. _known-problems:
+..  _known-problems:
 
 ==============
 Known Problems
 ==============
 
-There are currently no known problems. If you have one please contact us via our `issue tracker <https://github.com/jweiland-net/telephonedirectory/issues>`_.
+There are currently no known problems. If you have one please contact us
+via our `issue tracker <https://github.com/jweiland-net/telephonedirectory/issues>`_.
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -4,15 +4,15 @@
 [general]
 
 project     = Telephonedirectory
-version     = 4.0.0
+version     = 4.0.1
 release     = 4.0
 copyright   = by jweiland.net
 
 [html_theme_options]
 
 # "Edit on GitHub" button
 github_repository    = jweiland-net/telephonedirectory
-github_branch        = master
+github_branch        = main
 
 # Footer links
 project_contact      = projects@jweiland.net

diff --git a/README.md b/README.md
@@ -1,6 +1,12 @@
 # TYPO3 Extension `telephonedirectory`
 
-![Build Status](https://github.com/jweiland-net/telephonedirectory/workflows/CI/badge.svg)
+[![Latest Stable Version](https://poser.pugx.org/jweiland/telephonedirectory/v/stable.svg)](https://packagist.org/packages/jweiland/telephonedirectory)
+[![TYPO3 10.4](https://img.shields.io/badge/TYPO3-10.4-green.svg)](https://get.typo3.org/version/10)
+[![TYPO3 11.5](https://img.shields.io/badge/TYPO3-11.5-green.svg)](https://get.typo3.org/version/11)
+[![License](http://poser.pugx.org/jweiland/telephonedirectory/license)](https://packagist.org/packages/jweiland/telephonedirectory)
+[![Total Downloads](https://poser.pugx.org/jweiland/telephonedirectory/downloads.svg)](https://packagist.org/packages/jweiland/telephonedirectory)
+[![Monthly Downloads](https://poser.pugx.org/jweiland/telephonedirectory/d/monthly)](https://packagist.org/packages/jweiland/telephonedirectory)
+![Build Status](https://github.com/jweiland-net/telephonedirectory/actions/workflows/ci.yml/badge.svg)
 
 With `telephonedirectory` you can organize your contact persons and buildings.
 

diff --git a/composer.json b/composer.json
@@ -10,11 +10,6 @@
 			"name": "Stefan Froemken",
 			"email": "sfroemken@jweiland.net",
 			"role": "Senior Lead Developer"
-		},
-		{
-			"name": "Markus Kugler",
-			"email": "mkugler@jweiland.net",
-			"role": "Lead Developer"
 		}
 	],
 	"support": {
@@ -27,14 +22,10 @@
 		"jweiland/maps2": ">=8.0.0"
 	},
 	"require-dev": {
-		"roave/security-advisories": "dev-latest",
 		"friendsofphp/php-cs-fixer": "^3.0",
 		"nimut/testing-framework": "^6.0",
 		"phpspec/prophecy-phpunit": "^2.0"
 	},
-	"replace": {
-		"typo3-ter/telephonedirectory": "self.version"
-	},
 	"autoload": {
 		"psr-4": {
 			"JWeiland\\Telephonedirectory\\": "Classes"
@@ -45,6 +36,9 @@
 			"JWeiland\\Telephonedirectory\\Tests\\": "Tests"
 		}
 	},
+	"replace": {
+		"typo3-ter/telephonedirectory": "self.version"
+	},
 	"config": {
 		"vendor-dir": ".build/vendor",
 		"allow-plugins": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -8,7 +8,7 @@
     'author_email' => 'projects@jweiland.net',
     'author_company' => 'jweiland.net',
     'state' => 'stable',
-    'version' => '4.0.0',
+    'version' => '4.0.1',
     'constraints' => [
         'depends' => [
             'typo3' => '10.4.33-11.5.99',

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -27,7 +27,8 @@ CREATE TABLE tx_telephonedirectory_domain_model_employee (
 	language_skill int(11) unsigned DEFAULT '0' NOT NULL,
 	pc_fax varchar(255) DEFAULT '' NOT NULL,
 	additional_informations text DEFAULT '' NOT NULL,
-	module_sys_dmail_html tinyint(4) unsigned DEFAULT '1' NOT NULL
+	module_sys_dmail_html tinyint(4) unsigned DEFAULT '1' NOT NULL,
+	module_sys_dmail_category int(10) unsigned DEFAULT '0' NOT NULL
 );
 
 #