Skip to content

Commit

Permalink
Merge pull request #6 from GeoTecINIT/E4G-150
Browse files Browse the repository at this point in the history
E4G-150 add user manual, es5 compatible to compile
  • Loading branch information
aidamonfort authored Dec 3, 2020
2 parents 08101e9 + f81aac5 commit 81babda
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions src/app/components/eo4geo-footer/eo4geo-footer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<span><a href="http://eo4geo.uji.es" target="_blank" class="btn btn-light-primary">EO4GEO Tools</a></span>
<span><a href="http://www.eo4geo.eu" target="_blank" class="btn btn-light-primary">EO4GEO</a></span>
<span class="ml-auto">
<!-- <a href="assets/manual/OPT-Manual.pdf" target="_blank" class="btn">User Manual </a>
-->
<a class="btn btn-light-primary" (click)="releaseNotesModal.open()"> Release Notes v1.0</a>
<a href="https://eo4geo-uji.web.app/documentation/BAT.pdf" target="_blank" class="btn">User Manual</a>
<a class="btn btn-light-primary" (click)="releaseNotesModal.open()"> Release Notes v1.01</a>
<a href="mailto:[email protected]?subject=EO4GEO Tools Contact" class="btn"> Contact</a>
<a href="http://www.eo4geo.eu/privacy-policy/" target="_blank" class="btn btn-light-primary"> Privacy Policy</a>
</span>
<app-release-notes #releaseNotesModal></app-release-notes>
</app-footer>
</app-footer>
9 changes: 7 additions & 2 deletions src/app/components/release-notes/release-notes.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ <h5 class="modal-title" id="releaseModalTitle">Release Notes</h5>
</button>
</div>
<div class="modal-body">

<br>
<h4>v1.0 - 2nd September 2020</h4>
<h4>v1.01 - 2nd Dec. 2020</h4>
<ul>
<li>Linked User Manual and Privacy Policy</li>
<li>Users can automatically join organizations</li>
</ul>
<br>
<h4>v1.0 - 2nd Sept. 2020</h4>
<ul>
<li>Look and feel and usability as the other tools</li>
<li>Annotate PDFs with Bok concepts</li>
Expand Down
7 changes: 0 additions & 7 deletions src/app/views/list/list.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ <h5>You have limited functionality because you are not logged in. <a href="#" ro
Body of Knowledge is available - expected July 2020. Stay tuned! -->
</h5>
</div>
<div class="text-center">
<h5>Disclaimer: you are using a prototype release of the BoK Annotation Tool. This tool is currently under
development
and we are still experimenting with functionality and user interface. Bugs may occur. Thank you for your
patience.
</h5>
</div>
<div class="card card-accent-primary">
<div class="card-header">
<div class="row">
Expand Down
6 changes: 4 additions & 2 deletions src/app/views/newannotation/newannotation.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import * as jsPDF from 'jspdf';

// import * as jspdf from 'parse-pdf';

import * as pdfjs from 'pdfjs-dist';
import * as pdfjs from 'pdfjs-dist/es5/build/pdf';
import { pdfjsworker } from 'pdfjs-dist/es5/build/pdf.worker.entry';
import { BokService } from '../../services/bok.service';
import { LoginComponent } from '../login/login.component';
import { OtherService } from '../../services/other.service';
Expand Down Expand Up @@ -251,6 +252,7 @@ export class NewannotationComponent implements OnInit {
}

uploadFile1(file) {
pdfjs.GlobalWorkerOptions.workerSrc = pdfjsworker;
const filePath = 'other/custom-' + encodeURI(file.name);
const task = this.storage.upload(filePath, file);
this.errorFile1 = false;
Expand All @@ -262,7 +264,7 @@ export class NewannotationComponent implements OnInit {
const ref = this.storage.ref(filePath);
ref.getDownloadURL().subscribe(url => {
// get pdf document from url
pdfjs.getDocument(url).then(pdfDoc_ => {
pdfjs.getDocument(url).promise.then(pdfDoc_ => {
const pdfDoc = pdfDoc_;
// get metadata from pdf document
pdfDoc.getMetadata().then(metadataObject => {
Expand Down

0 comments on commit 81babda

Please sign in to comment.