extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-02 12:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,790 Commits 32 Branches 356 Tags 197 MiB
800216aa44
Commit Graph

725 Commits

Author SHA1 Message Date
Ralf Becker
383a6350f5 fix PHP 8.0 Error: Undefined constant "TIMESHEET_APP" 2021-11-15 17:49:43 +01:00
nathan
9e2bb05ded Placeholders list common UI 
Should reduce maintenance by using a common UI to show placeholders based on the placeholder list
 2021-10-12 14:18:18 -06:00
Ralf Becker
98e00f08d0 fix PHP 8.0 TypeError: when exporting multiple users 
Argument 1 passed to EGroupware\Api\Accounts::username() must be of the type int or null, array given
 2021-10-11 18:33:59 +02:00
Ralf Becker
90ab703a14 fix PHP Warning count(): Parameter must be an array or an object that implements Countable 2021-10-11 13:58:33 +02:00
nathan
da6a16e62d - Add generation target path preference to all apps 
- Use common method to get merge preferences to reduce duplication
 2021-10-07 10:22:45 -06:00
nathan
45f039da95 * Add preference to set the filename of merged documents using placeholders 2021-10-06 11:59:29 -06:00
Ralf Becker
5b3a6c02b4 PHP 8.0 Fatal error: Declaration of timesheet_tracking::get_subject($data, $old) must be compatible with Api\Storage\Tracking::get_subject($data, $old, $deleted = null, $receiver = null) 2021-10-06 16:32:14 +02:00
Ralf Becker
d2c85cfe86 fix PHP 8.0 errors: key(): Argument #1 ($array) must be of type array, null given 
guarding key() from calling with null eg. $button = key($content['button']) --> key($content['button'] ?? []) or check before !empty($content['button'])
 2021-10-06 16:08:32 +02:00
nathan
a0a89a6b74 Placeholder dialog: Add placeholders for projectmanager, timesheet, tracker 2021-10-05 16:09:39 -06:00
Ralf Becker
05405b955a remove generated .js files from git 2021-07-01 08:38:08 +02:00
Ralf Becker
d7cd90ebe7 fix skipping timestamps, but preferring .min.js over .js 
added more apps to rollup.config.js (ones givening errors are commented out)
 2021-06-29 15:21:19 +02:00
nathangray
9be653e226 Adapt app-specific merges to 186e03671a 2021-06-23 11:31:47 -06:00
nathangray
218e17798d Api: Fix Asyncservice did not have proper filesystem access as the job user 2021-06-18 14:56:14 +02:00
Hadi Nategh
0de8f242aa Fix missing dhtmlx menu object 2021-06-10 13:59:12 +02:00
Hadi Nategh
0730d4880e Remove couple of more jquery import statements 2021-06-10 13:57:33 +02:00
Ralf Becker
8fa2bb466b fixed includeJS causing jQuery to be included twice and breaking plugins 2021-06-08 15:11:37 +02:00
Ralf Becker
f91bca83e1 got et2 mostly working: timesheet.edit renders 2021-06-07 17:33:53 +02:00
Ralf Becker
1f010a4391 Bump version to 21.1 2021-05-08 15:02:24 +02:00
nathangray
583fbea046 Use Merge number formatting instead of export formatting. It takes export file type into consideration. 2021-04-21 10:33:31 -06:00
nathangray
f89c8cfb03 Add hrules to sidebox menus 2021-04-19 16:02:41 -06:00
nathangray
826d9e27cc * Timesheet: Fix created was overlapping with status 2021-04-13 13:28:56 -06:00
nathangray
aff06ec4cc Import/export fixes 
- Fix for missing floats by Jürgen Dlugi
- Fix broken timesheet export was always 0 results
 2021-04-08 16:53:06 -06:00
Ralf Becker
868135775c PHP 8 fixes 2021-03-29 16:47:19 +02:00
Ralf Becker
84845d05b5 Fix PHP 8.0 Fatal error: Unparenthesized a ? b : c ?: d is not supported 2021-03-21 21:46:10 +01:00
Ralf Becker
ab9c089f70 fix PHP 8 Fatal error Array and string offset access syntax with curly braces is no longer supported 2021-03-21 21:13:07 +01:00
nathangray
df54dcace4 Apply client-side push refactoring to calendar, infolog, timesheet 2021-03-04 11:27:35 -07:00
nathangray
779f2691bd * Timesheet: Fix created time was wrong in user timezone was not the same as server timezone 2021-01-28 09:39:17 -07:00
nathangray
b247554141 Timesheet: more timezone date fixes 
This time start time was improperly processed, fixed end_time too
 2021-01-27 10:23:22 -07:00
