- add publisher_name and publish_id

- extend DatasetExtension wirt PublisherName and PublishId
- adapt migrations

app/Http/Controllers/Publish/EditorController.php

@@ -371,9 +371,19 @@ class EditorController extends Controller
     public function publishUpdate(Request $request, $id)
     {
         $dataset = Dataset::findOrFail($id);
+
+        $max = Dataset::max('publish_id');
+        $publish_id = 0;
+        if ($max != null) {
+            $publish_id = $max +1;
+        } else {
+            $publish_id = $publish_id + 1;
+        }
+
         $input = $request->all();
         $input['server_state'] = 'published';
         $input['server_date_published'] = Carbon::now()->toDateTimeString(); // Produces something like "2019-03-11 12:25:00"
+        $input['publish_id'] = $publish_id;
 
         if ($dataset->update($input)) {
             // event(new PageUpdated($page));

app/Library/Xml/DatasetExtension.php

@@ -85,6 +85,8 @@ trait DatasetExtension
     {
         $fields = array(
             "Id",
+            "PublisherName",
+            "PublishId",
             "ContributingCorporation",
             "CreatingCorporation",
             "Language",

app/Models/Dataset.php

@@ -33,6 +33,8 @@ class Dataset extends Model
         'language',
         'server_state',
         'server_date_published',
+        'publisher_name',
+        'publish_id',
         'creating_corporation',
         'project_id',
         'embargo_date',

database/migrations/2019_08_28_083836_create_documents_table.php

@@ -19,6 +19,7 @@ class CreateDocumentsTable extends Migration
             $table->string('creating_corporation', 255);
             $table->string('publisher_name', 255)->nullable();
             $table->dateTime('embargo_date')->nullable();
+            $table->unsignedInteger('publish_id')->unique()->nullable();
             $table->integer('project_id')->unsigned()->nullable();
             $table->foreign('project_id')->references('id')->on('projects');
             $table->enum(

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

@@ -245,8 +245,6 @@
                 </fieldset>
 
                 <div :class="{'form-group':true, 'has-error':errors.has('step-1.rights')}">
-                    {{-- <legend>Einräumung eines einfachen Nutzungsrechts</legend> --}}  
-                        
                     <label for="rights"> 
                         <input class="form-checkbox" name="rights" id="rights" type="checkbox" v-model="dataset.rights"  v-validate="'required'" data-vv-scope="step-1"> 
                         terms and conditions                        

resources/views/workflow/editor/publish.blade.php

@@ -17,8 +17,10 @@
         </div>
         <div id="app1">
 
-            {!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.editor.publishUpdate', $dataset->id],
+            {!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.editor.publishUpdate',
-            'id' => 'publishForm', 'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' => 'checkForm'])
+            $dataset->id],
+            'id' => 'publishForm', 'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' =>
+            'checkForm'])
             !!}
             <fieldset id="fieldset-General">
 
@@ -36,9 +38,7 @@
                                 @endforeach
                                 <div class="authors">
                                     @foreach($dataset->persons as $author)
-                                       
                                     {{ $author->full_name }}
-                                        
                                     @endforeach
                                 </div>
                                 <input type="hidden" name="selected[]" value="49">
@@ -46,32 +46,28 @@
                         </tr>
                     </tbody>
                 </table>
-                <div class="instruction">
+
-                        Are you sure you want to publish the selected dataset?  
+                <div class="pure-u-1 pure-u-md-1-2 pure-div">
+                    {!! Form::label('publisher_name', 'Publisher Name') !!}
+                    {!! Form::text('publisher_name', 'Geologische Bundesanstalt Österreich', ['readonly', 'class' =>
+                    'pure-u-23-24', ]) !!}
                 </div>
-                    <table>
+                <div class="pure-controls instruction ">
-                            <tbody><tr>
+                    <p>
-                                <td>&nbsp;</td>
+                        Are you sure you want to publish the selected dataset?
-                                <td>
+                    </p>
                     <button type="submit" class="pure-button">
                         <i class="fa fa-share"></i>
                         <span>Set published</span>
                     </button>
                     {{-- <input type="submit" name="sureno" value="No"> --}}
-                                </td>
+
-                            </tr>
+                </div>
-                        </tbody>
-                    </table>
 
             </fieldset>
 
             <br />
-            {{-- <div class="pure-controls">
+
-                <button type="submit" class="pure-button">
-                    <i class="fa fa-share"></i>
-                    <span>Set published</span>
-                </button>
-            </div> --}}
 
             {!! Form::close() !!}
         </div>