Skip to content
GitLab
Commit 9a63e2a0 authored by Benjamin Rousselière's avatar Benjamin Rousselière
Browse files

feat/13615 : add some elements and ajust design

parent c135156e
Pipeline #7849 failed with stages
Hide whitespace changes
Inline Side-by-side
src/presentation/maarchRM/Resources/locale/fr/messages.po
View file @ 9a63e2a0
......@@ -300,7 +300,7 @@ msgid "Apply"
msgstr "Appliquer"
msgid "Search"
msgstr "Recherche"
msgstr "Rechercher"
msgid "Reset"
msgstr "Réinitialiser"
......
src/presentation/maarchRM/Resources/locale/fr/recordsManagement/messages.po
View file @ 9a63e2a0
......@@ -972,7 +972,7 @@ msgid "To be defined later"
msgstr "À définir plus tard"
msgid "Producer"
msgstr "Producteur"
msgstr "Service producteur"
msgid "Organization"
msgstr "Organisation"
......
src/presentation/maarchRM/Resources/view/recordsManagement/archive/search.html
View file @ 9a63e2a0
......@@ -50,7 +50,6 @@
<!-- Message usage -->
<input type="hidden" id="useRestitutionMessages" value="[?merge useRestitutionMessages ?]">
<input type="hidden" id="useDestructionMessages" value="[?merge useDestructionMessages ?]">
<span class="hide" id="noOriginatorFound">No originator found</span>
<div class="container-fluid" id="archive_searchResult"></div>
</div>
......@@ -138,8 +137,8 @@
delete $("#archive_searchForm [name=depositStartDate]").data('datepicker').setDates();
delete $("#archive_searchForm [name=depositEndDate]").data('datepicker').setDates();
delete $("#archive_searchForm [name=originatingStartDate]").data('datepicker').setDates();
delete $("#archive_searchForm [name=originatingEndDate]").data('datepicker').setDates();
//delete $("#archive_searchForm [name=originatingStartDate]").data('datepicker').setDates();
//delete $("#archive_searchForm [name=originatingEndDate]").data('datepicker').setDates();
$('#archive_searchResult').empty();
});
......@@ -159,8 +158,8 @@
parameters.archiveExpired = $("#archive_searchForm [name=archiveExpired]:checked").val();
parameters.depositStartDate = $("#archive_searchForm [name=depositStartDate]").data('datepicker').getFormattedDate('yyyy-mm-dd');
parameters.depositEndDate = $("#archive_searchForm [name=depositEndDate]").data('datepicker').getFormattedDate('yyyy-mm-dd');
parameters.originatingStartDate = $("#archive_searchForm [name=originatingStartDate]").data('datepicker').getFormattedDate('yyyy-mm-dd');
parameters.originatingEndDate = $("#archive_searchForm [name=originatingEndDate]").data('datepicker').getFormattedDate('yyyy-mm-dd');
//parameters.originatingStartDate = $("#archive_searchForm [name=originatingStartDate]").data('datepicker').getFormattedDate('yyyy-mm-dd');
//parameters.originatingEndDate = $("#archive_searchForm [name=originatingEndDate]").data('datepicker').getFormattedDate('yyyy-mm-dd');
return parameters;
}
......@@ -206,11 +205,12 @@
if(organization.ownerOrgName) {
display += organization.ownerOrgName
+ " > ";
+ "<br>> ";
}
display += organization.displayName
+ "</span></span><br>";
$("#originatorOwnerOrgName").val("");
return display;
}
},
......@@ -231,7 +231,7 @@
if(suggestion.ownerOrgId) {
$("#originatorOrgRegNumber").val(suggestion.registrationNumber);
$("#originatorOrgInfo").show();
$("#originatorOwnerOrgName").html(suggestion.ownerOrgName);
$("#originatorOwnerOrgName").val(suggestion.ownerOrgName);
$("#originatorOwnerOrgId").val('');
} else {
$("#originatorOwnerOrgId").val(suggestion.orgId);
......
src/presentation/maarchRM/Resources/view/recordsManagement/archive/searchform.html
View file @ 9a63e2a0
<div class="col-md-12">
<div class="form-group">
<label class="col-sm-2 control-label">Fulltext</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="text" placeholder="Fulltext" />
<div data-translate-catalog="recordsManagement/messages">
<!-- FULL TEXT -->
<div class="col-md-12">
<div class="form-group">
<label class="col-sm-2 control-label">Fulltext</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="text" placeholder="Fulltext" />
</div>
</div>
</div>
</div>
<!-- LEFT -->
<div class="col-md-4">
<!-- COTE -->
<div class="form-group">
<label class="col-sm-4 control-label">Archive identifier</label>
<div class="col-sm-8">
<div class="input-group">
<input type="text" class="form-control" id="archive_archiveIdentifier" name="archiveIdentifier"
<div class="col-md-12">
<!-- COTE -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Archive identifier</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="archive_archiveIdentifier" name="archiveIdentifier"
placeholder="Archive identifier" />
<div class="input-group-btn">
<button type="button" class="btn btn-default" id="archive_searchByIdentifier"
title="Search">Search</button>
</div>
</div>
</div>
</div>
<!-- ARCHIVAL PROFILE -->
<div class="form-group">
<label class="col-sm-4 control-label">Archival profile</label>
<div class="col-sm-8">
<select class="form-control" name="profileReference">
<option value="">All</option>
<?merge profiles ?>
<option value="[?merge .reference ?]">
<?merge .name ?>
</option>
</select>
<!-- RETENTION RULE -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Retention rule</label>
<div class="col-sm-8">
<select class="form-control" name="retentionRuleCode">
<option value="">All</option>
<?merge retentionRules ?>
<option value="[?merge .code ?]">
<?merge .label ?>
</option>
</select>
</div>
</div>
</div>
<!-- PRODUCER -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Producer</label>
<div class="col-sm-8">
<input type="text" class="form-control orgHide" placeholder="Producer" name="orgTypeahead"
id="orgTypeahead" />
<select class="form-control hide" name="originatorOwnerOrgId" id="originatorOwnerOrgId">
<option value="">All</option>
<?merge organizationsOriginator ?>
<option value="[?merge .orgId ?]">
<?merge .displayName ?>
</option>
</select>
<select class="form-control hide" name="originatorOrgRegNumber" id="originatorOrgRegNumber">
<option value="">All</option>
<?merge organizationsOriginator ?>
<div>
<?merge .originator.isset() then(.originator, .originators) ?>
<option value="[?merge .registrationNumber ?]" orgId="[?merge .ownerOrgId ?]">
<?merge .displayName ?>
</option>
</div>
</select>
</div>
</div>
</div>
</div>
<!-- DEPOSIT DATE -->
<div class="form-group">
<label class="col-sm-4 control-label">Deposit date</label>
<div class="col-sm-4">
<input type="text" class="form-control datePicker" name="depositStartDate" placeholder="From date" />
<div class="col-md-12">
<!-- ARCHIVAL PROFILE -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Archival profile</label>
<div class="col-sm-8">
<select class="form-control" name="profileReference">
<option value="">All</option>
<?merge profiles ?>
<option value="[?merge .reference ?]">
<?merge .name ?>
</option>
</select>
</div>
</div>
</div>
<div class="col-sm-4">
<input type="text" class="form-control datePicker" name="depositEndDate" placeholder="To date" />
<!-- FINAL DISPOSITION -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Final disposition</label>
<div class="col-sm-8">
<select class="form-control" name="finalDisposition">
<option value="">All</option>
<option value="preservation">Preservation</option>
<option value="destruction">Destruction</option>
</select>
</div>
</div>
</div>
</div>
<!-- STATUS -->
<div class="form-group">
<label class="col-sm-4 control-label">Status</label>
<div class="col-sm-8">
<select class="form-control" name="status">
<option value="">All</option>
<option value="preserved">Preserved</option>
<option value="frozen">Frozen</option>
<option value="disposable">Waiting for destruction</option>
<option value="error">Error</option>
<?merge deleteDescription.bool().not() ?>
<option value="disposed">Disposed</option>
</select>
<!-- PRODUCER ORGANIZATION -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Organisation</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="originatorOwnerOrgName"
id="originatorOwnerOrgName" disabled />
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<!-- RETENTION RULE -->
<div class="form-group">
<label class="col-sm-4 control-label">Retention rule</label>
<div class="col-sm-8">
<select class="form-control" name="retentionRuleCode">
<option value="">All</option>
<?merge retentionRules ?>
<option value="[?merge .code ?]">
<?merge .label ?>
</option>
</select>
<div class="col-md-12">
<!-- DEPOSIT DATE -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Deposit date</label>
<div class="col-sm-4">
<input type="text" class="form-control datePicker" name="depositStartDate" placeholder="From date" />
</div>
<div class="col-sm-4">
<input type="text" class="form-control datePicker" name="depositEndDate" placeholder="To date" />
</div>
</div>
</div>
</div>
<!-- FINAL DISPOSITION -->
<div class="form-group">
<label class="col-sm-4 control-label">Final disposition</label>
<div class="col-sm-8">
<select class="form-control" name="finalDisposition">
<option value="">All</option>
<option value="preservation">Preservation</option>
<option value="destruction">Destruction</option>
</select>
<!-- DAU -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">DAU</label>
<div class="btn-group col-sm-8" data-toggle="buttons">
<label class="btn btn-info active archiveExpired col-sm-4" title="All">
<input type="radio" name="archiveExpired" value="" checked /> All
</label>
<label class="btn btn-default archiveExpired col-sm-4" title="Not expired">
<input type="radio" name="archiveExpired" value="false" /> Not expired
</label>
<label class="btn btn-default archiveExpired col-sm-4" title="Expired">
<input type="radio" name="archiveExpired" value="true" /> Expired
</label>
</div>
</div>
</div>
</div>
<!-- DAU -->
<div class="form-group">
<label class="col-sm-4 control-label">DAU</label>
<div class="btn-group col-sm-8" data-toggle="buttons">
<label class="btn btn-info active archiveExpired" title="All">
<input type="radio" name="archiveExpired" value="" checked /> All
</label>
<label class="btn btn-default archiveExpired" title="Not expired">
<input type="radio" name="archiveExpired" value="false" /> Not expired
</label>
<label class="btn btn-default archiveExpired" title="Expired">
<input type="radio" name="archiveExpired" value="true" /> Expired
</label>
<!-- ARCHIVAL AGREEMENT -->
<div class="col-md-4">
<?merge isPublicArchive.bool() ?>
<div class="form-group">
<label class="col-sm-4 control-label">Accord de versement</label>
<div class="col-sm-8">
<select class="form-control" name="archivalAgreementReference">
<option value=""></option>
<?merge archivalAgreements ?>
<option value="[?merge .reference ?]"><?merge .reference ?></option>
</select>
</div>
</div>
</div>
</div>
<!-- PARTIAL RETENTION RULE -->
<div class="form-group">
<label class="col-sm-4 control-label">Partial retention rule</label>
<div class="col-sm-8">
<input type="checkbox" name="partialRetentionRule" data-toggle="toggle" />
<div class="col-md-12">
<!-- STATUS -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Status</label>
<div class="col-sm-8">
<select class="form-control" name="status">
<option value="">All</option>
<option value="preserved">Preserved</option>
<option value="frozen">Frozen</option>
<option value="disposable">Waiting for destruction</option>
<option value="error">Error</option>
<?merge deleteDescription.bool().not() ?>
<option value="disposed">Disposed</option>
</select>
</div>
</div>
</div>
<!-- PARTIAL RETENTION RULE -->
<div class="col-md-4">
<div class="form-group">
<label class="col-sm-4 control-label">Partial retention rule</label>
<div class="col-sm-8">
<input type="checkbox" name="partialRetentionRule" data-toggle="toggle" />
</div>
</div>
</div>
<!-- DEPOSITOR -->
<div class="col-md-4">
<?merge isPublicArchive.bool() ?>
<div class="form-group">
<label class="col-sm-4 control-label">Service versant</label>
<div class="col-sm-8">
<select class="form-control" name="depositorOrgRegNumber">
<option value=""></option>
<?merge ownerDepositorOrgs ?>
<optgroup label="[?merge .displayName ?]">
<?merge .depositor ?>
<option value="[?merge .registrationNumber ?]"><?merge .displayName ?></option>
</optgroup>
</select>
</div>
</div>
</div>
</div>
<!-- COMMUNICABLE -->
</div>
<div class="col-md-4">
<!-- PRODUCER -->
<div class="form-group">
<label class="col-sm-4 control-label">Producer</label>
<div class="col-sm-8">
<input type="text" class="form-control orgHide" placeholder="Producer" name="orgTypeahead"
id="orgTypeahead" />
<select class="form-control hide" name="originatorOwnerOrgId" id="originatorOwnerOrgId">
<option value="">All</option>
<?merge organizationsOriginator ?>
<option value="[?merge .orgId ?]">
<?merge .displayName ?>
</option>
</select>
<select class="form-control hide" name="originatorOrgRegNumber" id="originatorOrgRegNumber">
<option value="">All</option>
<?merge organizationsOriginator ?>
<div>
<?merge .originators ?>
<option value="[?merge .registrationNumber ?]" orgId="[?merge .ownerOrgId ?]">
<?merge .displayName ?>
</option>
<div class="col-md-12">
<!-- OBJECT TYPE -->
<div class="col-md-4">
<?merge isPublicArchive.bool() ?>
<div class="form-group">
<label class="col-sm-4 control-label">Type d'objet</label>
<div class="btn-group col-sm-8" data-toggle="buttons">
<label class="btn btn-info active col-sm-4" title="Archive">
<input type="radio" name="hasParent" value="0" checked/> Archive
</label>
<label class="btn btn-default col-sm-4" title="Objet d'archive">
<input type="radio" name="hasParent" value="1"/> Objet
</label>
<label class="btn btn-default col-sm-4" title="Document">
<input type="radio" name="hasParent" value="2"/> Document
</label>
</div>
</select>
</div>
</div>
<!-- COMMUNICABLE -->
<div class="col-md-4">
<?merge isPublicArchive.bool() ?>
<div class="form-group">
<label class="col-sm-4 control-label">Communicable</label>
<div class="btn-group col-sm-8" data-toggle="buttons">
<label class="btn btn-info active col-sm-4" title="Tout">
<input type="radio" name="isCommunicable" value="" checked> Tout
</label>
<label class="btn btn-default col-sm-4" title="Non">
<input type="radio" name="isCommunicable" value="0"> Non
</label>
<label class="btn btn-default col-sm-4" title="Oui">
<input type="radio" name="isCommunicable" value="1"/> Oui
</label>
</div>
</div>
</div>
</div>
<?merge isPublicArchive.bool() ?>
<div class="col-md-12">
<hr style="height:1px;border:none;color:gray;background-color:gray;">
</div>
</div>
</div>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment