Compare commits
	
		
			3 Commits
		
	
	
		
			2baef1a07e
			...
			6e8476c116
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6e8476c116 | |||
| 96ea503a9b | |||
| bbe6db641e | 
							
								
								
									
										29
									
								
								js/ds.js
									
									
									
									
									
								
							
							
						
						
									
										29
									
								
								js/ds.js
									
									
									
									
									
								
							@ -61,18 +61,26 @@ DataSpace.OBJECT_REPORT = OBJECT_REPORT;
 | 
				
			|||||||
 * 
 | 
					 * 
 | 
				
			||||||
 * @return {Map<string, object>}
 | 
					 * @return {Map<string, object>}
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
DataSpace.createObjectShape = function(resource) {
 | 
					DataSpace.createObjectShape = function (resource) {
 | 
				
			||||||
    const shape = this.OBJECT_REPORT;
 | 
					    const shape = this.OBJECT_REPORT;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    let beforeGallery = shape.get('before-gallery'),
 | 
					    let beforeGallery = shape.get('before-gallery'),
 | 
				
			||||||
        afterGallery = shape.get('after-gallery');
 | 
					        afterGallery = shape.get('after-gallery');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for (const key in shape.get('before-gallery')) {
 | 
					    for (const key in shape.get('before-gallery')) {
 | 
				
			||||||
        beforeGallery[key] = resource[key];
 | 
					        if (resource[key]) {
 | 
				
			||||||
 | 
					            beforeGallery[key] = resource[key];
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            delete beforeGallery[key];
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for (const key in shape.get('after-gallery')) {
 | 
					    for (const key in shape.get('after-gallery')) {
 | 
				
			||||||
        afterGallery[key] = resource[key];
 | 
					        if (resource[key]) {
 | 
				
			||||||
 | 
					            afterGallery[key] = resource[key];
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            delete afterGallery[key];
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    shape.set('before-gallery', beforeGallery);
 | 
					    shape.set('before-gallery', beforeGallery);
 | 
				
			||||||
@ -87,14 +95,17 @@ DataSpace.createObjectShape = function(resource) {
 | 
				
			|||||||
 * 
 | 
					 * 
 | 
				
			||||||
 * @return {object}
 | 
					 * @return {object}
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
DataSpace.fetchReport = async function(uuid, format='json')
 | 
					DataSpace.fetchReport = async function (uuid, format='json')
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    const jsonRep =
 | 
					    const jsonRep =
 | 
				
			||||||
        await fetch(`${this.BASE_URL}${this.RES_ENDPOINT}${uuid}?format=${format}&indent=2`)
 | 
					        await fetch(
 | 
				
			||||||
 | 
					            `${this.BASE_URL}${this.RES_ENDPOINT}${uuid}?format=${format}&indent=2`
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
        .then(res => res.json())
 | 
					        .then(res => res.json())
 | 
				
			||||||
        .catch(excep => {
 | 
					        .catch(excep => {
 | 
				
			||||||
            _createError(excep, 'error')
 | 
					            _fetchError(excep, 'error');
 | 
				
			||||||
            document.querySelector('.modal').classList.remove('active');
 | 
					            document.querySelector('.modal')
 | 
				
			||||||
 | 
					                .classList.remove('active');
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return jsonRep;
 | 
					    return jsonRep;
 | 
				
			||||||
@ -104,7 +115,7 @@ DataSpace.fetchReport = async function(uuid, format='json')
 | 
				
			|||||||
 * 
 | 
					 * 
 | 
				
			||||||
 * @return {void}
 | 
					 * @return {void}
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
DataSpace.printReport = function() {
 | 
					DataSpace.printReport = function () {
 | 
				
			||||||
    document.querySelector('#print')
 | 
					    document.querySelector('#print')
 | 
				
			||||||
        .addEventListener('click', () => {
 | 
					        .addEventListener('click', () => {
 | 
				
			||||||
            window.print();
 | 
					            window.print();
 | 
				
			||||||
@ -163,7 +174,7 @@ DataSpace.getImagesSrc = function(resource) {
 | 
				
			|||||||
    return fileNames;
 | 
					    return fileNames;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function _createError(message, htmlId)
 | 
					function _fetchError(message, htmlId)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    const error = document.createElement('div');
 | 
					    const error = document.createElement('div');
 | 
				
			||||||
    const clear = document.createElement('button');
 | 
					    const clear = document.createElement('button');
 | 
				
			||||||
 | 
				
			|||||||
@ -38,7 +38,7 @@
 | 
				
			|||||||
                <h2 class="mt-1 p-2" id="rep-tit"></h2>
 | 
					                <h2 class="mt-1 p-2" id="rep-tit"></h2>
 | 
				
			||||||
                <div class="columns">
 | 
					                <div class="columns">
 | 
				
			||||||
                    <div class="column col-7">
 | 
					                    <div class="column col-7">
 | 
				
			||||||
                        <table class="table table-hover mt-2" id="res-before">
 | 
					                        <table class="table mt-2" id="res-before">
 | 
				
			||||||
                            <tbody>
 | 
					                            <tbody>
 | 
				
			||||||
                            </tbody>
 | 
					                            </tbody>
 | 
				
			||||||
                        </table>
 | 
					                        </table>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user