better frontend with dataset files

app/Http/Controllers/Frontend/PagesController.php

@@ -28,9 +28,28 @@ class PagesController extends Controller
      */
     public function show($id): View
     {
-        $document = Dataset::findOrFail($id);
+        $dataset = Dataset::findOrFail($id);
-        $document->load('titles');
+        $dataset->load('titles');
-        $document->load('abstracts');
+        $dataset->load('abstracts');
-        return view('frontend.dataset.show', compact('document'));
+
+        $authors = $dataset->authors()
+        ->orderBy('link_documents_persons.sort_order', 'desc')
+        ->get();
+
+        $contributors = $dataset->contributors()
+        ->orderBy('link_documents_persons.sort_order', 'desc')
+        ->get();
+
+        $submitters = $dataset->persons()
+        ->wherePivot('role', 'submitter')
+        ->orderBy('link_documents_persons.sort_order', 'desc')
+        ->get();
+
+        // $authors = $dataset->persons()
+        // ->wherePivot('role', 'author')
+        // ->orderBy('link_documents_persons.sort_order', 'desc')
+        // ->get();
+
+        return view('frontend.dataset.show', compact('dataset', 'authors', 'contributors', 'submitters'));
     }
 }

app/Http/Controllers/Publish/IndexController.php

@@ -376,7 +376,180 @@ class IndexController extends Controller
 
             return response()->json(array(
                 'success' => true,
-                'redirect' =>  route('settings.document', ['state' => $dataset->server_state]),
+                //'redirect' =>  route('settings.document.edit', ['id' => $dataset->server_state]),
+                'redirect' =>  route('settings.document.edit', ['id' => $dataset->id]),
+            ));
+        } else {
+            //TODO Handle validation error
+            //pass validator errors as errors object for ajax response
+            return response()->json([
+                'success' => false,
+                'errors' => $validator->errors()->all(),
+            ], 422);
+        }
+    }
+
+    public function storeTest1(Request $request)
+    {
+        $data = $request->all();
+        // $validatedData = $this->validate($request, [
+        //     'type' => 'required|min:4',
+        //     'rights' => 'required|boolean|in:1',
+        // ]);
+        $rules = [
+            'server_state' => 'required',
+            'type' => 'required|min:5',
+            'rights' => 'required|boolean|in:1',
+            'belongs_to_bibliography' => 'required|boolean',
+            'title_main.value' => 'required|min:5',
+            'title_main.language' => 'required',
+            'abstract_main.value' => 'required|min:5',
+            'abstract_main.language' => 'required',
+        ];
+        if (null != $request->file('files')) {
+            $files = count($request->file('files')) - 1;
+            foreach (range(0, $files) as $index) {
+                // $rules['files.' . $index] = 'image|max:2048';
+                $rules['files.' . $index . '.file'] = ['required', 'file', new RdrFiletypes(), new RdrFilesize()];
+            }
+        }
+        $validator = Validator::make($request->all(), $rules);
+        if ($validator->passes()) {
+            //store dataset todo
+            //$data = $request->all();
+            $input = $request->except('files', 'licenses', 'abstract_main', 'title_main', 'references');
+            // array_push($input, "Himbeere");
+            $dataset = new Dataset($input);
+
+            DB::beginTransaction(); //Start transaction!
+            try {
+                // $dataset->save();
+               
+                //store related files
+                if (isset($data['files'])) {
+                    foreach ($data['files'] as $uploadedFile) {
+                        $file = $uploadedFile['file'];
+                        $label = urldecode($uploadedFile['label']);
+                        $sorting = $uploadedFile['sorting'];
+                        $fileName = "file-" . time() . '.' . $file->getClientOriginalExtension();
+                        $mimeType = $file->getMimeType();
+                        $datasetFolder = 'files/' . $dataset->id;
+                        // $path = $file->storeAs($datasetFolder, $fileName);
+                        // $size = Storage::size($path);
+                        //$path = Storage::putFile('files', $image, $fileName);
+                        // $file = new File([
+                        //     'path_name' => $path,
+                        //     'file_size' => $size,
+                        //     'mime_type' => $mimeType,
+                        //     'label' => $label,
+                        //     'sort_order' => $sorting,
+                        //     'visible_in_frontdoor' => 1,
+                        //     'visible_in_oai' => 1
+                        // ]);
+                        //$test = $file->path_name;
+                        // $dataset->files()->save($file);
+                        // $file->createHashValues();
+                    }
+                }
+
+                 //store licenses:
+                 $licenses = $request->input('licenses');
+                //  $dataset->licenses()->sync($licenses);
+
+                //store authors
+                if (isset($data['authors'])) {
+                    $data_to_sync = [];
+                    foreach ($request->get('authors') as $key => $person_id) {
+                        $pivot_data = ['role' => 'author', 'sort_order' => $key + 1];
+                        // if ($galery_id == $request->get('mainPicture')) $pivot_data = ['main' => 1];
+                        $data_to_sync[$person_id] = $pivot_data;
+                    }
+                    // $dataset->persons()->sync($data_to_sync);
+                }
+
+                //store contributors
+                if (isset($data['contributors'])) {
+                    $data_to_sync = [];
+                    foreach ($request->get('contributors') as $key => $contributor_id) {
+                        $pivot_data = ['role' => 'contributor', 'sort_order' => $key + 1];
+                        $data_to_sync[$contributor_id] = $pivot_data;
+                    }
+                    // $dataset->persons()->sync($data_to_sync);
+                }
+                
+                //store submitters
+                if (isset($data['submitters'])) {
+                    $data_to_sync = [];
+                    foreach ($request->get('submitters') as $key => $submitter_id) {
+                        $pivot_data = ['role' => 'submitter', 'sort_order' => $key + 1];
+                        $data_to_sync[$submitter_id] = $pivot_data;
+                    }
+                    // $dataset->persons()->sync($data_to_sync);
+                }
+
+                
+                //save main title:
+                if (isset($data['title_main'])) {
+                    $formTitle = $request->input('title_main');
+                    $title = new Title();
+                    $title->value = $formTitle['value'];
+                    $title->language = $formTitle['language'];
+                    // $dataset->addMainTitle($title);
+                }
+
+                //save main abstract:
+                if (isset($data['abstract_main'])) {
+                    $formAbstract = $request->input('abstract_main');
+                    $abstract = new Title();
+                    $abstract->value = $formAbstract['value'];
+                    $abstract->language = $formAbstract['language'];
+                    // $dataset->addMainAbstract($abstract);
+                }
+
+                //save references
+                if (isset($data['references'])) {
+                    foreach ($request->get('references') as $key => $reference) {
+                        $dataReference = new DatasetReference($reference);
+                        // $dataset->references()->save($dataReference);
+                    }
+                }
+                                 
+                // $error = 'Always throw this error';
+                // throw new \Exception($error);
+
+                // all good//commit everything
+                // DB::commit();
+            } catch (\Exception $e) {
+                DB::rollback();
+                if (isset($datasetFolder)) {
+                    Storage::deleteDirectory($datasetFolder);
+                }
+                return response()->json([
+                    'success' => false,
+                    'error' => [
+                        'code' => $e->getCode(),
+                        'message' => $e->getMessage(),
+                    ],
+                ], 422);
+                //throw $e;
+            } catch (\Throwable $e) {
+                DB::rollback();
+                if (isset($datasetFolder)) {
+                    Storage::deleteDirectory($datasetFolder);
+                }
+                return response()->json([
+                    'success' => false,
+                    'error' => [
+                        'code' => $e->getCode(),
+                        'message' => $e->getMessage(),
+                    ],
+                ], 422);
+                //throw $e;
+            }
+
+            return response()->json(array(
+                'success' => true,
+                'redirect' =>  route('settings.document.edit', ['id' => $dataset->server_state]),
             ));
         } else {
             //TODO Handle validation error

app/Models/Dataset.php

@@ -9,6 +9,7 @@ use App\Models\Project;
 use App\Models\Title;
 use App\Models\Person;
 use App\Models\XmlCache;
+use App\Models\File;
 use Illuminate\Database\Eloquent\Model;
 
 class Dataset extends Model
@@ -160,7 +161,7 @@ class Dataset extends Model
 
     public function files()
     {
-        return $this->hasMany(\App\Models\File::class, 'document_id', 'id');
+        return $this->hasMany(File::class, 'document_id', 'id');
     }
 
     public function references()

public/backend/style.css

@@ -474,8 +474,8 @@ a:hover { text-decoration: none; }*/
 }
 /*table { width: 100%; margin: 2em 0; }*/
 .pure-table a {
-    color: #333;
+    color: #005F6A;
-    text-decoration:underline;
+    text-decoration:none;
 }
 
 .pure-table a:hover {

public/css/styles.css

@@ -608,7 +608,7 @@ a:hover { text-decoration: none; }*/
 }
 /*table { width: 100%; margin: 2em 0; }*/
 .pure-table a {
-    color: #333;
+    color: #005F6A;
     text-decoration: none;
 }
 

resources/assets/js/components/Dataset.vue

@@ -0,0 +1,44 @@
+<script>
+import Vue from "vue";
+
+let dataset = new Vue({
+  data: function() {
+    return {
+      type: "",
+      state: "",
+      rights: null,
+      project_id: "",
+
+      creating_corporation: "GBA",
+      embargo_date: "",
+      belongs_to_bibliography: 0,
+
+      title_main: {
+        value: "",
+        language: ""
+      },
+      abstract_main: {
+        value: "",
+        language: ""
+      },
+      checkedAuthors: [],
+      checkedLicenses: [], // [],
+      files: [],
+      references: [],
+      checkedContributors: [],
+      checkedSubmitters: [],
+
+      persons: [],
+      contributors: [],
+      submitters: []
+    };
+  },
+  created() {
+    let json = JSON.stringify(this.$data);
+    this.reset = () => {
+      Object.assign(this.$data, JSON.parse(json));
+    };
+  }
+});
+export { dataset };
+</script>

resources/assets/js/datasetPublish.js

@@ -30,6 +30,7 @@ import axios from 'axios';
 //Vue.component('my-autocomplete', require('./components/MyAutocomplete.vue'));
 import MyAutocomplete from './components/MyAutocomplete.vue';
 import VeeValidate from 'vee-validate';
+import { dataset } from './components/Dataset';
 // import { Validator } from 'vee-validate';
 
 Vue.use(VeeValidate);
@@ -46,41 +47,42 @@ const app = new Vue({
                 // { qty: 2, value: "Something else", language: 20, type: "additional", sort_order: 0 },
             ],
             serrors: [],
+            
             uploadedFiles: [],
             uploadError: null,
             currentStatus: null,
             uploadFieldName: 'photos',            
             fileCount: 0,
-            persons: [],
+            redirectLink : null,
-            contributors: [],
+            
-            submitters: [],
 
             step: 1,
-            dataset: {
+            dataset : dataset
-                type: '',
+            // dataset: {
-                state: '',
+            //     type: '',
-                rights: null,
+            //     state: '',
-                project_id: '',
+            //     rights: null,
+            //     project_id: '',
 
-                creating_corporation: "GBA",
+            //     creating_corporation: "GBA",
-                embargo_date: '',
+            //     embargo_date: '',
-                belongs_to_bibliography: 0,
+            //     belongs_to_bibliography: 0,
 
-                title_main: {
+            //     title_main: {
-                    value: '',
+            //         value: '',
-                    language: ''
+            //         language: ''
-                },
+            //     },
-                abstract_main: {
+            //     abstract_main: {
-                    value: '',
+            //         value: '',
-                    language: ''
+            //         language: ''
-                },
+            //     },
-                checkedAuthors: [],
+            //     checkedAuthors: [],
-                checkedLicenses: [],// [],
+            //     checkedLicenses: [],// [],
-                files: [],
+            //     files: [],
-                references: [],
+            //     references: [],
-                checkedContributors: [],
+            //     checkedContributors: [],
-                checkedSubmitters: [],
+            //     checkedSubmitters: [],
-            }
+            // }
         }
     },   
     created: function () {
@@ -121,6 +123,11 @@ const app = new Vue({
             this.currentStatus = STATUS_INITIAL;
             this.uploadedFiles = [];
             this.uploadError = null;
+            this.dataset.reset();//reset methods will trigger property changed.
+            this.step = 1;
+        },
+        editNewDataset() {
+            window.location = this.redirectLink;
         },
         resetDropbox() {
             // reset form to initial state
@@ -128,7 +135,9 @@ const app = new Vue({
             this.dataset.files = [];
         },
         save() {
+            // upload data to the server
             var _this = this;
+            this.currentStatus = STATUS_SAVING;
             this.serrors = [];
             /*
            Initialize the form data
@@ -201,14 +210,15 @@ const app = new Vue({
                     // this.items = response.data;          
                     //Vue.set(app.skills, 1, "test55");
                     _this.currentStatus = STATUS_SUCCESS;
-
+                    _this.redirectLink = response.data.redirect;
-                    if (response.data.redirect) {
+                    // if (response.data.redirect) {
-                        window.location = response.data.redirect;
+                    //     window.location = response.data.redirect;
-                    }
+                    // }
                 })
                 .catch((error) => {
                     // this.loading = false;
-                    // console.log("test");
+                    this.uploadError = error.response;
+                    console.log('FAILURE!!');
                     let errorObject = JSON.parse(JSON.stringify(error));
                     // console.log(errorObject);
                     if (errorObject.response.data.errors) {
@@ -254,6 +264,7 @@ const app = new Vue({
             this.dataset.references.splice(key, 1);
         },
         filesChange(fieldName, fileList) {
+            this.fileCount = fileList.length
             // this.dataset.files = this.$refs.files.files; 
             let uploadedFiles = fileList;
 
@@ -275,24 +286,24 @@ const app = new Vue({
         onAddAuthor(person) {
             //if person is not in person array
             //if (this.persons.includes(person) == false) {
-            if (this.persons.filter(e => e.id === person.id).length == 0) {    
+            if (this.dataset.persons.filter(e => e.id === person.id).length == 0) {    
-                this.persons.push(person);
+                this.dataset.persons.push(person);
                 this.dataset.checkedAuthors.push(person.id);
             }
         },
         onAddContributor(person) {
             //if person is not in contributors array
             //if (this.contributors.includes(person) == false) {
-            if (this.contributors.filter(e => e.id === person.id).length == 0) {    
+            if (this.dataset.contributors.filter(e => e.id === person.id).length == 0) {    
-                this.contributors.push(person);
+                this.dataset.contributors.push(person);
                 this.dataset.checkedContributors.push(person.id);
             }
         },
         onAddSubmitter(person) {
             //if person is not in submitters array
             //if (this.submitters.includes(person) == false) {
-            if (this.submitters.filter(e => e.id === person.id).length == 0) {    
+            if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) {    
-                this.submitters.push(person);
+                this.dataset.submitters.push(person);
                 this.dataset.checkedSubmitters.push(person.id);
             }
         },

resources/views/frontend/dataset/dataset.blade.php

@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <h1 class="title">Documents</h1>
+    <h1 class="title">Datasets</h1>
 
     <br><br>
 
@@ -10,7 +10,7 @@
 
         <thead>
             <th>id</th>
-            <th>document type</th>
+            <th>dataset type</th>
             <!-- <th>Category</th>
             <th>Shelf</th> -->
 
@@ -18,11 +18,13 @@
 
         <tbody>
             
-            @foreach($documents as $document)
+            @foreach($documents as $dataset)
             
                 <tr>					
-                    <td>{{ $document->id }}</td>
+                    <td>                        
-                    <td>{{ $document->type }}</td>
+                        <a href="{{ route('frontend.dataset.show', ['id' => $dataset->id]) }}"> {{ $dataset->id }} </a> 
+                    </td>
+                    <td>{{ $dataset->type }}</td>
                     <!-- <td>
                         if($book->stock > 0)
                             Available

resources/views/frontend/dataset/show.blade.php

@@ -1,33 +1,70 @@
 @extends('layouts.app') 
-
 @section('content')
 
 <div>
-  <div id="titlemain-wrapper">
-    <div class="frontdoor_pagination">
-    {{-- <a id="pagination-link-hitlist" href="{{ route('settings.document') }}">BACK</a> --}}
-		<a href="{{ route('frontend.datasets') }}" class="pure-button">
-			<span class="glyphicon glyphicon-chevron-left" ></span> BACK
-		</a>		
 
-    </div>
+  <section class="post">
-    @foreach ($document->titles as $title)
+      <header class="post-header">
-      <h2 class="titlemain"> {{ $title->value }}</h2>
-    @endforeach
-  </div>
         
-  <div id="result-data">
+      </header>
-    <div id="abstract">
+      <div class="blog-meta">
-      <ul>
+          created: <?= $dataset->created_at->toDayDateTimeString()  ?>
-        @foreach ($document->abstracts as $abstract)
+      </div>
-            <li class="abstract preserve-spaces"> {{ $abstract->value }}</p>
+      <div class="post-description">
-        @endforeach
+          {{-- @foreach ($dataset->authors as $author)
-      </ul>
+          <em>Author: {{ $author->full_name }}</em>
-    </div>
+          <br /> 
+          @endforeach  --}}
+          @foreach ($dataset->titles as $title)
+          <em>Main Title: {{ $title->value }}</em>
+          <br /> 
+          @endforeach
+          @foreach ($dataset->abstracts as $abstract)
+          <em>Abstract: {{ $abstract->value }}</em>
+          <br /> 
+          @endforeach
+          @foreach ($authors as $author)
+          <em>Author: {{ $author->full_name }}</em>
+          <br /> 
+          @endforeach
+          @foreach ($contributors as $contributor)
+          <em>Contributor: {{ $contributors->full_name }}</em>
+          <br /> 
+          @endforeach
+          @foreach ($submitters as $submitter)
+          <em>Contributor: {{ $submitter->full_name }}</em>
+          <br /> 
+          @endforeach
 
-  </div>
+          <table id="items" class="pure-table pure-table-horizontal">
+              <thead>
+                  <tr>
+                      <th>Path Name</th>
+                      <th>Label</th>
+                  </tr>
+              </thead>    
+              <tbody>
+                  @foreach($dataset->files as $key => $file)
+                  <tr>
+                      <td>
+                          @if($file->exists() === true)
+                          <a href="{{ route('settings.file.download', ['id' => $file->id]) }}"> {{ $file->path_name }} </a> 
+                          @else
+                          <span class="alert">missing file: {{ $file->path_name }}</span> 
+                          @endif
+                      </td>
+                      <td> {{ $file->label }} </td>
+                  </tr>
+                  @endforeach
+              </tbody>
+          </table>
+
+      </div>
+
+  </section>
 
 
- </div>
+</div>
+
 
 @stop

resources/views/publish/create-step1.blade.php

@@ -16,7 +16,7 @@
         <main class="steps pure-form" enctype="multipart/form-data">
             {{ csrf_field() }}
 
-            <div v-if="step === 1" data-vv-scope="step-1">
+            <div v-if="step === 1 && isInitial" data-vv-scope="step-1">
                 <h1>Step One</h1>
 
                 <div class="form-group">
@@ -71,7 +71,7 @@
                 </div>
             </div>
 
-            <div v-if="step === 2" data-vv-scope="step-2">
+            <div v-if="step === 2 && isInitial" data-vv-scope="step-2">
                 <h1>Step Two</h1>
                 <fieldset id="fieldset-general">
                     <legend>General</legend>
@@ -250,7 +250,7 @@
                 </div>
             </div>
 
-            <div v-if="step === 3" data-vv-scope="step-3">
+            <div v-if="step === 3 && isInitial" data-vv-scope="step-3">
                 <h1>Select authors, contributors, submitters</h1>
                 
                 <fieldset id="fieldset-general">
@@ -263,7 +263,7 @@
                         </div>
                         <div class="pure-u-1 pure-u-md-1-2 pure-div">
                             <div class="pure-control-group checkboxlist">
-                                <label v-for="(person, index) in persons" :for="person.id" class="pure-checkbox">                           
+                                <label v-for="(person, index) in dataset.persons" :for="person.id" class="pure-checkbox">                           
                                                         <input type="checkbox" name="persons" v-bind:value="person.id"  v-model="dataset.checkedAuthors"  class="form-check-input" data-vv-scope="step-3">
                                                         @{{ person.full_name }}                               
                                                     </label>
@@ -284,7 +284,7 @@
                         </div>
                         <div class="pure-u-1 pure-u-md-1-2 pure-div">
                             <div class="pure-control-group checkboxlist">
-                                <label v-for="(contributor, index) in contributors" :for="contributor.id" class="pure-checkbox">                           
+                                <label v-for="(contributor, index) in dataset.contributors" :for="contributor.id" class="pure-checkbox">                           
                                                         <input type="checkbox" name="contributors" v-bind:value="contributor.id"  v-model="dataset.checkedContributors"  class="form-check-input" data-vv-scope="step-3">
                                                         @{{ contributor.full_name }}                               
                                                     </label>
@@ -303,7 +303,7 @@
                         </div>
                         <div class="pure-u-1 pure-u-md-1-2 pure-div">
                             <div class="pure-control-group checkboxlist">
-                                <label v-for="(submitter, index) in submitters" :for="submitter.id" class="pure-checkbox">                           
+                                <label v-for="(submitter, index) in dataset.submitters" :for="submitter.id" class="pure-checkbox">                           
                                                         <input type="checkbox" name="submitters" v-bind:value="submitter.id"  v-model="dataset.checkedSubmitters"  class="form-check-input" data-vv-scope="step-3">
                                                         @{{ submitter.full_name }}                               
                                                     </label>
@@ -327,7 +327,7 @@
                 </div>
             </div>
 
-            <div v-if="step === 4" data-vv-scope="step-4">
+            <div v-if="step === 4 && (isInitial || isSaving)" data-vv-scope="step-4">
                 <h1>File Upload</h1>
 
                 <div class="dropbox">
@@ -383,13 +383,36 @@
 
             </div>
 
-            <div v-if="serrors.length > 0">
+            <!--SUCCESS-->
-                <b>Please correct the following server error(s):</b>
+            <div v-if="isSuccess">
-                <ul class="alert validation-summary-errors">
+                <h2>Uploaded @{{ dataset.files.length }} file(s) successfully.</h2>
-                    <li style="margin-left:5px;" v-for="error in serrors">@{{ error }}</li>
+                <p>
+                <a href="javascript:void(0)" @click="reset()" class="pure-button button-small">Upload new Dataset</a>
+                </p>
+                <p>
+                <a href="javascript:void(0)" @click="editNewDataset()" class="pure-button button-small">@{{ redirectLink }}</a>
+                </p>
+                <ul class="list-unstyled">
+                {{-- <li v-for="item in uploadedFiles">
+                    <img :src="item.url" class="img-responsive img-thumbnail" :alt="item.originalName">
+                </li> --}}
                 </ul>
             </div>
 
+            <!--ERROR-->
+            <div v-if="isFailed">
+                <h2>Uploaded failed.</h2>
+                <p>
+                    <a href="javascript:void(0)" @click="reset()">Try again</a>
+                </p>
+                <div v-if="serrors.length > 0">
+                    <b>Please correct the following server error(s):</b>
+                    <ul class="alert validation-summary-errors">
+                        <li style="margin-left:5px;" v-for="error in serrors">@{{ error }}</li>
+                    </ul>
+                </div>
+            </div>
+
 
         </main>
         {{-- <br/><br/>Debug:@{{ dataset }} --}}