extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-17 05:23:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,249 Commits 32 Branches 355 Tags 192 MiB
a51fdfbc81
Commit Graph

299 Commits

Author SHA1 Message Date
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
Ralf Becker
ef07aebbd4 * ProjectManager/Timesheet: automatic change a changed project-title in Timesheet too 2014-05-15 13:20:52 +00:00
Nathan Gray
3a004a2672 Add link to list of placeholders into app menu 2014-04-14 17:08:43 +00:00
Nathan Gray
9c9b784c0c Remove fake modified date, it's considered not modified by nextmatch updated rows check 2014-04-02 19:49:14 +00:00
Nathan Gray
42ee153c30 Set row_modified setting so nextmatch can filter out unchanged rows, and not send them back to the client again 2014-03-18 22:55:48 +00:00
Ralf Becker
3c91753e80 moving add-icon(s) from header_right to header_row 2014-03-12 10:12:29 +00:00
Ralf Becker
f0d7751496 removed caret from group favorites, fixed prefered favorite was not show correct initialy nor updated 2014-02-12 21:51:25 +00:00
Hadi Nategh
7f222b165d Remove "BLACK DIAMOND SUIT" character from global categories 2014-02-03 09:19:59 +00:00
Ralf Becker
cf96da6f2f enable sum-rows to be able to merge-print selections containing them and remove them later from the selection 2014-01-31 11:58:58 +00:00
Ralf Becker
530e9d13e3 fix not loaded sum-rows, caused by having no row-id 2014-01-30 18:47:42 +00:00
Ralf Becker
efd6bf87d5 eT2 date-timeonly distinguishes between empty=no time set (returned as null) and "00:00", old eTemplate could did not do that, also fixed ide warnings 2014-01-30 15:39:56 +00:00
Nathan Gray
782eb7f14c Fix filemanager context menu item opening in iframe 2014-01-16 17:23:39 +00:00
Nathan Gray
d65b40046a Move sidebox favorites & backend out of nextmatch and into framework 2013-12-12 00:03:07 +00:00
Ralf Becker
118d9e025d disabling all actions but add on sum rows 2013-10-04 11:19:42 +00:00
Ralf Becker
f8a0db06fc completly remove preferences menu from sidebox and tiled preferences index in favoir of app-sensitive entries in top-menu 2013-10-03 09:23:18 +00:00
Hadi Nategh
1c42747547 REmove "Whole query" menu item from Tracker, Timesheet and Addressbook, while et2 nm handles selection differently 2013-09-23 08:31:07 +00:00
Hadi Nategh
d0f967bdd8 Set prefix for CSS classes, timesheet app 2013-09-03 14:42:46 +00:00
Ralf Becker
c13dccd96e fixed not shown day-sum (caused by 0 == 'ts_id') 2013-09-02 18:03:00 +00:00
Ralf Becker
a4ec8796af * Timesheet/PostgreSQL: fix SQL error when selecting a timerange 2013-08-29 10:59:00 +00:00
Hadi Nategh
40ba4bad22 Add favorite onto side-box menu for timesheet app 2013-08-29 08:25:46 +00:00
Hadi Nategh
7ee2c05955 remove extra app prefixes from method names in app.js, for both infolog and timesheet applications 2013-08-27 10:46:42 +00:00
Ralf Becker
db7d12af4b first take on new ACL dialog for admin 2013-08-26 18:25:43 +00:00
Ralf Becker
aa8a848871 optional parameter for egw_framework::window_close() to specify an alert message, which get shown/alerted, before closing the window 2013-08-26 10:24:11 +00:00
Ralf Becker
0de6ab1b35 fix not working timesheet status and category actions: "disableClass", "enableClass" and "enableId" are now handled by action system itself, one should not set an explicit "enabled" attribute anymore 2013-08-26 08:24:50 +00:00
Hadi Nategh
3f862f8b9a remove an old js() method from timesheet_ui which were no longer used in the code. 2013-08-23 07:35:42 +00:00
Hadi Nategh
e572d77693 add app.js to timesheet application and run timesheet app by et2 2013-08-21 15:25:42 +00:00
Ralf Becker
1c4f65120c new egw_framework methods refresh_opener and window_close to call egw_refresh on opener or close popup window in a content security save way 2013-08-20 12:06:41 +00:00
Nathan Gray
cf8714293e Open preferences in preferences tab 2013-08-13 17:37:15 +00:00
Klaus Leithoff
28c5aa2c19 * Timesheet: fix for missing preset title 2013-06-10 12:22:09 +00:00
Ralf Becker
59f57d69b6 * Timesheet: allow to add timesheets starting yesterday and end today (no warning end-time before start-time) 2013-05-24 07:07:04 +00:00
Nathan Gray
8a55a0f99e Helps if I turn it on - Add context menu link to filemanager 2013-04-03 16:38:47 +00:00
Nathan Gray
47c07a45d5 Add context menu link to filemanager 2013-04-01 22:47:26 +00:00
Nathan Gray
b13ccf631c Add {{link}} placeholder to other apps 2013-03-20 14:51:09 +00:00
Ralf Becker
41116cd6fc * Timesheet: fixed SQL error when deleting a user and transfering his data to an other user 2013-03-07 12:40:38 +00:00
Nathan Gray
90fa3a8287 - Use egw_refresh() instead of changing href 
- Listen to csv_export and don't save nextmatch query to session
 2013-02-14 11:28:15 +00:00