nathangray
1079abc161 Timesheet: Fix editing timesheet had start time in wrong timezone if user timezone differed from server timezone 2021-01-12 15:00:42 -07:00
Ralf Becker
ab8f644f32 pending translations from our translation server 2020-10-28 13:51:14 +01:00
nathangray
151889b39c Api: Move list of common merge placeholders into parent class to reduce duplication, add link/<format> options 2020-10-06 10:56:08 -06:00
Hadi Nategh
6b910cc5fe Make sure we reset filter or not setting it when choosing select All 2020-08-20 13:53:45 +02:00
Ralf Becker
af4a605561 * Timesheet: fix list not always refreshed via push, caused by owner filter 2020-08-14 12:38:29 +02:00
nathangray
bec67d63ee Etemplate: Change how nextmatch handles update & refresh push messages 2020-08-07 09:19:15 -06:00
nathangray
cd20749ca0 Timesheet: Change context menu category change to go over AJAX instead of POST to take advantage of push 2020-08-06 09:15:52 -06:00
Ralf Becker
3ee29ccacb disable autorefresh in infolog and timesheet 2020-08-06 10:07:26 +02:00
nathangray
c5f03f6413 Timesheet: ACL data changed is an object 2020-07-29 09:51:48 -06:00
Ralf Becker
6d4aaade1b avoid second full refresh by sending delete action via ajax 2020-07-24 14:47:50 +02:00
nathangray
f0b924008b Etemplate: Add a callback so apps can decide where to put new push rows 2020-07-21 15:32:22 -06:00
nathangray
b0a678c0ec Timesheet: Fix push owner filter was preventing updating 2020-07-20 13:44:28 -06:00
Ralf Becker
361d5cb351 bump version to 20.1 2020-06-28 10:04:21 +02:00
Ralf Becker
d83c567703 pending translations from our translation server 2020-06-12 12:29:47 +02:00
nathangray
32267f02c8 * Timesheet: Fix update via import without category or status cleared original 2020-04-14 14:32:46 -06:00
nathangray
0eb65b9efe * Timesheet: Fix import condition checks 2020-04-09 13:22:46 -06:00
nathangray
34ec346821 Fix favourites (& probably some more inherited stuff) broken by TypeScript conversion 
Note that any properties declared in a sub-class aren't generally available until after the super() call is done, i.e. in the super constructor they're undefined.
 2020-03-20 11:38:38 -06:00
Hadi Nategh
cd93c942fa Fix error template.index is undefined in timesheet 2020-03-12 15:56:07 +01:00
Ralf Becker
e9c4d3f07e complete push implementation for timesheet incl. ACL check 2020-01-24 13:31:56 +01:00
nathangray
76a5793a0a New push method, with base implementation of delete client side 2020-01-23 11:03:29 -07:00
nathangray
ff50df67d0 Use correct refresh methods for delete so app can handle it 2020-01-23 09:21:41 -07:00
Ralf Becker
6e0936bd98 first take on pushing app-changes to all clients 2020-01-23 11:26:44 +01:00
Ralf Becker
901825bcfa first try with TypeScript: timesheet app.js incl. new egw_app base-class 2020-01-23 09:14:58 +01:00
nathangray
06f8f7456d * Timesheet: Fix project link was missing when changing project after clicking "Save & New" 2019-12-13 09:48:01 -07:00
nathangray
11e145967e Remove unused preferred export definition preference 2019-08-02 10:17:16 -06:00
Ralf Becker
efcb0471b3 bump version to 19.1 2019-07-16 10:46:59 +02:00
Ralf Becker
f4500fb9c1 pending changes from our translation server 2019-06-20 21:22:34 +02:00
nathangray
3dfdcee193 Reset bo object data before each import to fix imports without ID went to the same object 2019-03-26 11:26:41 -06:00
Hadi Nategh
f3b0362653 Remove extra navbar icons from mobile template 2019-03-21 16:43:23 +01:00
Hadi Nategh
d8d6d4d247 Apply new app color codes 2019-03-21 11:53:37 +01:00
nathangray
8230686a1b Import/Export - add definition setting to force a certain category 
- update tracker to extend importexport_basic_import_csv
 2019-03-07 15:52:48 -07:00
