Merge branch 'master' of https://github.com/unaio/una

modules/boonex/tasks/classes/BxTasksConfig.php

@@ -40,7 +40,7 @@ class BxTasksConfig extends BxBaseModTextConfig
             'FIELD_PUBLISHED' => 'published',
             'FIELD_TITLE' => 'title',
             'FIELD_TEXT' => 'text',
-            'FIELD_TEXT_ID' => 'task-text',
+            'FIELD_TEXT_ID' => '',
             'FIELD_CATEGORY' => 'cat',
             'FIELD_MULTICAT' => 'multicat',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',

modules/boonex/tasks/classes/BxTasksModule.php

@@ -126,7 +126,7 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 			}
 
 			return echoJson(array(
-				 'eval' => $this->_oConfig->getJsObject('tasks') . '.reloadData(oData)',
+				 'eval' => $this->_oConfig->getJsObject('tasks') . '.reloadData(oData, ' . $iContextId . ')',
 			));
         }
         else {	
@@ -162,7 +162,7 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 			$this->onPublished($iContentId);
 			
 			return echoJson(array(
-				 'eval' => $this->_oConfig->getJsObject('tasks') . '.reloadData(oData)',
+				 'eval' => $this->_oConfig->getJsObject('tasks') . '.reloadData(oData, ' . $iContextId . ')',
 			));
         }
         else {	
@@ -475,12 +475,11 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 		$aVars = array();
 		$aLists = $this->_oDb->getLists($iContextId);
 		$aListsVars = array();
-		
 		$oConn = BxDolConnection::getObjectInstance($CNF['OBJECT_CONNECTION']);
 		
 		$aFilterValues = array();
 		if (isset($_COOKIE[$CNF['COOKIE_SETTING_KEY']]))
-			$aFilterValues =	json_decode($_COOKIE[$CNF['COOKIE_SETTING_KEY']], true);
+			$aFilterValues = json_decode($_COOKIE[$CNF['COOKIE_SETTING_KEY']], true);
 		
 		foreach($aLists as $aList) {
 			$aTasks = $this->_oDb->getTasks($iContextId, $aList['id']);
@@ -505,13 +504,13 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 					'object' => $this->_oConfig->getJsObject('tasks')
 				);
 			}
-			$sClass = $sCompleted = $sUncompleted = "";
+			$sClass = $sCompleted = $sAll = "";
 			if (isset($aFilterValues[$aList[$CNF['FIELD_ID']]])){
 				$sClass = $aFilterValues[$aList[$CNF['FIELD_ID']]];
 				if ($sClass == 'completed')
 					$sCompleted= 'selected';
-				if ($sClass == 'uncompleted')
-					$sUncompleted= 'selected';
+				if ($sClass == 'all')
+					$sAll = 'selected';
 			}
 			$aListsVars[] = array(
 				'title' => $aList[$CNF['FIELD_TITLE']],
@@ -522,7 +521,7 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 				'object' => $this->_oConfig->getJsObject('tasks'),
 				'class' => $sClass,
 				'completed' => $sCompleted,
-				'uncompleted' => $sUncompleted,
+				'all' => $sAll,
 			);
 		}
 		
@@ -539,9 +538,10 @@ class BxTasksModule extends BxBaseModTextModule implements iBxDolCalendarService
 			'jquery-ui/jquery.ui.core.min.js',
 			'tasks.js',
     	));
+		
 		return $this->_oTemplate->getJsCode('tasks') . $this->_oTemplate->parseHtmlByName('browse_tasks.html', $aVars);
     }
-
+	
     /**
     * Common methods
     */

modules/boonex/tasks/install/langs/en.xml

@@ -66,8 +66,8 @@
 	
 	<string name="_bx_tasks_form_entry_input_sys_tasks_list"><![CDATA[Task list]]></string>
 	<string name="_bx_tasks_form_entry_input_tasks_list"><![CDATA[Task list]]></string>
