publication workflow: review

app/Http/Controllers/Publish/EditorController.php

@@ -0,0 +1,219 @@
+<?php
+namespace App\Http\Controllers\Publish;
+
+use App\Exceptions\GeneralException;
+use App\Http\Requests\DocumentRequest;
+use App\Http\Controllers\Controller;
+use App\Models\Dataset;
+use App\Models\Project;
+use App\Models\License;
+use App\Models\User;
+use App\Models\Title;
+use App\Models\Description;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
+use Illuminate\Support\Facades\DB;
+
+class EditorController extends Controller
+{
+    public function __construct()
+    {
+        //$this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of released and accepted datasets.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(): View
+    {
+        $user = Auth::user();
+        $user_id = $user->id;
+
+        $builder = Dataset::query();
+        //"select * from [documents] where [server_state] in (?) or ([server_state] = ? and [editor_id] = ?)"
+        $datasets = $builder
+        ->where('server_state', 'released')
+        // ->whereIn('server_state', ['released'])
+        ->orWhere(function ($query) use ($user_id) {
+            $query->where('server_state', 'editor_accepted')
+                  ->where('editor_id', $user_id);
+        })->get();
+        return view('workflow.editor.index', compact('datasets'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\View\View
+     */
+    public function accept($id): View
+    {
+        $dataset = Dataset::with('user:id,login')->findOrFail($id);
+
+        return view('workflow.editor.accept', [
+            'dataset' => $dataset,
+        ]);
+    }
+
+    public function acceptUpdate(Request $request, $id)
+    {
+        $dataset = Dataset::findOrFail($id);
+      
+        try {
+            $dataset->setServerState("editor_accepted");
+            $user = Auth::user();
+            $dataset->editor()->associate($user)->save();
+            $dataset->save();
+            // return redirect()->back();
+            return redirect()->route('publish.workflow.editor.index');
+        } catch (Exception $e) {
+            throw new GeneralException(trans('exceptions.publish.accept.update_error'));
+        }
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id): View
+    {
+        $dataset = Dataset::findOrFail($id);
+        $dataset->load('licenses', 'titles', 'abstracts', 'files');
+
+        $projects = Project::pluck('label', 'id');
+
+        $datum = date('Y-m-d');
+        $nowYear = substr($datum, 0, 4);
+        $years = array();
+        for ($jahr = 1990; $jahr <= $nowYear; $jahr++) {
+            $years[$jahr] = $jahr;
+        }
+
+        $languages = DB::table('languages')
+            ->where('active', true)
+            ->pluck('part1', 'part1');
+
+        //$options = License::all();
+        $options = License::all('id', 'name_long');
+        $checkeds = $dataset->licenses->pluck('id')->toArray();
+    
+        return view(
+            'workflow.editor.edit',
+            compact('dataset', 'projects', 'options', 'checkeds', 'years', 'languages')
+        );
+    }
+
+    //https://stackoverflow.com/questions/17480200/using-laravel-how-do-i-create-a-view-that-will-update-a-one-to-many-relationshi?rq=1
+    // https://laravel.io/forum/06-11-2014-how-to-save-eloquent-model-with-relations-in-one-go
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(DocumentRequest $request, $id): RedirectResponse
+    {
+        $dataset = Dataset::findOrFail($id);
+        //$input = $request->all();
+        $input = $request->except('abstracts', 'licenses', 'titles', '_method', '_token');
+        // foreach ($input as $key => $value) {
+        //     $dataset[$key] = $value;
+        // }
+        //$dataset->update($input);
+        // $dataset->type = $input['type'];
+        // $dataset->thesis_year_accepted = $input['thesis_year_accepted'];
+        // $dataset->project_id = $input['project_id'];
+        // $dataset->save();
+
+        $licenses = $request->input('licenses');
+        //$licenses = $input['licenses'];
+        $dataset->licenses()->sync($licenses);
+
+        //save the titles:
+        $titles = $request->input('titles');
+        if (is_array($titles) && count($titles) > 0) {
+            foreach ($titles as $key => $formTitle) {
+                $title = Title::findOrFail($key);
+                $title->value = $formTitle['value'];
+                $title->language = $formTitle['language'];
+                $title->save();
+            }
+        }
+
+        //save the abstracts:
+        $abstracts = $request->input('abstracts');
+        if (is_array($abstracts) && count($abstracts) > 0) {
+            foreach ($abstracts as $key => $formAbstract) {
+                $abstract = Description::findOrFail($key);
+                $abstract->value = $formAbstract['value'];
+                $abstract->language = $formAbstract['language'];
+                $abstract->save();
+            }
+        }
+
+        if (!$dataset->isDirty(dataset::UPDATED_AT)) {
+            $time = new \Illuminate\Support\Carbon();
+            $dataset->setUpdatedAt($time);
+        }
+        // $dataset->save();
+        if ($dataset->update($input)) {
+            //event(new DatasetUpdated($dataset));
+            session()->flash('flash_message', 'You have updated 1 dataset!');
+            return redirect()->route('publish.workflow.editor.index');
+        }
+        throw new GeneralException(trans('exceptions.backend.dataset.update_error'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\View\View
+     */
+    public function approve($id): View
+    {
+        $dataset = Dataset::with('user:id,login')->findOrFail($id);
+       
+        $reviewers = User::whereHas('roles', function ($q) {
+            $q->where('name', 'reviewer');
+        })->pluck('login', 'id');
+
+        return view('workflow.editor.approve', [
+            'dataset' => $dataset,
+            'reviewers' => $reviewers,
+        ]);
+    }
+    public function approveUpdate(Request $request, $id)
+    {
+        // $dataset = Dataset::findOrFail($id);
+        // try {
+        //     $dataset->setServerState("approved");
+        //     $user = Auth::user();
+        //     $dataset->reviewer()->associate($user)->save();
+        //     $dataset->save();
+        //     // return redirect()->back();
+        //     return redirect()->route('publish.workflow.editor.index');
+        // } catch (Exception $e) {
+        //     throw new GeneralException(trans('exceptions.publish.approve.update_error'));
+        // }
+        $dataset = Dataset::findOrFail($id);
+        $input = $request->all();
+        $input['server_state'] = 'approved';
+
+        if ($dataset->update($input)) {
+            // event(new PageUpdated($page));
+            return redirect()
+                ->route('publish.workflow.editor.index')
+                ->with('flash_message', 'You have approved one dataset!');
+        }
+        throw new GeneralException(trans('exceptions.publish.approve.update_error'));
+    }
+}

app/Http/Controllers/Publish/ReviewController.php

@@ -0,0 +1,37 @@
+<?php
+namespace App\Http\Controllers\Publish;
+
+use App\Exceptions\GeneralException;
+use App\Http\Controllers\Controller;
+use App\Models\Dataset;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
+
+class ReviewController extends Controller
+{
+    public function __construct()
+    {
+        //$this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of released and accepted datasets.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index() : View
+    {
+        $user = Auth::user();
+        $userId = $user->id;
+
+        $builder = Dataset::query();
+        //"select * from [documents] where [server_state] in (?) or ([server_state] = ? and [editor_id] = ?)"
+        $datasets = $builder
+        ->where('server_state', 'approved')
+        ->where('reviewer_id', $userId)
+        ->get();
+        return view('workflow.review.index', compact('datasets'));
+    }
+}

app/Http/Controllers/Publish/SubmitController.php

@@ -2,10 +2,6 @@
 namespace App\Http\Controllers\Publish;
 
 use App\Exceptions\GeneralException;
-// use App\Http\Requests\ProjectRequest;
-// use App\Models\Project;
-// use Illuminate\Http\RedirectResponse;
-// use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Dataset;
 use App\Models\User;
@@ -15,7 +11,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\View\View;
 
-class WorkflowController extends Controller
+class SubmitController extends Controller
 {
     public function __construct()
     {
@@ -29,11 +25,11 @@ class WorkflowController extends Controller
 
         $builder = Dataset::query();
         $myDatasets = $builder
-            ->whereIn('server_state', ['inprogress', 'released', 'editor_accepted'])
+            ->whereIn('server_state', ['inprogress', 'released', 'editor_accepted', 'approved'])
             ->where('account_id', $user_id)
             ->with('user:id,login')
             ->get();
-        return view('workflow.index', [
+        return view('workflow.submitter.index', [
             'datasets' => $myDatasets,
         ]);
     }
@@ -47,16 +43,13 @@ class WorkflowController extends Controller
     public function release($id): View
     {
         $dataset = Dataset::with('user:id,login')->findOrFail($id);
-        // $editors = User::whereHas('roles', function ($q) {
-        //     $q->where('login', 'admin');
-        // })->pluck('login', 'id');
-        $editors = User::with(['roles' => function ($query) {
-            $query->where('name', 'editor');
-        }])
-            ->pluck('login', 'id');
-        //$editors = Role::where('name', 'reviewer')->first()->users;
+        
+        $editors = User::whereHas('roles', function ($q) {
+            $q->where('name', 'editor');
+        })->pluck('login', 'id');
+        //$editors = Role::where('name', 'editor')->first()->users()->get();
 
-        return view('workflow.release', [
+        return view('workflow.submitter.release', [
             'dataset' => $dataset,
             'editors' => $editors,
         ]);
@@ -110,82 +103,6 @@ class WorkflowController extends Controller
         }
     }
 
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function editorIndex()
-    {
-        $user = Auth::user();
-        $user_id = $user->id;
-
-        $builder = Dataset::query();
-        $datasets = $builder
-        //->where('server_state', 'inprogress')
-        ->whereIn('server_state', ['released'])
-        //->where('server_state', 'editor_accepted')
-        ->orWhere(function ($query) use ($user_id) {
-            $query->where('server_state', 'editor_accepted')
-                  ->where('editor_id', $user_id);
-        })
-        ->get();
-        return view('workflow.editor_index', compact('datasets'));
-    }
-
-     /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\View\View
-     */
-    public function accept($id): View
-    {
-        $dataset = Dataset::with('user:id,login')->findOrFail($id);
-        // $editors = User::whereHas('roles', function ($q) {
-        //     $q->where('login', 'admin');
-        // })->pluck('login', 'id');
-        $editors = User::with(['roles' => function ($query) {
-            $query->where('name', 'editor');
-        }])
-            ->pluck('login', 'id');
-        //$editors = Role::where('name', 'reviewer')->first()->users;
-
-        return view('workflow.accept', [
-            'dataset' => $dataset,
-            'editors' => $editors,
-        ]);
-    }
-
-    public function acceptUpdate(Request $request, $id)
-    {
-        $dataset = Dataset::findOrFail($id);
-      
-        try {
-            $dataset->setServerState("editor_accepted");
-            $user = Auth::user();
-            $dataset->editor()->associate($user)->save();
-            $dataset->save();
-            return redirect()->back();
-            //return redirect()->route('settings.review.index');
-        } catch (Exception $e) {
-            throw new GeneralException(trans('exceptions.publish.accept.update_error'));
-        }
-    }
-
-    // public function release()
-    // {
-    //     $user = Auth::user();
-    //     $user_id = $user->id;
-
-    //     $builder = Dataset::query();
-    //     $datasets = $builder
-    //     ->where('server_state', 'inprogress')
-    //     ->where('account_id', $user_id)
-    //     ->get();
-    //     return view('workflow.release', compact('datasets'));
-    // }
-
     public function changestate($id, $targetState)
     {
         // $docId = $this->getRequest()->getParam('docId');

app/Models/Dataset.php

@@ -36,7 +36,9 @@ class Dataset extends Model
         'project_id',
         'embargo_date',
         'belongs_to_bibliography',
-        'editor_id'
+        'editor_id',
+        'preferred_editor',
+        'reviewer_id'
     ];
     //protected $guarded = [];
         /**
@@ -95,14 +97,22 @@ class Dataset extends Model
         return $this->belongsTo(User::class, 'account_id', 'id');
     }
 
-         /**
-     * Get the account that the dataset belongs to
+    /**
+     * Get the editor of the dataset
      */
     public function editor()
     {
         return $this->belongsTo(User::class, 'editor_id', 'id');
     }
 
+    /**
+     * Get the editor of the dataset
+     */
+    public function reviewer()
+    {
+        return $this->belongsTo(User::class, 'reviewer_id', 'id');
+    }
+
     public function collections()
     {
         return $this