Ralf Becker
af88cc0822 * Timesheet: fix SQL error searching, if there are custom-fields 2019-02-26 20:30:11 +01:00
nathangray
d805e9f467 Stop using deprecated each(), using foreach(), key() or current() instead 2019-02-12 14:13:45 -07:00
nathangray
07b24b2a60 Commit session right after we store the state 2018-12-20 10:45:11 -07:00
Hadi Nategh
d9e1ddf506 W.I.P. of modern theme with SVG icons enabled: 
- add colored svg navbars
 2018-12-11 16:52:55 +01:00
Ralf Becker
3552afa91c converting turkish translations to utf-8 2018-12-10 10:59:43 +01:00
nathangray
8451836a92 Import/Export - change signature of method that gets options to allow definition-specific values 
Do export too, for consistency
 2018-11-29 10:32:42 -07:00
nathangray
dba9a76246 Import/Export - change signature of method that gets options to allow definition-specific values 2018-11-29 09:35:35 -07:00
nathangray
d5cf6a600f * Infolog, Timesheet - Fix link title placeholders not working 2018-10-04 11:17:30 -06:00
nathangray
a2a33f0ae9 * Timesheet - Fix links to application custom fields are not created on first save 2018-08-13 10:48:52 -06:00
nathangray
e5c13a0df6 * Timesheet - Admin only status also blocks editing & deleting for non-admins 2018-07-30 13:36:43 -06:00
nathangray
7ed5c42b3d * Timesheet - only admins can select admin only statuses 2018-07-27 11:19:15 -06:00
Krzysztof Kaczmar
7881945c68 Some fixes in Polish language files 2018-07-23 14:01:10 +02:00
Hadi Nategh
7c01fa533b Change from legacy-options sub-type to type_filter 2018-07-19 17:07:08 +02:00
nathangray
bc43d93950 * Calendar - Open timesheet from recurring event on selected occurence instead of first occurence 2018-06-08 11:32:38 -06:00
U-quokka\komaba
2da4ec91db update Japanese language files. 2018-05-12 08:24:38 +09:00
Ralf Becker
d26d779376 not setting pe_status from datasource (its ignored now anyway) 2018-04-27 18:48:06 +02:00
Hadi Nategh
c28e6de2ba Add some translations, thanks to Evgen Vodopivec. 2018-04-03 11:24:42 +02:00
Hadi Nategh
7949d8b2fc Fix lots of misspelled words in translations 2018-03-26 16:02:42 +02:00
Ralf Becker
df649f1acc fix PHP Warning: A non-numeric value encountered in line 77 
caused be not set (NULL) unitprice
 2018-03-15 11:29:00 +01:00
