filter by task title and order by lastModified, dueDate, status, process and task
This commit is contained in:
@@ -21,9 +21,7 @@ return [
|
||||
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
|
||||
Illuminate\Queue\QueueServiceProvider::class,
|
||||
Illuminate\Translation\TranslationServiceProvider::class,
|
||||
|
||||
Laravel\Tinker\TinkerServiceProvider::class,
|
||||
|
||||
],
|
||||
|
||||
'aliases' => [
|
||||
|
||||
@@ -3,7 +3,6 @@ use Faker\Generator as Faker;
|
||||
use ProcessMaker\BusinessModel\Cases as BmCases;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\Application::class, function(Faker $faker) {
|
||||
|
||||
$process = \ProcessMaker\Model\Process::all()->random();
|
||||
$statuses = ['DRAFT', 'TO_DO'];
|
||||
$status = $faker->randomElement($statuses);
|
||||
|
||||
@@ -3,7 +3,6 @@ use Faker\Generator as Faker;
|
||||
use ProcessMaker\BusinessModel\Cases as BmCases;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\Delegation::class, function(Faker $faker) {
|
||||
|
||||
$app = factory(\ProcessMaker\Model\Application::class)->create();
|
||||
$process = \ProcessMaker\Model\Process::where('PRO_UID', $app->PRO_UID)->first();
|
||||
$task = $process->tasks->first();
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
use Faker\Generator as Faker;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\Process::class, function(Faker $faker) {
|
||||
|
||||
/**
|
||||
* @todo Determine if we need more base columns populated
|
||||
*/
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
use Faker\Generator as Faker;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\Route::class, function(Faker $faker) {
|
||||
|
||||
return [
|
||||
'PRO_UID' => function() {
|
||||
$process = factory(\ProcessMaker\Model\Process::class)->create();
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
use Faker\Generator as Faker;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\Task::class, function(Faker $faker) {
|
||||
|
||||
return [
|
||||
'PRO_UID' => function() {
|
||||
$process = factory(\ProcessMaker\Model\Process::class)->create();
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
use Faker\Generator as Faker;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\TaskUser::class, function(Faker $faker) {
|
||||
|
||||
return [
|
||||
'TAS_UID' => function() {
|
||||
$task = factory(\ProcessMaker\Model\Task::class)->create();
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
use Faker\Generator as Faker;
|
||||
|
||||
$factory->define(\ProcessMaker\Model\User::class, function(Faker $faker) {
|
||||
|
||||
return [
|
||||
'USR_UID' => G::generateUniqueID(),
|
||||
'USR_USERNAME' => $faker->unique()->userName,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -50,7 +50,7 @@ $filterStatus = isset($_REQUEST["filterStatus"]) ? strtoupper($_REQUEST["filterS
|
||||
// What user
|
||||
$user = isset($_REQUEST["user"]) ? $_REQUEST["user"] : "";
|
||||
|
||||
// What search???
|
||||
// What keywords to search
|
||||
$search = isset($_REQUEST["search"]) ? $_REQUEST["search"] : "";
|
||||
|
||||
// What kind of action
|
||||
|
||||
@@ -24,5 +24,4 @@ class Application extends Model
|
||||
{
|
||||
return $this->hasOne(User::class, 'APP_CUR_USER', 'USR_UID');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -17,7 +17,6 @@ class Process extends Model
|
||||
// Our custom timestamp columns
|
||||
const CREATED_AT = 'PRO_CREATE_DATE';
|
||||
const UPDATED_AT = 'PRO_UPDATE_DATE';
|
||||
|
||||
/**
|
||||
* Retrieve all applications that belong to this process
|
||||
*/
|
||||
@@ -26,7 +25,6 @@ class Process extends Model
|
||||
return $this->hasMany(Application::class, 'PRO_ID', 'PRO_ID');
|
||||
}
|
||||
|
||||
|
||||
public function tasks()
|
||||
{
|
||||
return $this->hasMany(Task::class, 'PRO_UID', 'PRO_UID');
|
||||
|
||||
@@ -17,6 +17,5 @@ class User extends Model
|
||||
public function delegations()
|
||||
{
|
||||
return $this->hasMany(Delegation::class, 'USR_ID', 'USR_ID');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user