-	<string name="_bx_tasks_form_profile_input_sys_initial_members"><![CDATA[Assignment]]></string>
-	<string name="_bx_tasks_form_profile_input_initial_members"><![CDATA[Assignment]]></string>
+	<string name="_bx_tasks_form_profile_input_sys_initial_members"><![CDATA[Assign to]]></string>
+	<string name="_bx_tasks_form_profile_input_initial_members"><![CDATA[Assign to]]></string>
 	<string name="_bx_tasks_form_entry_input_sys_date_due_date"><![CDATA[Due date]]></string>
 	<string name="_bx_tasks_form_entry_input_date_due_date"><![CDATA[Due date]]></string>
 	

modules/boonex/tasks/install/sql/enable.sql

@@ -77,7 +77,7 @@ INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `t
 -- PAGE: entries in context
 
 INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
-('bx_tasks_context', 'tasks-context', '_bx_tasks_page_title_sys_entries_in_context', '_bx_tasks_page_title_entries_in_context', 'bx_tasks', 5, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxTasksPageAuthor', 'modules/boonex/tasks/classes/BxTasksPageAuthor.php');
+('bx_tasks_context', 'tasks-context', '_bx_tasks_page_title_sys_entries_in_context', '_bx_tasks_page_title_entries_in_context', 'bx_tasks', 5, 510, 1, '', '', '', '', 0, 1, 0, 'BxTasksPageAuthor', 'modules/boonex/tasks/classes/BxTasksPageAuthor.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
 ('bx_tasks_context', 1, 'bx_tasks', '_bx_tasks_page_block_title_sys_entries_in_context', '_bx_tasks_page_block_title_entries_in_context', 11, 2147483647, 'service', 'a:2:{s:6:\"module\";s:8:\"bx_tasks\";s:6:\"method\";s:14:\"browse_context\";}', 0, 0, 1, 1),
@@ -169,7 +169,7 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 -- MENU: add menu item to profiles modules (trigger* menu sets are processed separately upon modules enable/disable)
 
 INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `title`, `link`, `onclick`, `target`, `icon`, `submenu_object`, `visible_for_levels`, `active`, `copyable`, `order`) VALUES 
-('trigger_group_view_submenu', 'bx_tasks', 'tasks-context', '_bx_tasks_menu_item_title_system_view_entries_in_context', '_bx_tasks_menu_item_title_view_entries_in_context', 'page.php?i=tasks-context&profile_id={profile_id}', '', '', 'tasks col-red3', '', 2147483647, 1, 0, 0);
+('trigger_group_view_submenu', 'bx_tasks', 'tasks-context', '_bx_tasks_menu_item_title_system_view_entries_in_context', '_bx_tasks_menu_item_title_view_entries_in_context', 'page.php?i=tasks-context&profile_id={profile_id}', '', '', 'tasks col-red3', '', 510, 1, 0, 0);
 
 
 -- PRIVACY 

modules/boonex/tasks/install/sql/install.sql

@@ -425,15 +425,21 @@ INSERT INTO `sys_form_displays`(`object`, `display_name`, `module`, `view_mode`,
 
 INSERT INTO `sys_form_inputs`(`object`, `module`, `name`, `value`, `values`, `checked`, `type`, `caption_system`, `caption`, `info`, `required`, `collapsed`, `html`, `attrs`, `attrs_tr`, `attrs_wrapper`, `checker_func`, `checker_params`, `checker_error`, `db_pass`, `db_params`, `editable`, `deletable`) VALUES 
 ('bx_tasks_list', 'bx_tasks', 'do_submit', '_bx_tasks_form_list_entry_input_do_submit', '', 0, 'submit', '_bx_tasks_form_list_entry_input_sys_do_submit', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0),
-('bx_tasks_list', 'bx_tasks', 'title', '', '', 0, 'text', '_bx_tasks_form_list_entry_input_sys_title', '_bx_tasks_form_list_entry_input_title', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_tasks_form_list_entry_input_title_err', 'Xss', '', 1, 0);
+('bx_tasks_list', 'bx_tasks', 'title', '', '', 0, 'text', '_bx_tasks_form_list_entry_input_sys_title', '_bx_tasks_form_list_entry_input_title', '', 1, 0, 0, '', '', '', 'Avail', '', '_bx_tasks_form_list_entry_input_title_err', 'Xss', '', 1, 0),
+('bx_tasks_list', 'bx_tasks', 'do_cancel', '_bx_tasks_form_entry_input_do_cancel', '', 0, 'button', '_bx_tasks_form_entry_input_sys_do_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 1, 0),
+('bx_tasks_list', 'bx_tasks', 'controls', '', 'do_submit,do_cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 1, 0);
 
 
 INSERT INTO `sys_form_display_inputs`(`display_name`, `input_name`, `visible_for_levels`, `active`, `order`) VALUES 
 ('bx_tasks_list_entry_add', 'title', 2147483647, 1, 1),
-('bx_tasks_list_entry_add', 'do_submit', 2147483647, 1, 2),
+('bx_tasks_list_entry_add', 'controls', 2147483647, 1, 2),
+('bx_tasks_list_entry_add', 'do_submit', 2147483647, 1, 3),
+('bx_tasks_list_entry_add', 'do_cancel', 2147483647, 1, 4),
 
 ('bx_tasks_list_entry_edit', 'title', 2147483647, 1, 1),
-('bx_tasks_list_entry_edit', 'do_submit', 2147483647, 1, 2);
+('bx_tasks_list_entry_edit', 'controls', 2147483647, 1, 2),
+('bx_tasks_list_entry_edit', 'do_submit', 2147483647, 1, 3),
+('bx_tasks_list_entry_edit', 'do_cancel', 2147483647, 1, 4);
 
 
 -- PRE-VALUES

modules/boonex/tasks/js/tasks.js

@@ -9,6 +9,7 @@
 
 function BxTasksView(oOptions) {
     this._sActionsUri = oOptions.sActionUri;
+	
     var $this = this;
     $(document).ready(function () {
         $this.init();
@@ -28,7 +29,8 @@ BxTasksView.prototype.setCompleted = function (iId, oObj) {
 BxTasksView.prototype.setCompletedByMenu = function (iId, iValue, oObj) {
     var $this = this;
 	$(oObj).addClass('bx-btn-disabled');
-	$this._setCompleted(iId, iValue)
+	$this._setCompleted(iId, iValue);
+	document.location.reload(true);
 }
 
 BxTasksView.prototype._setCompleted = function (iId, iValue) {
@@ -36,15 +38,16 @@ BxTasksView.prototype._setCompleted = function (iId, iValue) {
 	$.getJSON($this._sActionsUri + 'set_completed/' + iId + '/' + iValue + '/', {}, function () {});
 }
 	
-BxTasksView.prototype.processTaskList = function (iContextId, iId) {
+BxTasksView.prototype.processTaskList = function (iContextId, iId, obj) {
     var $this = this;
 	$(window).dolPopupAjax({
         url: $this._sActionsUri + 'process_task_list_form/' + iContextId + '/' + iId + '/' ,
-        closeOnOuterClick: false
+        closeOnOuterClick: false,
+		removeOnClose: true
     });   
 }
 	
-BxTasksView.prototype.processTask = function (iContextId, iListId) {
+BxTasksView.prototype.processTask = function (iContextId, iListId, obj) {
     var $this = this;
 	$(window).dolPopupAjax({
         url: $this._sActionsUri + 'process_task_form/' + iContextId + '/' + iListId + '/' ,
@@ -53,9 +56,10 @@ BxTasksView.prototype.processTask = function (iContextId, iListId) {
     });   
 }
 
-BxTasksView.prototype.reloadData = function (iId, oObj) {
+BxTasksView.prototype.reloadData = function (oData, iContextId) {
 	$(".bx-popup-applied:visible").dolPopupHide();
-	document.location.reload(true);
+	var $this = this;
+	loadDynamicBlockAuto($('.bx-tasks-tasklist-add'), window.location.href )
 }
 
 BxTasksView.prototype.setFilter = function (iListId, object) {

modules/boonex/tasks/template/browse_tasks.html

@@ -1,16 +1,16 @@
-<a class="bx-btn bx-btn-small bx-def-margin-sec-right" href="javascript:void(0);" onClick="__object__.processTaskList(__context_id__, 0)"><bx_text:_bx_tasks_txt_new_task_list /></a>
+<a class="bx-btn bx-btn-small bx-def-margin-sec-right bx-tasks-tasklist-add" href="javascript:void(0);" onClick="__object__.processTaskList(__context_id__, 0, this)"><bx_text:_bx_tasks_txt_new_task_list /></a>
 <div class="bx-def-padding-top" style="clear: both">
 	<bx_repeat:task_lists>
-		<div class="bx-def-margin-top bx-tasks-tasklist-filter-__class__" id="bx-tasks-tasklist-__list_id__">
+		<div class="bx-def-margin-top bx-tasks-tasklist bx-tasks-tasklist-filter-__class__" id="bx-tasks-tasklist-__list_id__">
 		<div class="bx-def-padding bx-def-color-bg-hl">
-			<span class="bx-tasks-tasklist-title"><a href="javascript:void(0);" onClick="__object__.processTaskList(__context_id__, __list_id__)">__title__</a></span>
+			<span class="bx-tasks-tasklist-title"><a href="javascript:void(0);" onClick="__object__.processTaskList(__context_id__, __list_id__, this)">__title__</a></span>
 			<div class="bx-tasks-tasklist-actions">
 				<select class="bx-btn bx-btn-small bx-def-margin-sec-right" onChange="__object__.setFilter(__list_id__, this)">
-					<option value=""><bx_text:_bx_tasks_txt_filter_all /></option>
+					<option value=""><bx_text:_bx_tasks_txt_filter_uncompleted /></option>
+					<option __all__ value="all"><bx_text:_bx_tasks_txt_filter_all /></option>
 					<option __completed__ value="completed"><bx_text:_bx_tasks_txt_filter_completed /></option>
-					<option __uncompleted__ value="uncompleted"><bx_text:_bx_tasks_txt_filter_uncompleted /></option>
 				</select>
-				<a class="bx-btn bx-btn-small bx-def-margin-sec-right" href="javascript:void(0);" onClick="__object__.processTask(__context_id__, __list_id__)"><bx_text:_bx_tasks_txt_new_task /></a> 
+				<a class="bx-btn bx-btn-small bx-def-margin-sec-right" href="javascript:void(0);" onClick="__object__.processTask(__context_id__, __list_id__, this)"><bx_text:_bx_tasks_txt_new_task /></a> 
 			</div>
 			</div>
 		<bx_repeat:tasks>

modules/boonex/tasks/template/css/main.css

@@ -30,7 +30,7 @@
         display:none;
 }
 .bx-tasks-task-checkbox  input[type=checkbox] + label{
-	background:url("/modules/boonex/tasks/template/images/check-circle1.svg") #FFFFFF;
+	background:url("../images/completed.svg") #FFFFFF;
 	height: 24px;
 	width: 24px;
 	display:inline-block;
@@ -39,7 +39,7 @@
 }
 
 .bx-tasks-task-checkbox input[type=checkbox]:checked + label{
-	background:url("/modules/boonex/tasks/template/images/check-circle.svg") #FFFFFF;
+	background:url("../images/uncompleted.svg") #FFFFFF;
 	height: 24px;
 	width: 24px;
 	display:inline-block;
@@ -57,12 +57,22 @@
 .bx-tasks-task .bx-badge, .bx-tasks-task .bx-badges-list{
 	display: inline-block;
 }
-.bx-tasks-tasklist-filter-completed .bx-tasks-task-uncompleted{
+.bx-tasks-tasklist .bx-tasks-task-completed{
 	display: none;
 }
-.bx-tasks-tasklist-filter-uncompleted .bx-tasks-task-completed{
+.bx-tasks-tasklist-filter-all .bx-tasks-task-completed{
+	display: flex;
+}
+.bx-tasks-tasklist-filter-completed .bx-tasks-task-uncompleted{
 	display: none;
 }
+.bx-tasks-tasklist-filter-completed .bx-tasks-task-completed{
+	display: flex;
+}
+
 .ui-autocomplete{
 	z-index: 10000 !important;
+}
+.bx-media-desktop .bx-tasks-form-cnt{
+	width: 800px;
 }