holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,745 Commits 27 Branches 330 Tags 157 MiB
2543a011cb
Commit Graph

377 Commits

Author SHA1 Message Date
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
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
nathangray
bc43d93950 * Calendar - Open timesheet from recurring event on selected occurence instead of first occurence 2018-06-08 11:32:38 -06:00
Ralf Becker
d26d779376 not setting pe_status from datasource (its ignored now anyway) 2018-04-27 18:48:06 +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
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
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
Hadi Nategh
508d0aa920 Try to match placeholder NENVLF with its described example 2017-02-10 10:41:43 +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
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
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
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
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
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
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
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
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
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
437f6353d0 Change timesheet list categories empty label to 'All categories' to match other apps 2016-03-24 18:52:59 +00:00
Nathan Gray
0f5d4e7cab Send false to re-enable columns as needed 2016-03-08 17:29:10 +00:00
Ralf Becker
61027429eb alignment of NM header 2016-02-17 19:56:54 +00:00
Ralf Becker
60d41a7a48 WIP aligning nextmatch header and styling it as toolbar 2016-02-16 17:18:02 +00:00
Hadi Nategh
19a21b2322 Mobile theme W.I.P.: 
- Add view mode for timesheet
 2016-02-05 11:47:32 +00:00
Ralf Becker
b01ac97b7e * Timesheet/Tracker: date filters like "last week" where not aware of daylight saving time changes 2015-10-27 10:27:09 +00:00
Nathan Gray
b0713a9945 Make sure every app has a sidemenu link to the list and add an entry 2015-09-09 22:20:25 +00:00
Nathan Gray
8ade7b3926 Fix 'No project' column filter 2015-05-19 20:58:30 +00:00
Hadi Nategh
3e87f3c5b8 Preserve the data before read operation and restore it again after 2015-04-30 15:05:53 +00:00
Nathan Gray
d51c83402d Set default columns 2015-01-12 19:59:25 +00:00
Nathan Gray
35ebfc4f9f More Home progress: 
- Send action results
 2014-11-28 19:25:15 +00:00
Nathan Gray
978b5f4ffd More Home progress: 
- Add support for timesheet favorites
 2014-11-28 18:03:13 +00:00
Ralf Becker
a6767139a0 set ts_project for export/merge from ts_project_blur, where it get moved, if it is no custom value 2014-11-19 13:51:09 +00:00
Ralf Becker
c633e0033b * all aps: lower memory requirements of insert into document by skipping HTML processing, if there are no html (custom-)fields 2014-11-19 12:20:59 +00:00
Nathan Gray
ea8ff86854 Add a method to get an icon for a record, as specific to that record as possible 2014-11-18 23:40:49 +00:00
Hadi Nategh
f43141c96a Keep the actual value of ts_quantity while storing it as it is used in price calculation, and rounding it cuases miscalculation of price 2014-11-17 08:40:49 +00:00
Ralf Becker
3d411f82da * ProjectManager/Timesheet: fixed an infinit loop when trying to save a project-element, caused by timesheet notifying project again 2014-11-03 13:51:05 +00:00
Nathan Gray
b707bde89f When exporting if custom project is not set, use current project title for Project field 2014-10-29 15:27:40 +00:00
Nathan Gray
8a3df3911f Do not clear start/end time in simple mode, use them as user set them. 2014-10-22 20:09:10 +00:00
Nathan Gray
2f53633dca * Switch to nextmatch and edit dialog for customfield list 2014-10-22 19:55:27 +00:00
Ralf Becker
83b6706964 * Timesheet: fix (un)setting project for adding, editing and save&new timesheets 
- fixed et2_widget_textbox to update options.blur in set_blur(), as it is used in getValue, also updating input
- fixed et2_widget_linkentry to trigger change event, after reacting to click on X in search
- fixed timesheet to handle ts_project and pm_id in bo (ts_project is always stored in db for searching, even if it contains no custom project name)
- fixed not working change of project in an existing timesheet
- fixed unsetting of project
 2014-10-14 15:58:37 +00:00
Ralf Becker
f1283fcf71 * Timesheet: fix SQL error when searching and NO custom fields defined 2014-10-01 08:19:39 +00:00
Nathan Gray
e51097ef0d Include custom fields in search 2014-09-18 19:38:34 +00:00
Nathan Gray
29301590d6 Fix doubled description ID (ts_description), caused lost comment when viewtype was set to simple 2014-09-09 22:20:52 +00:00
Nathan Gray
7b2511d264 Change automatically calculated quantity and list quantity to 2 decimal places 2014-09-09 21:38:37 +00:00
Ralf Becker
2a4e77f382 * Tracker/PostgreSQL: fix SQL error originating from timesheet 
cause by timesheet_bo::sum(array()) call
 2014-09-09 12:27:59 +00:00
Hadi Nategh
a2c60633c6 Allow to set endtime before starttime, and calculate it as next day time. 
- Fix setting endtime after middnight gives an validation error
- Move starttime validation under starttime field
 2014-08-27 12:04:05 +00:00
Ralf Becker
4e044c5bde fix empty custom start- or end-date is displayed as 1970-01-01 in app-header and just selecting a start to get week starting from that day got wrong enddate 2014-08-25 18:22:50 +00:00
Nathan Gray
cc04f0b89c Create & use a flag 'no_actions' to disable actions for sum rows 2014-08-11 23:13:02 +00:00
Nathan Gray
0fa3ad831b Fix no longer working 'None' category option 2014-08-11 22:50:38 +00:00
Nathan Gray
c11785b2db Change pm_id filter to link-entry to match edit dialog. 
Fixes empty pm_id filter when PM integration = full
 2014-07-08 22:06:04 +00:00
Hadi Nategh
0be030f6cb Fallback to admin index after save/cancel from calendar ACl,timesheet edit status 2014-07-08 15:10:24 +00:00
Nathan Gray
c32ab85757 Just use edit, it's easier and won't cause issues with filtering. 2014-06-25 16:09:51 +00:00
Hadi Nategh
8c276bfe96 Remove "placeholder" link from help tooltip of preferences 2014-06-24 09:47:08 +00:00
Hadi Nategh
b0d2c7fb00 Fix IDE warnings 2014-06-12 12:39:52 +00:00
Ralf Becker
288f46aafd fixed not changed quantity, if duration was changed, caused by slightly different semantic for html5 placeholders to old eTemplate 
old eTemplate returned empty value, if value was equal to placeholder, html5 shows placeholder only if value is empty, but will return a value equal to placeholder
--> I think we should go with html5 placeholder semantic and therefore change this in timesheet to give an empty value for quantity, if equal to duration and duration as placeholder/blur
 2014-06-12 08:30:21 +00:00
Nathan Gray
f82559b525 Fix details filter not doing anything unless you close the tab 2014-06-04 19:29:35 +00:00
Ralf Becker
c04f0ccc8f fix not updated infolog in list, when timesheet is booked on it: added "row_mod" as maximum of info_modified, link_lastmod (incl. deleted ones) and timesheet_bo::sum() max_modified 2014-05-24 10:59:03 +00:00