Ralf Becker
c2bb28d3f1 pending DE and SK translation from Stefan Unvericht 2018-02-09 12:34:50 +01:00
nathangray
e6b0ed7fee Check to make sure we're in a JSON request before accessing it 2017-12-14 14:36:38 -07:00
nathangray
bb3c88b3b0 Timesheet - change default pe status to active 2017-11-27 09:33:05 -07:00
Hadi Nategh
c6beddbd10 Fix project field not getting fullwidth in timesheet edit dialog 2017-11-23 15:48:15 +01:00
Ralf Becker
65b02c0246 bump verison to 17.1 2017-10-22 12:56:58 +02:00
nathangray
97eb05e04d * Timesheet - Fix bug where user column dissapears if you have custom fields and resize a column 2017-09-20 10:30:30 -06:00
nathangray
7c7b1711e5 * Timesheet - Fix bug where editing entries from disabled users changed the user 2017-09-05 09:04:31 -06:00
nathangray
6539b66cdc * Timesheet - Fix 0 quantity was not allowed 2017-08-25 10:11:41 -06:00
nathangray
c5f856d297 Timesheet - fix inconsistencies in which sums were shown as you change the time filter 
(fixes #21497)
 2017-05-23 15:32:49 -06:00
Ralf Becker
dfbd0d2e6f do NOT store actions in session or eT2 request, nor send for mobile devices skiped actions 2017-04-04 16:54:36 +02:00
nathangray
27922446d7 Timesheet - Fix another place where Save & New then changing the project keeps the old project 2017-03-17 09:30:05 -06:00
nathangray
327657b86b If timesheet project changes, update the project title field to match 2017-03-14 09:56:14 -06:00
nathangray
7429dac075 * Timesheet - Fix 'Save & new' does not set project correctly 2017-03-01 11:39:01 -07:00
nathangray
6cc64bd9b1 Some translation improvements from Stefan Unverricht 2017-02-27 13:32:14 -07:00
nathangray
bb4c7a8b71 Timesheet - Fix custom date filter not showing 2017-02-27 11:49:41 -07:00
Hadi Nategh
508d0aa920 Try to match placeholder NENVLF with its described example 2017-02-10 10:41:43 +01:00
Hadi Nategh
c78042d522 Update PUBLIC ID of etemplate2.dtd in all templates 2017-02-01 09:59:37 +01:00
Ralf Becker
4df3b7b540 setting timesheet custom fields to size of other apps: 64 char name, and 16k data, also setting not null constrain on ts_create after creating the column 2017-01-18 12:46:39 +01:00
nathangray
a23acf1dfa * Add creation field to timesheet 2017-01-17 10:34:28 -07:00
Ralf Becker
f9bbcdeb86 * Timesheet/Resources/Filemanager/Calendar: customfields could not be deleted 2017-01-17 18:24:56 +01:00
nathangray
e5b93acc4f Implement pe_status, set_status() and delete() 2017-01-11 15:48:10 -07:00
Hadi Nategh
e135b7272f * Mobile template: Fix customfields do not show up in view mode 2017-01-09 16:04:51 +01:00
nathangray
2f8538e80e * Timesheet: Add Copy context menu action 2016-11-24 10:20:45 -07:00
nathangray
ed6069aa4d * Infolog: Add a context menu action to view a list of linked timesheets 2016-11-22 11:41:51 -07:00
nathangray
41bcceb44e Fix bug in timesheet simple mode where Save & New, then selecting a different project did not change the title to match the new project 2016-10-18 10:01:54 -06:00
Ralf Becker
205d377ca9 * Timesheet/ImportExport: fix PHP Fatal Error Call to undefined method EGroupware\Api\Session::appsession() when exporting 2016-10-12 16:12:57 +02:00
nathangray
76df9b047e Allow project selection in timesheet list nextmatch header to be very tall, if needed 2016-09-27 10:34:07 -06:00
Ralf Becker
e467b48fea allow to import without acl-check and setting modifier 2016-09-26 11:40:02 +02:00
nathangray
1e1447e135 Parse project number into project ID when importing 2016-09-20 09:42:53 -06:00
nathangray
11ea2ac7b6 Fix linking failures in import, and some braces 2016-09-12 10:42:12 -06:00
nathangray
695317985e Fix some bugs in timesheet import: 
- Missing owner step template
- Missing message in owner step
- Wrong call to array_key_exists
 2016-09-12 08:40:48 -06:00
Ralf Becker
329a6956fe * Timesheet: do not show deactivated accounts for creating new timesheets (keeping them in list header) 2016-08-29 11:25:59 +02:00
Hadi Nategh
f7b995a24b Fix projectmanager link does not get set for new timesheet entry 2016-08-26 10:40:17 +02:00
Hadi Nategh
25416167d9 Set lank projectmanager link as pm_id. Fix timesheet project field does not show linked project link as pre-selected project 2016-08-25 18:11:21 +02:00
nathangray
134572a0d9 Try to find & set pm_id from selected project when adding a new timesheet entry 2016-08-18 14:04:33 -06:00
nathangray
405e844446 If timesheet list has a project filter selected and user adds a new timesheet, pre-set the project to the one selected in the list 2016-08-12 10:39:06 -06:00
Ralf Becker
3752c35a5a add ajax=true to diverse admin pages of apps, changing customfields class to autoloadable admin_customfields (with old class extending new one, just in case), fix wrong English phrase "typ" in infolog 2016-08-12 11:35:30 +02:00
Ralf Becker
25b7334017 pending translations from our translation server, thanks to Illias and others 2016-08-10 08:55:21 +02:00
nathangray
6ef849c9a7 Fix attempting to set array value accessed via magic methods was silently ignored by changing and setting the whole array 2016-08-03 09:57:49 -06:00
Hadi Nategh
a217bb60a4 Fix category column is too close to date column in timesheet 2016-07-05 14:22:44 +02:00
nathangray
439d1e9dab Move timesheet ID column to the right, so it doesn't hold the category marker & can be safely turned off. 2016-07-04 15:37:44 -06:00
Ralf Becker
66c34f012d fix Scrutinizer "bugs" 2016-06-29 10:41:59 +02:00
Ralf Becker
4db7e2fb94 fix Scrutinizer "bugs" 2016-06-29 10:38:41 +02:00
nathangray
5df52af359 Fix missing translation for timesheet list 2016-06-23 14:38:40 -06:00
Hadi Nategh
60f6f71430 Mobile template: 
- Fix links are not shown in view mode for infolog
- implement timesheet and resources view mode
 2016-06-21 16:37:35 +02:00
nathangray
7bb9577c6f Allow custom date filter with no start date 2016-05-27 10:36:51 -06:00
nathangray
31b6c8607b Do not set end date to current time, just leave it unset - but pass by reference 2016-05-25 12:59:44 -06:00
nathangray
bd6c45c845 Get nextmatch column widths sorted out so column selector is visible, and columns line up with headers. 2016-05-25 11:54:46 -06:00
Hadi Nategh
60bc400313 Fix modified view templates are not getting updated because of no cache-buster modification timestamp 2016-05-25 16:44:36 +02:00
Hadi Nategh
f0af5eeb08 End date needs to be passed by reference, fixes broken timesheet from commit aa0814f 2016-05-25 09:52:16 +02:00
nathangray
aa0814f4d0 Do not set end date to current time, just leave it unset 2016-05-24 15:01:20 -06:00
Ralf Becker
8a24f3e449 fix not loaded header / CSS, caused by missing echo before $GLOBALS['egw']->framework->(header|footer) 2016-05-14 21:26:36 +02:00
Hadi Nategh
d290485058 Nm resize fix: 
- Fix dataview grid resize not taking care of category color border
- Fix Category borders make headers misaligned
 2016-05-11 16:33:54 +00:00
Ralf Becker
be0d2ca297 fix PHP Fatal error: Call to undefined method EGroupware\Api\Session::appsession() 2016-05-09 09:30:03 +00:00
Hadi Nategh
c558d1667d Optimize window size of registered popups in appregistry 2016-05-06 15:12:27 +00:00
Nathan Gray
0eeb8b56c0 - Export plugins now specify the export record class 
- Projectmanager now has filters
 2016-05-04 19:34:30 +00:00
Hadi Nategh
62b3632073 Mobile theme: 
- Implement resources edit dialog
- Fix resources picture is not styled
- Fix mail subject column lost its width
- Implement new id representation for entries both on view and edit dialogs
 2016-05-04 10:02:16 +00:00
Nathan Gray
d9f99b9fe4 Calculate totals all the time 2016-05-03 22:18:49 +00:00
Nathan Gray
e88c3da6b8 Add missing placeholder (no rows) action 2016-04-26 23:11:29 +00:00
Ralf Becker
8b671d96f1 update to only use new Api, incl. dependency to only api (no more phpgwapi and etemplate) 2016-04-26 18:27:29 +00:00
Ralf Becker
260efdaa5f fix file-level docblock and svn:keywords Id 2016-04-26 16:45:17 +00:00
Ralf Becker
4854078b7c fix PHP Fatal error: Call to undefined function now() 2016-04-26 09:30:07 +00:00
Nathan Gray
ec1f6e9068 - Keep custom timespan start & end dates matching selected named range 
- If all (or no end date) show until today, instead of a week
 2016-04-25 21:21:40 +00:00
Ralf Becker
68e998c649 use new et2 config 2016-04-24 13:48:45 +00:00
Nathan Gray
c6c51e6a8e Fix changed column IDs hiding columns incorrectly 2016-04-14 18:34:06 +00:00
Nathan Gray
e20d5a2a1d Hide status selectbox when there are no statuses available 2016-04-13 16:37:01 +00:00
Nathan Gray
f3aca6f1d7 - Clear header totals when no date filtering is applied 
- Avoid warnings about column list being string / array
 2016-04-13 14:59:17 +00:00
Nathan Gray
3fdf387341 Fix start & end date filters did not filter 2016-04-12 22:52:22 +00:00
Hadi Nategh
a6a3dc5250 Styling dialogs W.I.P.: 
- Remove all "Create new links" from link tabs
 2016-04-11 14:30:30 +00:00
Hadi Nategh
b35753ba79 Styling dialogs W.I.P.: 
- Fix alignments in timesheet edit dialog
- Fix date duration widget width
 2016-04-11 12:31:18 +00:00
Hadi Nategh
50aae863b6 Edit dialogs style W.I.P.: 
- Give tab widget new look
- Style grid header different
- Re-design calendar edit dialog
- Some fixes for multi et2_taglist
 2016-04-06 16:43:51 +00:00
Nathan Gray
437f6353d0 Change timesheet list categories empty label to 'All categories' to match other apps 2016-03-24 18:52:59 +00:00