+ composer updates

+ CreatingCorporation nur readonly
+  doctypes zusätzlich: 'mixedtype' => 'Mixed Type'
+ bei einer Fehlermeldung beim Submit: kein Reset mehr... nur mehr "retry: edit inputs"
+ Eingabe der Contributor gleich nach der Eingabe der Creator
+ Projekteingabe beim Submitten entfernt
+ Keyword wird nun mit einer default language angelegt
+ elevation und depth-Angaben in Meter (im Label)
+ 'server_date_modified' wird nun auch aktualisiert beim automatischen reject,
falls der Reviewer länger als 14 Tage den Datensatz nicht kontrolliert
+ GeoLocation hat nun eine Doppelbindung -> nicht mehr readonly
This commit is contained in:
Arno Kaimbacher 2019-06-21 16:00:51 +02:00
parent dabb905111
commit 0dc6ca034e
21 changed files with 1092 additions and 864 deletions

View file

@ -59,7 +59,8 @@ class DatasetState extends Command
->where('id', $dataset->id)
->update([
'reject_reviewer_note' => 'Dataset was automatically rejected because of the time limit',
'server_state' => 'rejected_reviewer'
'server_state' => 'rejected_reviewer',
'server_date_modified' => DB::raw('now()')
]);
}
}

View file

@ -54,9 +54,7 @@ class IndexController extends Controller
->pluck('part1', 'part1');
// ->toArray();
// $persons = Person::where('status', 1)
// ->pluck('last_name', 'id');
$projects = Project::pluck('label', 'id');
// $projects = Project::pluck('label', 'id');
$relatedIdentifierTypes = ["ARK", "arXiv", "bibcode", "DOI", "EAN13", "EISSN", "Handle", "IGSN", "ISBN", "ISSN", "ISTC", "LISSN", "LSID", "PMID", "PURL", "UPC", "URL", "URN"];
$relatedIdentifierTypes = array_combine($relatedIdentifierTypes, $relatedIdentifierTypes);
@ -67,14 +65,14 @@ class IndexController extends Controller
$keywordTypes = ['uncontrolled' => 'uncontrolled'];
$descriptionTypes = [ 'methods' => 'methods', 'series_information' => 'series_information', 'technical_info' => 'technical_info', 'other' => 'other'];
$descriptionTypes = [ 'methods' => 'methods', 'series_information' => 'series_information', 'technical_info' => 'technical_info', 'translated' => 'translated', 'other' => 'other'];
$page = Page::query()->where('page_slug', 'terms-and-conditions')->firstOrFail();
//$relationTypes = array('updates' => 'updates', 'updated-by' => 'updated-by', 'other' => 'other');
return view(
'publish.create-step1',
compact('licenses', 'languages', 'projects', 'relatedIdentifierTypes', 'relationTypes', 'titleTypes', 'keywordTypes', 'descriptionTypes', 'page')
compact('licenses', 'languages', 'relatedIdentifierTypes', 'relationTypes', 'titleTypes', 'keywordTypes', 'descriptionTypes', 'page')
);
}

View file

@ -10,7 +10,7 @@ class Subject extends Model
protected $table = 'document_subjects';
public $timestamps = false;
protected $fillable = ['value', 'type'];
protected $fillable = ['value', 'type', 'language'];
public function dataset()
{