Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust importcard page css.

Browse Source
This commit is contained in:
wangyuting
2023-11-07 03:00:00 +00:00
parent 2117ec6973
commit 87f0f8e458
3 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/config/table.php
+40 -1
View File
@@ -28,7 +28,7 @@ $config->kanban->dtable->card->fieldList['pri']['group'] = 2;
$config->kanban->dtable->card->fieldList['assignedTo']['name'] = 'assignedTo';
$config->kanban->dtable->card->fieldList['assignedTo']['title'] = $lang->kanbancard->assignedTo;
$config->kanban->dtable->card->fieldList['assignedTo']['type'] = 'text';
$config->kanban->dtable->card->fieldList['assignedTo']['type'] = 'user';
$config->kanban->dtable->card->fieldList['assignedTo']['group'] = 3;
$config->kanban->dtable->card->fieldList['begin']['name'] = 'begin';
@@ -40,3 +40,42 @@ $config->kanban->dtable->card->fieldList['end']['name'] = 'end';
$config->kanban->dtable->card->fieldList['end']['title'] = $lang->kanbancard->end;
$config->kanban->dtable->card->fieldList['end']['type'] = 'date';
$config->kanban->dtable->card->fieldList['end']['group'] = 4;
$config->kanban->dtable->plan = new stdclass();
$config->kanban->dtable->plan->fieldList['id']['name'] = 'id';
$config->kanban->dtable->plan->fieldList['id']['title'] = $lang->idAB;
$config->kanban->dtable->plan->fieldList['id']['type'] = 'checkID';
$config->kanban->dtable->plan->fieldList['id']['fixed'] = 'left';
$config->kanban->dtable->plan->fieldList['id']['group'] = 1;
$config->kanban->dtable->plan->fieldList['title']['name'] = 'kanban';
$config->kanban->dtable->plan->fieldList['title']['title'] = $lang->kanban->name;
$config->kanban->dtable->plan->fieldList['title']['type'] = 'title';
$config->kanban->dtable->plan->fieldList['title']['fixed'] = 'left';
$config->kanban->dtable->plan->fieldList['title']['group'] = 1;
$config->kanban->dtable->plan->fieldList['card']['name'] = 'name';
$config->kanban->dtable->plan->fieldList['card']['title'] = $lang->kanbancard->name;
$config->kanban->dtable->plan->fieldList['card']['type'] = 'title';
$config->kanban->dtable->plan->fieldList['card']['fixed'] = 'left';
$config->kanban->dtable->plan->fieldList['card']['group'] = 1;
$config->kanban->dtable->plan->fieldList['pri']['name'] = 'pri';
$config->kanban->dtable->plan->fieldList['pri']['title'] = $lang->kanbancard->pri;
$config->kanban->dtable->plan->fieldList['pri']['type'] = 'pri';
$config->kanban->dtable->plan->fieldList['pri']['group'] = 2;
$config->kanban->dtable->plan->fieldList['assignedTo']['name'] = 'assignedTo';
$config->kanban->dtable->plan->fieldList['assignedTo']['title'] = $lang->kanbancard->assignedTo;
$config->kanban->dtable->plan->fieldList['assignedTo']['type'] = 'text';
$config->kanban->dtable->plan->fieldList['assignedTo']['group'] = 3;
$config->kanban->dtable->plan->fieldList['begin']['name'] = 'begin';
$config->kanban->dtable->plan->fieldList['begin']['title'] = $lang->kanbancard->begin;
$config->kanban->dtable->plan->fieldList['begin']['type'] = 'date';
$config->kanban->dtable->plan->fieldList['begin']['group'] = 4;
$config->kanban->dtable->plan->fieldList['end']['name'] = 'end';
$config->kanban->dtable->plan->fieldList['end']['title'] = $lang->kanbancard->end;
$config->kanban->dtable->plan->fieldList['end']['type'] = 'date';
$config->kanban->dtable->plan->fieldList['end']['group'] = 4;
module/kanban/model.php
+2 -2
View File
@@ -2647,11 +2647,11 @@ class kanbanModel extends model
* @param int $laneID
* @param int $colID
* @param string $type story|task|bug|card
* @param int $cardID
* @param string $cardID
* @access public
* @return void
*/
public function addKanbanCell(int $kanbanID, int $laneID, int $colID, string $type, int $cardID = 0): void
public function addKanbanCell(int $kanbanID, int $laneID, int $colID, string $type, string $cardID = ''): void
{
$cell = $this->dao->select('id, cards')->from(TABLE_KANBANCELL)
->where('kanban')->eq($kanbanID)
module/kanban/ui/importcard.html.php
+16
View File
@@ -14,6 +14,22 @@ jsVar('regionID', $regionID);
jsVar('groupID', $groupID);
jsVar('columnID', $columnID);
jsVar('methodName', $this->app->rawMethod);
$config->kanban->dtable->card->fieldList['title']['map'] = $kanbanPairs;
foreach($cards2Imported as $card)
{
$assignedToList = '';
if($card->assignedTo)
{
foreach(explode(',', $card->assignedTo) as $assignedTo)
{
$userName = zget($users, $assignedTo, '');
if($userName) $assignedToList .= $userName . ' ';
}
$card->assignedTo = $assignedToList;
}
}
featureBar
(
inputGroup