diff --git a/module/execution/css/story.css b/module/execution/css/story.css index 5189f5adf3..a1edd4dc01 100644 --- a/module/execution/css/story.css +++ b/module/execution/css/story.css @@ -7,5 +7,5 @@ tbody > tr > td > .btn-icon {margin-right: 4px;} @media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none !important;};} #batchToTask .checkbox-primary {display: inline-block; margin-left: 10px;} th.c-pri{width:50px;} -.c-estimate {width: 40px;} -.c-status {width: 80px;} +.c-estimate {width: 50px;} +.c-status, .c-user {width: 80px;} diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index d85a6b72c7..77630ddbbd 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -19,3 +19,8 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;} .chosen-results > li.has-new-task {position: relative; color: #388E3C;} .chosen-results > li.has-task.highlighted, .chosen-results > li.has-new-task.highlighted {color: #fff;} + +.c-id {width: 30px;} +.c-module {width: 150px;} +.c-story {width: 200px;} +.c-assigned {width: 130px;} diff --git a/module/task/css/batchedit.css b/module/task/css/batchedit.css index e69de29bb2..dd7e102439 100644 --- a/module/task/css/batchedit.css +++ b/module/task/css/batchedit.css @@ -0,0 +1,4 @@ +.c-id {width: 50px;} +.c-pri, .c-record, .c-left {width: 70px;} +.c-reason {width: 100px;} +.c-module, .c-assigned {width: 150px;} diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index a5e48df001..dd91695c77 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -59,19 +59,19 @@
| idAB;?> | -'>task->module?> | +idAB;?> | +'>task->module?> | type != 'ops'):?> -'>task->story;?> | +'>task->story;?> | task->name;?> | -typeAB;?> | -'>task->assignedTo;?> | -'>task->estimateAB;?> | -'>task->estStarted;?> | -'>task->deadline;?> | -'>task->desc;?> | -'>task->pri;?> | +typeAB;?> | +'>task->assignedTo;?> | +'>task->estimateAB;?> | +'>task->estStarted;?> | +'>task->deadline;?> | +'>task->desc;?> | +'>task->pri;?> | task->getFlowExtendFields(); foreach($extendFields as $extendField) echo "{$extendField->name} | "; diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index f67a02544b..dc5831d118 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -53,25 +53,25 @@ js::set('dittoNotice', $dittoNotice);
|---|
| idAB;?> | -'>task->name?> | -'>task->module?> | -'>task->assignedTo;?> | -typeAB;?> | -'>task->status;?> | -'>task->estStarted?> | -'>task->deadline?> | -'>task->pri;?> | -'>task->estimateAB;?> | -'>task->consumedThisTime;?> | -'>task->leftAB?> | -'>task->finishedBy;?> | -'>task->canceledBy;?> | -'>task->closedBy;?> | -'>task->closedReason;?> | +idAB;?> | +'>task->name?> | +'>task->module?> | +'>task->assignedTo;?> | +typeAB; ?> | +'>task->status;?> | +'>task->estStarted?> | +'>task->deadline?> | +'>task->pri;?> | +'>task->estimateAB;?> | +'>task->consumedThisTime;?> | +'>task->leftAB?> | +'>task->finishedBy;?> | +'>task->canceledBy;?> | +'>task->closedBy;?> | +'>task->closedReason;?> | task->getFlowExtendFields(); - foreach($extendFields as $extendField) echo "{$extendField->name} | "; + foreach($extendFields as $extendField) echo "{$extendField->name} | "; ?>
|---|
| idAB;?> | -'>product->branch;?> | -'>testcase->module;?> | -'> testcase->story;?> | +idAB;?> | +'>product->branch;?> | +'>testcase->module;?> | +'> testcase->story;?> | testcase->title;?> | -testcase->type;?> | -'>testcase->pri;?> | -'>testcase->precondition;?> | -'>testcase->keywords;?> | -'>testcase->stage;?> | -'>testcase->review;?> | +testcase->type;?> | +'>testcase->pri;?> | +'>testcase->precondition;?> | +'>testcase->keywords;?> | +'>testcase->stage;?> | +'>testcase->review;?> | testcase->getFlowExtendFields(); - foreach($extendFields as $extendField) echo "{$extendField->name} | "; + foreach($extendFields as $extendField) echo "{$extendField->name} | "; ?>
|---|
| idAB;?> | -'>priAB;?> | -'>statusAB;?> | +idAB;?> | +'>priAB;?> | +'>statusAB;?> | -'>testcase->branch;?> | +'>testcase->branch;?> | -'>testcase->module;?> | -'>testcase->story;?> | +'>testcase->module;?> | +'>testcase->story;?> | testcase->title;?> | -testcase->type;?> | +testcase->type;?> | '>testcase->precondition;?> | -'>testcase->keywords;?> | -'>testcase->stage;?> | +'>testcase->keywords;?> | +'>testcase->stage;?> | testcase->getFlowExtendFields(); - foreach($extendFields as $extendField) echo "{$extendField->name} | "; + foreach($extendFields as $extendField) echo "{$extendField->name} | "; ?>
|---|
| idAB;?> | +idAB;?> | bug->title;?> | -priAB;?> | -bug->type;?> | -statusAB;?> | -bug->assignedTo;?> | -bug->resolvedBy;?> | -bug->resolution;?> | +priAB;?> | +bug->type;?> | +statusAB;?> | +bug->assignedTo;?> | +bug->resolvedBy;?> | +bug->resolution;?> | idAB;?> | -priAB;?> | +priAB;?> | testcase->title;?> | -typeAB;?> | -testtask->lastRunAccount;?> | -testtask->lastRunTime;?> | -testtask->lastRunResult;?> | -testcase->status;?> | -testcase->bugsAB;?> | -testcase->resultsAB;?> | -testcase->stepNumberAB;?> | +typeAB;?> | +testtask->lastRunAccount;?> | +testtask->lastRunTime;?> | +testtask->lastRunResult;?> | +testcase->status;?> | +testcase->bugsAB;?> | +testcase->resultsAB;?> | +testcase->stepNumberAB;?> | actions;?> | diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php index 3b02661ad4..189705a9db 100644 --- a/module/testcase/view/importfromlib.html.php +++ b/module/testcase/view/importfromlib.html.php @@ -34,13 +34,13 @@ idAB);?> -testcase->branch ?> | +testcase->branch ?> | -priAB);?> | +priAB);?> | testcase->title);?> | -testcase->fromModule ?> | -testcase->module ?> | -testcase->type)?> | +testcase->fromModule ?> | +testcase->module ?> | +testcase->type)?> | diff --git a/module/testcase/view/linkcases.html.php b/module/testcase/view/linkcases.html.php index 96639df73a..0bd00d0d17 100644 --- a/module/testcase/view/linkcases.html.php +++ b/module/testcase/view/linkcases.html.php @@ -32,12 +32,12 @@ idAB;?> -priAB;?> | +priAB;?> | testcase->product;?> | testcase->title;?> | -testcase->type;?> | -openedByAB;?> | -statusAB;?> | +testcase->type;?> | +openedByAB;?> | +statusAB;?> | diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php index 54119d7df1..d52eb25916 100644 --- a/module/testcase/view/showimport.html.php +++ b/module/testcase/view/showimport.html.php @@ -30,21 +30,21 @@ $(function()
|---|
| lineNumber?> | -idAB?> | +lineNumber?> | +idAB?> | testcase->title?> | -testcase->module?> | -testcase->story?> | -testcase->pri?> | -testcase->type?> | -testcase->stage?> | +testcase->module?> | +testcase->story?> | +testcase->pri?> | +testcase->type?> | +testcase->stage?> | testcase->precondition?> | -testcase->{$appendField->field}?> | +testcase->{$appendField->field}?> | -+ |
|
|---|