Nathan Gray
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Ralf Becker
525daf4a3e missing deleteaccount hook for timesheets 2013-01-24 09:27:48 +00:00
Nathan Gray
e39fcab548 Fix export 'Use search results' 2013-01-23 18:04:45 +00:00
Nathan Gray
a5ec4e5b36 Implement export filters for timesheet 2013-01-22 22:19:46 +00:00
Klaus Leithoff
3fe0ecf662 * Infolog: fix problem regarding the display of wrong sums on timesheets when applying a search AND have multiple customfields set for timesheets 2013-01-17 15:55:08 +00:00
Christian Binder
c8a5fe221a enable more apps to be merged by filemanagers itempicker 2013-01-04 00:21:37 +00:00
Nathan Gray
f080e1ff34 Hide undelete context menu option when not viewing deleted items 2012-10-25 17:11:52 +00:00
Nathan Gray
e16ea584ba Add Un-delete to context menu 2012-10-24 15:50:48 +00:00
Nathan Gray
e8318b2442 Default timesheet history to on 2012-10-23 16:59:14 +00:00
Nathan Gray
7f2962b08e Show deleted status even when there are no statuses 2012-10-22 18:42:02 +00:00
Nathan Gray
014c720546 Don't add 'Deleted' status to status list, just add it where needed and use an Undelete button 2012-10-22 18:31:11 +00:00
Nathan Gray
ae77723140 Add delete protection to timesheet 2012-10-17 20:24:56 +00:00
Ralf Becker
f028e6d24e should fix Fatal error: Cannot use string offset as an array in line 671 2012-10-14 08:20:00 +00:00
Nathan Gray
20908f688e Fix broken conversion from human values 2012-10-10 16:24:46 +00:00
Nathan Gray
1610a7523e Report conversion warnings 2012-09-20 16:28:42 +00:00
Klaus Leithoff
f3a40b341b * timesheet/mergeprint: add missing datefield definition 2012-08-24 11:45:28 +00:00
Christian Binder
f81fd11435 tag applications which have implemented document merge 2012-07-04 17:00:03 +00:00
Ralf Becker
b89ac80f6b * Timesheet: filtering by a status did not contain timesheets of sub-status 2012-07-03 10:31:22 +00:00
Ralf Becker
ebb5244a7a * Tracker/Timesheet: support private custom-fields, existing fields stay public 2012-06-27 08:59:23 +00:00
Ralf Becker
3aac26d1ab * ProjectManager: allow datasources (eg. InfoLog) to set element category, update existing categories in elements to overwritten categories 2012-06-19 16:51:41 +00:00
Ralf Becker
2427a60c90 * Timesheet: if linked via ProjectManager, behave identical as if project was set in own GUI, fixed setting project to none to also unset project-title and blur 2012-05-30 08:21:18 +00:00
Ralf Becker
6ff1db3534 * Preferences all apps: add validation for vfs files and directories to give user immediate feedback about wrong or non vfs pathes 2012-05-22 13:51:30 +00:00
Ralf Becker
0abfcc9c99 * Timesheet: button [Save & New] keeps title (blur) set if called via timesheet submenu/icon of app (my.stylite.de bug #2669) 2012-05-22 11:58:10 +00:00
Nathan Gray
e5fd49940f Return export object 2012-04-18 18:00:21 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Nathan Gray
4df977db0b Use js compatible with etemplate & etemplate2 2012-03-30 19:40:04 +00:00
Ralf Becker
ee8fd5b10e found a lot more calls to get_rows missing to set csv_export flag and fixed code in nextmatch dealing with situation if num_rows=-1 got stored in prefs anyway 2012-03-29 12:06:10 +00:00
Klaus Leithoff
a5be6a5016 * timesheet: fixed wrong sum for timesheets; 
the retrieval of the summary (sum of duration and sum of price) has to take care that the customfield table is not joined, as the join causes a multiplication of the sum per customfield found; joining of the cutomfield table is triggered by criteria being set with either a string or an array, for this reason we set it to false, and pass the criteria as filter
 2012-03-05 12:06:17 +00:00
Frédéric Erpicum
60b6c516ee ganttchart in popup for timesheet and calendar edit 
remove date in timesheet bar title to make them shorter
 2012-02-27 16:33:01 +00:00
Nathan Gray
871701d774 Fix links/[app] merge tag - copy/paste error 2012-01-13 19:49:19 +00:00
Nathan Gray
02861daf88 Add mergeprint tag for links to a specified application: links/appname 2012-01-06 18:35:34 +00:00
Nathan Gray
f6a443a917 Add warnings to import plugin 2011-12-15 16:24:47 +00:00
Ralf Becker
7c9dd8086f changed "No defintion" to "Old fixed definition" 2011-11-21 10:01:08 +00:00
Nathan Gray
1afba81ce8 Add 'No definition' option for default export definition preference. Allows use of legacy nextmatch CSV export with Import/Export app still available 2011-11-18 16:01:57 +00:00
Klaus Leithoff
ad6cf1d8ae add/clarify status message when editing is not allowed via status; use check_statusForEditRights in controlling the edit state in edit mode as well 2011-11-10 08:45:44 +00:00
Klaus Leithoff
6f7a43a28c * timesheet: fix reported bug #2488 (stylite tracker), status and cat change still allowed via context menu, even if the entry in question should be ->edit by admins only<- (via status admin flag) 2011-11-09 14:52:33 +00:00
Nathan Gray
4ab5f97ed0 Add {{links}}, {{attachments}}, {{links_attachments}} placeholders 2011-10-26 16:45:38 +00:00
Ralf Becker
4ddfc607bc remove title-blur for same behavior after apply, as for opening the saved entry again 2011-09-21 15:07:27 +00:00
Ralf Becker
5a93e1d283 reverted accidently commited timesheet_ui 2011-08-24 07:20:12 +00:00
Ralf Becker
33c6766c88 - fixed xul_io class not exporting id of tab 
- fixed tab widget to use id instead of label
- added attribute names for describtion (label) in xul_io, to export them as single attributes not comma-sep. as options
- added translate: true to description/label title
--> xet-files need to be dumped new, to get the tab-ids
--> seems like describtion value is translated unconditional, it should only be translated if no_lang attribute is not set or false, while label attribute is always translated (Andreas?)
 2011-08-24 07:18:59 +00:00
Nathan Gray
624839d0db Translations for placeholder labels 2011-07-05 22:21:49 +00:00
Nathan Gray
31d1e20bdc Fix typo: definitition -> definition 2011-07-04 20:00:26 +00:00
Nathan Gray
f5cf715e7a Cleanup translations - move common stuff into preferences 2011-07-04 19:23:28 +00:00
Ralf Becker
7f47700c13 file_access_user implementation for timesheet 2011-06-26 14:29:35 +00:00