2790-dialog_shortcuts #570

Closed
Ghost wants to merge 15 commits from 2790-dialog_shortcuts into dev
5 changed files with 225 additions and 50 deletions

View File

@ -100,5 +100,145 @@
show-field="name" show-field="name"
value-field="code"> value-field="code">
</vn-autocomplete> </vn-autocomplete>
<div>
<a
ng-click="$ctrl.showShortcuts()"
class="vn-button colored shortcuts"
translate>
Shortcuts
</a>
</div>
</vn-vertical> </vn-vertical>
</vn-popover> </vn-popover>
<!-- Create shortcuts dialog -->
<vn-dialog class="edit"
vn-id="shortcuts">
<tpl-body>
<div class="dialogHeader" translate>SHORTCUTS</div>
<table>
<tbody>
<tr>
<td class="tdBorder">
<span class="shortcuts-words">Ctrl</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">Alt</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">A</span>
</td>
<td>
<span class="arrowStyle">🠮</span>
</td>
<td>
<vn-icon
class="iconStyle"
icon="icon-item">
</vn-icon>
</td>
<td>
<span class="titleStyle" translate>ITEMS</span>
</td>
</tr>
<tr><td colspan="8"></td></tr>
<tr>
<td class="tdBorder">
<span class="shortcuts-words">Ctrl</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">Alt</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">T</span>
</td>
<td>
<span class="arrowStyle">🠮</span>
</td>
<td>
<vn-icon
class="iconStyle"
icon="icon-ticket">
</vn-icon>
</td>
<td>
<span class="titleStyle">TICKETS</span>
</td>
</tr>
<tr><td colspan="8"></td></tr>
<tr>
<td class="tdBorder">
<span class="shortcuts-words">Ctrl</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">Alt</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">R</span>
</td>
<td>
<span class="arrowStyle">🠮</span>
</td>
<td>
<vn-icon
class="iconStyle"
icon="icon-claims">
</vn-icon>
</td>
<td><span class="titleStyle" translate>CLAIMS</span></td>
</tr>
<tr><td colspan="8"></td></tr>
<tr>
<td class="tdBorder">
<span class="shortcuts-words">Ctrl</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">Alt</span>
</td>
<td>
<span class="plusStyle">+</span>
</td>
<td class="tdBorder">
<span class="shortcuts-words">C</span>
</td>
<td>
<span class="arrowStyle">🠮</span>
</td>
<td>
<vn-icon
class="iconStyle"
icon="persons">
</vn-icon>
</td>
<td>
<span class="titleStyle" translate>CLIENTS</span>
</td>
</tr>
</tbody>
</table>
</tpl-body>
<tpl-buttons>
<input type="button" response="cancel" translate-attr="{value: 'Close'}"/>
</tpl-buttons>
</vn-dialog>

View File

@ -73,6 +73,10 @@ class Controller {
return this.vnConfig.user.companyFk; return this.vnConfig.user.companyFk;
} }
showShortcuts() {
this.$.shortcuts.show();
}
show(event) { show(event) {
this.$.warehouses.refresh(); this.$.warehouses.refresh();
this.$.companies.refresh(); this.$.companies.refresh();

View File

@ -4,3 +4,8 @@ Local bank: Banco local
Local company: Empresa local Local company: Empresa local
User warehouse: Almacén del usuario User warehouse: Almacén del usuario
User company: Empresa del usuario User company: Empresa del usuario
Shortcuts: Acceso rápido
SHORTCUTS: ACCESO RÁPIDO
ITEMS: ARTÍCULOS
CLAIMS: RECLAMACIONES
CLIENTS: CLIENTES

View File

@ -39,3 +39,61 @@
vertical-align: middle; vertical-align: middle;
font-size: 1rem; font-size: 1rem;
} }
.tdBorder {
border-radius: 5px 5px 5px;
width: 75px;
border: 3px solid rgba(0, 0, 0, 0.781);
}
.shortcuts-words {
font-size: 25px;
padding-left: 20px;
padding-right: 20px;
float: left;
margin-left: -15px;
margin-top: -40px;
}
.plusStyle {
font-size: 50px;
padding-left: 10px;
padding-right: 10px;
}
.arrowStyle {
font-size: 50px;
padding-left: 10px;
padding-right: 10px;
}
.dialogHeader {
text-align: center;
background-color: $color-main;
font-size: 25px;
color: white;
font-weight: bold;
padding: 10px;
margin-bottom: 50px;
}
.titleStyle {
font-size: 30px;
font-weight: 400;
padding-left: 10px;
padding-right: 10px;
}
.iconStyle {
color: white;
background-color: $color-main;
font-size: 50px;
font-weight: normal;
width: 50px;
padding: 5px;
border-radius: 5px 5px 5px;
}
.shortcuts {
width: 250px;
}

64
package-lock.json generated
View File

@ -3276,16 +3276,6 @@
"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
"dev": true "dev": true
}, },
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"dev": true,
"optional": true,
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"bl": { "bl": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz", "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
@ -3894,6 +3884,16 @@
"upath": "^1.1.1" "upath": "^1.1.1"
}, },
"dependencies": { "dependencies": {
"fsevents": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"dev": true,
"optional": true,
"requires": {
"nan": "^2.12.1"
}
},
"glob-parent": { "glob-parent": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@ -6378,13 +6378,6 @@
"resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz", "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
"integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==" "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="
}, },
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"dev": true,
"optional": true
},
"filed-mimefix": { "filed-mimefix": {
"version": "0.1.3", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/filed-mimefix/-/filed-mimefix-0.1.3.tgz", "resolved": "https://registry.npmjs.org/filed-mimefix/-/filed-mimefix-0.1.3.tgz",
@ -6746,15 +6739,11 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
}, },
"fsevents": { "fsevents": {
"version": "1.2.13", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true, "dev": true,
"optional": true, "optional": true
"requires": {
"bindings": "^1.5.0",
"nan": "^2.12.1"
}
}, },
"fstream": { "fstream": {
"version": "1.0.12", "version": "1.0.12",
@ -7617,13 +7606,6 @@
"to-regex-range": "^5.0.1" "to-regex-range": "^5.0.1"
} }
}, },
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"optional": true
},
"get-stream": { "get-stream": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@ -10084,13 +10066,6 @@
"normalize-path": "^3.0.0", "normalize-path": "^3.0.0",
"picomatch": "^2.0.4" "picomatch": "^2.0.4"
} }
},
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"optional": true
} }
} }
}, },
@ -19287,13 +19262,6 @@
"to-regex-range": "^5.0.1" "to-regex-range": "^5.0.1"
} }
}, },
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true,
"optional": true
},
"is-binary-path": { "is-binary-path": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@ -19907,7 +19875,7 @@
}, },
"globby": { "globby": {
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -20568,7 +20536,7 @@
}, },
"os-locale": { "os-locale": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true, "dev": true,
"requires": { "requires": {