Skip to content

Commit 81babda

Browse files
authored
Merge pull request #6 from GeoTecINIT/E4G-150
E4G-150 add user manual, es5 compatible to compile
2 parents 08101e9 + f81aac5 commit 81babda

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/app/components/eo4geo-footer/eo4geo-footer.component.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<span><a href="http://eo4geo.uji.es" target="_blank" class="btn btn-light-primary">EO4GEO Tools</a></span>
33
<span><a href="http://www.eo4geo.eu" target="_blank" class="btn btn-light-primary">EO4GEO</a></span>
44
<span class="ml-auto">
5-
<!-- <a href="assets/manual/OPT-Manual.pdf" target="_blank" class="btn">User Manual </a>
6-
-->
7-
<a class="btn btn-light-primary" (click)="releaseNotesModal.open()"> Release Notes v1.0</a>
5+
<a href="https://eo4geo-uji.web.app/documentation/BAT.pdf" target="_blank" class="btn">User Manual</a>
6+
<a class="btn btn-light-primary" (click)="releaseNotesModal.open()"> Release Notes v1.01</a>
87
<a href="mailto:[email protected]?subject=EO4GEO Tools Contact" class="btn"> Contact</a>
8+
<a href="http://www.eo4geo.eu/privacy-policy/" target="_blank" class="btn btn-light-primary"> Privacy Policy</a>
99
</span>
1010
<app-release-notes #releaseNotesModal></app-release-notes>
11-
</app-footer>
11+
</app-footer>

src/app/components/release-notes/release-notes.component.html

+7-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ <h5 class="modal-title" id="releaseModalTitle">Release Notes</h5>
1010
</button>
1111
</div>
1212
<div class="modal-body">
13-
1413
<br>
15-
<h4>v1.0 - 2nd September 2020</h4>
14+
<h4>v1.01 - 2nd Dec. 2020</h4>
15+
<ul>
16+
<li>Linked User Manual and Privacy Policy</li>
17+
<li>Users can automatically join organizations</li>
18+
</ul>
19+
<br>
20+
<h4>v1.0 - 2nd Sept. 2020</h4>
1621
<ul>
1722
<li>Look and feel and usability as the other tools</li>
1823
<li>Annotate PDFs with Bok concepts</li>

src/app/views/list/list.component.html

-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ <h5>You have limited functionality because you are not logged in. <a href="#" ro
1212
Body of Knowledge is available - expected July 2020. Stay tuned! -->
1313
</h5>
1414
</div>
15-
<div class="text-center">
16-
<h5>Disclaimer: you are using a prototype release of the BoK Annotation Tool. This tool is currently under
17-
development
18-
and we are still experimenting with functionality and user interface. Bugs may occur. Thank you for your
19-
patience.
20-
</h5>
21-
</div>
2215
<div class="card card-accent-primary">
2316
<div class="card-header">
2417
<div class="row">

src/app/views/newannotation/newannotation.component.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import * as jsPDF from 'jspdf';
2222

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

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

253254
uploadFile1(file) {
255+
pdfjs.GlobalWorkerOptions.workerSrc = pdfjsworker;
254256
const filePath = 'other/custom-' + encodeURI(file.name);
255257
const task = this.storage.upload(filePath, file);
256258
this.errorFile1 = false;
@@ -262,7 +264,7 @@ export class NewannotationComponent implements OnInit {
262264
const ref = this.storage.ref(filePath);
263265
ref.getDownloadURL().subscribe(url => {
264266
// get pdf document from url
265-
pdfjs.getDocument(url).then(pdfDoc_ => {
267+
pdfjs.getDocument(url).promise.then(pdfDoc_ => {
266268
const pdfDoc = pdfDoc_;
267269
// get metadata from pdf document
268270
pdfDoc.getMetadata().then(metadataObject => {

0 commit comments

Comments
 (0)