gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add support for number precision in promoted attributes, closes #245

Browse Source
This commit is contained in:
azivner 2018-11-30 17:36:41 +01:00
parent 4577b03fc9
commit ba7c8e77e5
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/demo.tar
View File

Binary file not shown.

6
src/public/javascripts/dialogs/attributes.js
View File

@ -67,7 +67,8 @@ function AttributesModel() {
attr.labelDefinition = (attr.type === 'label-definition' && attr.value) ? attr.value : { attr.labelDefinition = (attr.type === 'label-definition' && attr.value) ? attr.value : {
labelType: "text", labelType: "text",
multiplicityType: "singlevalue", multiplicityType: "singlevalue",
isPromoted: true isPromoted: true,
numberPrecision: 0
}; };
attr.relationDefinition = (attr.type === 'relation-definition' && attr.value) ? attr.value : { attr.relationDefinition = (attr.type === 'relation-definition' && attr.value) ? attr.value : {
@ -187,7 +188,8 @@ function AttributesModel() {
labelDefinition: { labelDefinition: {
labelType: "text", labelType: "text",
multiplicityType: "singlevalue", multiplicityType: "singlevalue",
isPromoted: true isPromoted: true,
numberPrecision: 0
}, },
relationDefinition: { relationDefinition: {
multiplicityType: "singlevalue", multiplicityType: "singlevalue",

10
src/public/javascripts/services/attributes.js
View File

@ -3,9 +3,7 @@ import utils from "./utils.js";
import messagingService from "./messaging.js"; import messagingService from "./messaging.js";
import treeUtils from "./tree_utils.js"; import treeUtils from "./tree_utils.js";
import noteAutocompleteService from "./note_autocomplete.js"; import noteAutocompleteService from "./note_autocomplete.js";
import treeService from "./tree.js";
import linkService from "./link.js"; import linkService from "./link.js";
import infoService from "./info.js";
import noteDetailService from "./note_detail.js"; import noteDetailService from "./note_detail.js";
const $attributeList = $("#attribute-list"); const $attributeList = $("#attribute-list");
@ -163,6 +161,14 @@ async function createPromotedAttributeRow(definitionAttr, valueAttr) {
} }
else if (definition.labelType === 'number') { else if (definition.labelType === 'number') {
$input.prop("type", "number"); $input.prop("type", "number");
let step = 1;
for (let i = 0; i < (definition.numberPrecision || 0) && i < 10; i++) {
step /= 10;
}
$input.prop("step", step);
} }
else if (definition.labelType === 'boolean') { else if (definition.labelType === 'boolean') {
$input.prop("type", "checkbox"); $input.prop("type", "checkbox");

5
src/views/dialogs/attributes.ejs
View File

@ -64,6 +64,11 @@
data-bind="checked: labelDefinition.isPromoted"/> data-bind="checked: labelDefinition.isPromoted"/>
Promoted Promoted
</label> </label>
<div data-bind="visible: labelDefinition.labelType === 'number'"
title="Precision of floating point numbers - 0 means effectively integer, 2 allows entering e.g. 1.23">
Number precision: <input type="number" min="0" max="9" data-bind="value: labelDefinition.numberPrecision" style="width: 50px;"/>
</div>
</div> </div>
<div data-bind="visible: type == 'relation-definition'"> <div data-bind="visible: type == 'relation-definition'">