Skip to content

Commit

Permalink
Merge pull request #2 from mogic-le/master
Browse files Browse the repository at this point in the history
Many changes
  • Loading branch information
CybotTM authored Dec 24, 2021
2 parents 3849e89 + 714c8a6 commit 67e14c8
Show file tree
Hide file tree
Showing 31 changed files with 942 additions and 167 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.settings
.idea
/.settings
/.idea
/config.php
/README.html
/vendor
config.php
10 changes: 10 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,13 @@ Mood
Am Ende der Beschreibung ein ``#c``, ``#l``, oder ``#s`` (cool, so lala, sucks)
schreiben.
Dann wird die Zeile entsprechend eingefärbt.


Feiertage
=========
Aktualisierung der Feiertagsdatei:

#. Download der aktuellen .ics-Datei von
https://www.schulferien.org/deutschland/ical/ nach ``data/``
#. ``./scripts/import-ical.php``
#. ``data/`` committen
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"twig/twig": "1.*",
"pear/Image_Color2": "^0.5.1"
"pear/image_color2": "^0.5.1"
}
}
27 changes: 20 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 29 additions & 44 deletions config.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,32 @@
* @license http://www.gnu.org/licenses/agpl-3.0.html GNU AGPl 3
* @link http://www.netresearch.de
*/

namespace Netresearch\Timalytics;

/**
* Timalytics configuration
*
* @category Netresearch
* @package Timalytics
* @subpackage Config
* @author Various Artists <[email protected]>
* @license http://www.gnu.org/licenses/agpl-3.0.html GNU AGPl 3
* @link http://www.netresearch.de
*/
class Config_Dist
{
const DB_HOST = 'db';

const DB_PASS = 'timalytics';

const DB_USER = 'timalytics';

const DB_NAME = 'timalytics';

const TT_DB_HOST = 'localhost';

const TT_DB_PASS = '';

const TT_DB_USER = 'timetracker';

const TT_DB_NAME = 'timetracker';

static $arIpUser = array();

static $arInactiveUsers = array();

const URL_TIMETRACKER = 'https://github.com/netresearch/timetracker';

const URL_BOOTSTRAP_CSS = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css';
const URL_BOOTSTRAP_THEME = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css';
const URL_JQUERY_JS = 'https://code.jquery.com/jquery-2.2.4.min.js';
const URL_BOOTSTRAP_JS = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js';
const URL_MASONRY_JS = 'https://unpkg.com/[email protected]/dist/masonry.pkgd.min.js';
const URL_BUGTRACKER = 'https://bugs.nr/';
}
$GLOBALS['cfg']['DB_HOST'] = 'db';
$GLOBALS['cfg']['DB_PASS'] = 'timalytics';
$GLOBALS['cfg']['DB_USER'] = 'timalytics';
$GLOBALS['cfg']['DB_NAME'] = 'timalytics';

$GLOBALS['cfg']['TT_DB_HOST'] = 'localhost';
$GLOBALS['cfg']['TT_DB_PASS'] = '';
$GLOBALS['cfg']['TT_DB_USER'] = 'timetracker';
$GLOBALS['cfg']['TT_DB_NAME'] = 'timetracker';

$GLOBALS['cfg']['arAllowedUsers'] = array();
$GLOBALS['cfg']['arIpUser'] = array();
$GLOBALS['cfg']['arInactiveUsers'] = array();

$GLOBALS['cfg']['allowDelete'] = false;

$GLOBALS['cfg']['URL_TIMETRACKER'] = 'https://github.com/netresearch/timetracker';
$GLOBALS['cfg']['URL_BOOTSTRAP_CSS'] = 'css/bootstrap.min.css';
$GLOBALS['cfg']['URL_BOOTSTRAP_THEME'] = 'css/bootstrap-theme.min.css';
$GLOBALS['cfg']['URL_JQUERY_JS'] = 'js/jquery.min.js';
$GLOBALS['cfg']['URL_BOOTSTRAP_JS'] = 'js/bootstrap.min.js';
$GLOBALS['cfg']['URL_MASONRY_JS'] = 'js/masonry.pkgd.min.js';
$GLOBALS['cfg']['URL_BUGTRACKER'] = 'https://bugs.nr/';

// If timalytics is running in a subdirectory of the timetracker installation,
// then enable the following line to restrict analatics access to the user
// (and the team members if the user is a project leader PL):
//require __DIR__ . '/src/timetrackersessionuser.php';
?>
137 changes: 137 additions & 0 deletions data/Feiertage_Sachsen_2018.ics
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
BEGIN:VCALENDAR
VERSION:2.0
METHOD:PUBLISH
PRODID:-//schulferien.org//iCal Generator//DE
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Neujahr
DTSTART;VALUE=DATE:20180101
DTEND;VALUE=DATE:20180102
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:2. Weihnachtsfeiertag
DTSTART;VALUE=DATE:20181226
DTEND;VALUE=DATE:20181227
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Karfreitag
DTSTART;VALUE=DATE:20180330
DTEND;VALUE=DATE:20180331
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Ostermontag
DTSTART;VALUE=DATE:20180402
DTEND;VALUE=DATE:20180403
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Tag der Arbeit
DTSTART;VALUE=DATE:20180501
DTEND;VALUE=DATE:20180502
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Christi Himmelfahrt
DTSTART;VALUE=DATE:20180510
DTEND;VALUE=DATE:20180511
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Pfingstmontag
DTSTART;VALUE=DATE:20180521
DTEND;VALUE=DATE:20180522
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Tag der Deutschen Einheit
DTSTART;VALUE=DATE:20181003
DTEND;VALUE=DATE:20181004
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Reformationstag
DTSTART;VALUE=DATE:20181031
DTEND;VALUE=DATE:20181101
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:Buß- und Bettag
DTSTART;VALUE=DATE:20181121
DTEND;VALUE=DATE:20181122
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
CREATED:20180102T032002Z
LAST-MODIFIED:20180102T032002Z
DTSTAMP:20180102T032002Z
SUMMARY:1. Weihnachtsfeiertag
DTSTART;VALUE=DATE:20181225
DTEND;VALUE=DATE:20181226
URL:http://www.schulferien.org
DESCRIPTION:Alle Termine auf www.schulferien.org
TRANSP:TRANSPARENT
UID:[email protected]
END:VEVENT
END:VCALENDAR
Loading

0 comments on commit 67e14c8

Please sign in to comment.