Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchParapheur
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchParapheur
Commits
ac8f1922
Commit
ac8f1922
authored
3 years ago
by
Alex ORLUC
Browse files
Options
Downloads
Patches
Plain Diff
FIX #16982 TIME 0:45 disable note if document certified
parent
471bb61f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/frontend/app/document/document.component.html
+2
-2
2 additions, 2 deletions
src/frontend/app/document/document.component.html
src/frontend/app/document/document.component.ts
+11
-7
11 additions, 7 deletions
src/frontend/app/document/document.component.ts
with
13 additions
and
9 deletions
src/frontend/app/document/document.component.html
+
2
−
2
View file @
ac8f1922
...
...
@@ -34,7 +34,7 @@
</ion-segment-button>
</ion-segment>
<ion-buttons
slot=
"end"
*ngIf=
"!detailMode"
>
<ion-button
color=
"primary"
(click)=
"openAction($event)"
>
<ion-button
color=
"primary"
(click)=
"openAction($event)"
[disabled]=
"!canShowActions()"
>
<ion-icon
slot=
"icon-only"
name=
"settings-sharp"
></ion-icon>
</ion-button>
</ion-buttons>
...
...
@@ -87,7 +87,7 @@
<drag-scroll
style=
"overflow:auto;height: 100%;width: 100%;margin: auto;"
[drag-scroll-disabled]=
"(signaturesService.dragging || signaturesService.resizing) && signaturesService.mobileMode"
[drag-disabled]=
"(signaturesService.dragging || signaturesService.resizing) && !signaturesService.mobileMode"
[style.maxWidth.px]=
"signaturesService.workingAreaWidth"
#nav
(click)=
"c
urrentDoc == 0 && !detailMode
? openAction($event) : false"
>
[style.maxWidth.px]=
"signaturesService.workingAreaWidth"
#nav
(click)=
"c
anShowActions()
? openAction($event) : false"
>
<div
style=
"position:relative;cursor: grab;"
[style.width.px]=
"signaturesService.workingAreaWidth"
[style.height.px]=
"signaturesService.workingAreaHeight"
id=
"myBounds"
#myBounds
>
<app-document-note-list
*ngIf=
"currentDoc == 0 && !loadingImage"
>
...
...
This diff is collapsed.
Click to expand it.
src/frontend/app/document/document.component.ts
+
11
−
7
View file @
ac8f1922
...
...
@@ -200,14 +200,14 @@ export class DocumentComponent implements OnInit {
this
.
openSignatures
();
}
});
buttons
.
push
({
text
:
this
.
translate
.
instant
(
'
lang.annotateDocument
'
),
icon
:
'
receipt-outline
'
,
handler
:
()
=>
{
this
.
openNoteEditor
();
}
});
}
buttons
.
push
({
text
:
this
.
translate
.
instant
(
'
lang.annotateDocument
'
),
icon
:
'
receipt-outline
'
,
handler
:
()
=>
{
this
.
openNoteEditor
();
}
});
/* if (this.originalSize) {
buttons.push({
text: 'Zoom taille écran',
...
...
@@ -804,4 +804,8 @@ export class DocumentComponent implements OnInit {
}
return
res
.
buffer
;
}
canShowActions
()
{
return
this
.
currentDoc
==
0
&&
!
this
.
detailMode
&&
!
this
.
signaturesService
.
stampLock
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment