Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 solocla
|
598a2cc84c | ||
 MGrigoryan
|
5eb5bd1613 | ||
|
MGrigoryan
|
03642fdfab | ||
|
MGrigoryan
|
f6ea17388c | ||
|
solocla
|
1c2b4ab7a6 | ||
|
MGrigoryan
|
31cb23b00e | ||
|
MGrigoryan
|
d29563d20d | ||
|
MGrigoryan
|
683073c244 |
@@ -18,9 +18,10 @@ $(document).ready(function () {
|
||||
let fabricCanvas = null;
|
||||
let descriptionTextbox = null;
|
||||
let markerObjects = {};
|
||||
let nextMarkerId = 1;
|
||||
let partsListData = [];
|
||||
// DIMENSIONE GLOBALE MARKER
|
||||
let globalMarkerSize = 24;
|
||||
let globalMarkerSize = 16;
|
||||
|
||||
// ===================
|
||||
// MODAL INITIALIZATION
|
||||
@@ -32,6 +33,8 @@ $(document).ready(function () {
|
||||
trfHeader,
|
||||
});
|
||||
|
||||
$("#annotationsModal").attr("data-iddatadb", iddatadb);
|
||||
|
||||
if (!iddatadb && !idquotations) {
|
||||
const errorMsg = $(
|
||||
'<div class="alert alert-danger temp-alert" role="alert">Errore: ID TRF mancante. Impossibile inizializzare il modale delle annotazioni.</div>',
|
||||
@@ -134,7 +137,7 @@ $(document).ready(function () {
|
||||
}
|
||||
descriptionTextbox = null;
|
||||
markerObjects = {};
|
||||
globalMarkerSize = 24;
|
||||
globalMarkerSize = 16;
|
||||
$("#photoSelectorContainerAnnotations").empty().hide();
|
||||
$("#samplePhotoAnnotations").attr("src", "");
|
||||
$("#partsListAnnotations").empty();
|
||||
@@ -157,6 +160,20 @@ $(document).ready(function () {
|
||||
.on("input", "#markerSizeSlider", function () {
|
||||
globalMarkerSize = parseInt($(this).val());
|
||||
$("#markerSizeValue").text(globalMarkerSize + "px");
|
||||
|
||||
partsListData.forEach(function (part) {
|
||||
if (part && part.part_number != null) {
|
||||
partSizes[part.part_number] = globalMarkerSize;
|
||||
}
|
||||
});
|
||||
|
||||
$("#partsListAnnotations .marker-size-slider").val(
|
||||
globalMarkerSize,
|
||||
);
|
||||
$("#partsListAnnotations .marker-size-value").text(
|
||||
globalMarkerSize + "px",
|
||||
);
|
||||
|
||||
updateMarkers();
|
||||
markUnsaved();
|
||||
});
|
||||
@@ -364,22 +381,13 @@ $(document).ready(function () {
|
||||
|
||||
const partColor =
|
||||
partColors[selectedPartNumber] || "#ff0000";
|
||||
const existingMarker = photoAnnotations[
|
||||
currentPhoto
|
||||
].markers.find((m) => m.partNumber == selectedPartNumber);
|
||||
|
||||
if (existingMarker) {
|
||||
existingMarker.x = x;
|
||||
existingMarker.y = y;
|
||||
existingMarker.color = partColor;
|
||||
} else {
|
||||
photoAnnotations[currentPhoto].markers.push({
|
||||
partNumber: selectedPartNumber,
|
||||
x,
|
||||
y,
|
||||
color: partColor,
|
||||
});
|
||||
}
|
||||
photoAnnotations[currentPhoto].markers.push({
|
||||
id: nextMarkerId++,
|
||||
partNumber: selectedPartNumber,
|
||||
x,
|
||||
y,
|
||||
color: partColor,
|
||||
});
|
||||
|
||||
console.log("Marker aggiunto/spostato:", {
|
||||
partNumber: selectedPartNumber,
|
||||
@@ -389,8 +397,6 @@ $(document).ready(function () {
|
||||
});
|
||||
updateMarkers();
|
||||
markUnsaved();
|
||||
selectedPartNumber = null;
|
||||
$("#partsListAnnotations li").removeClass("active");
|
||||
});
|
||||
|
||||
fabricCanvas.upperCanvasEl.focus();
|
||||
@@ -547,6 +553,15 @@ $(document).ready(function () {
|
||||
focus: true,
|
||||
});
|
||||
modal.show();
|
||||
} else {
|
||||
let iddatadb =
|
||||
$("#annotationsModal").attr("data-iddatadb");
|
||||
|
||||
$(
|
||||
"button.parts-btn[data-iddatadb='" +
|
||||
iddatadb +
|
||||
"']",
|
||||
).trigger("click");
|
||||
}
|
||||
},
|
||||
).fail(function (xhr) {
|
||||
@@ -654,8 +669,21 @@ $(document).ready(function () {
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const $listItem = $(this);
|
||||
selectedPartNumber = $listItem.data("part-number");
|
||||
const partNumber = $listItem.data("part-number");
|
||||
|
||||
if (
|
||||
selectedPartNumber == partNumber &&
|
||||
$listItem.hasClass("active")
|
||||
) {
|
||||
selectedPartNumber = null;
|
||||
$listItem.removeClass("active");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
selectedPartNumber = partNumber;
|
||||
$listItem.addClass("active").siblings().removeClass("active");
|
||||
console.log(
|
||||
"Parte selezionata tramite riga:",
|
||||
@@ -705,12 +733,23 @@ $(document).ready(function () {
|
||||
.find(".selected-color")
|
||||
.css("background-color", color);
|
||||
|
||||
// Se il marker è già presente, aggiorna anche sul canvas
|
||||
if (markerObjects[partNumber]) {
|
||||
const group = markerObjects[partNumber];
|
||||
const circle = group.item(0); // il cerchio
|
||||
circle.set("fill", color);
|
||||
circle.set("stroke", color);
|
||||
let currentPhoto = $("#samplePhotoAnnotations").attr("src");
|
||||
let annotations = photoAnnotations[currentPhoto];
|
||||
|
||||
if (annotations) {
|
||||
annotations.markers.forEach(function (m) {
|
||||
if (m.partNumber == partNumber) {
|
||||
m.color = color;
|
||||
let group = markerObjects[m.id];
|
||||
|
||||
if (group) {
|
||||
let circle = group.item(0);
|
||||
|
||||
circle.set("fill", color);
|
||||
circle.set("stroke", color);
|
||||
}
|
||||
}
|
||||
});
|
||||
fabricCanvas.renderAll();
|
||||
}
|
||||
|
||||
@@ -898,9 +937,9 @@ $(document).ready(function () {
|
||||
"updateMarkers chiamato, markerObjects:",
|
||||
Object.keys(markerObjects),
|
||||
);
|
||||
for (let partNumber in markerObjects) {
|
||||
fabricCanvas.remove(markerObjects[partNumber]);
|
||||
delete markerObjects[partNumber];
|
||||
for (let markerId in markerObjects) {
|
||||
fabricCanvas.remove(markerObjects[markerId]);
|
||||
delete markerObjects[markerId];
|
||||
}
|
||||
markerObjects = {};
|
||||
|
||||
@@ -981,6 +1020,9 @@ $(document).ready(function () {
|
||||
lockRotation: true,
|
||||
});
|
||||
|
||||
group.markerId = marker.id;
|
||||
group.partNumber = marker.partNumber;
|
||||
|
||||
group.on("moving", function () {
|
||||
marker.x = this.left / photoData.scale;
|
||||
marker.y = this.top / photoData.scale;
|
||||
@@ -993,7 +1035,7 @@ $(document).ready(function () {
|
||||
});
|
||||
|
||||
fabricCanvas.add(group);
|
||||
markerObjects[marker.partNumber] = group;
|
||||
markerObjects[marker.id] = group;
|
||||
});
|
||||
|
||||
fabricCanvas.renderAll();
|
||||
@@ -1147,9 +1189,9 @@ $(document).ready(function () {
|
||||
}
|
||||
}
|
||||
|
||||
for (let partNumber in markerObjects) {
|
||||
fabricCanvas.remove(markerObjects[partNumber]);
|
||||
delete markerObjects[partNumber];
|
||||
for (let markerId in markerObjects) {
|
||||
fabricCanvas.remove(markerObjects[markerId]);
|
||||
delete markerObjects[markerId];
|
||||
}
|
||||
markerObjects = {};
|
||||
|
||||
@@ -1184,9 +1226,9 @@ $(document).ready(function () {
|
||||
photoAnnotations[currentPhoto].markers.length > 0
|
||||
) {
|
||||
const lastMarker = photoAnnotations[currentPhoto].markers.pop();
|
||||
if (markerObjects[lastMarker.partNumber]) {
|
||||
fabricCanvas.remove(markerObjects[lastMarker.partNumber]);
|
||||
delete markerObjects[lastMarker.partNumber];
|
||||
if (markerObjects[lastMarker.id]) {
|
||||
fabricCanvas.remove(markerObjects[lastMarker.id]);
|
||||
delete markerObjects[lastMarker.id];
|
||||
fabricCanvas.renderAll();
|
||||
}
|
||||
console.log("Ultimo marker rimosso:", lastMarker);
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<!-- SLIDER PER DIMENSIONE MARKER -->
|
||||
<div style="display: flex; align-items: center; gap: 10px; margin-left: 20px;">
|
||||
<label for="markerSizeSlider" style="margin: 0; font-size: 0.9rem; white-space: nowrap;">Dimensione marker:</label>
|
||||
<input type="range" id="markerSizeSlider" min="16" max="48" value="24" step="2" style="width: 120px;">
|
||||
<input type="range" id="markerSizeSlider" min="16" max="48" value="16" step="2" style="width: 120px;">
|
||||
<span id="markerSizeValue" style="font-weight: bold; min-width: 30px;">24px</span>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="row parts-row">
|
||||
<div class="col-md-9">
|
||||
<!-- Prima riga: Elenco Parti, Rinumera, Voce -->
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
|
||||
@@ -14,6 +14,10 @@
|
||||
<div style="display: flex; align-items: center;">
|
||||
<button type="button" class="btn btn-info btn-sm" id="renumberPartsBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">Rinumera Parti</button>
|
||||
<button type="button" class="btn btn-secondary btn-sm ms-2" id="toggleVoiceBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;"><i class="fas fa-microphone"></i> Voce</button>
|
||||
<button type="button" class="btn btn-primary btn-sm ms-2" id="showHideImageBtn" style="padding: 0.1rem 0.5rem; font-size: 0.8rem;">
|
||||
<i class="fas fa-eye-slash" style="font-size: 0.8rem;"></i>
|
||||
<i class="fas fa-image ms-1" style="font-size: 0.8rem;"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Seconda riga: +, M, MacroMatrice, Matrice globale, Propaga -->
|
||||
|
||||
@@ -1339,6 +1339,7 @@ $(document).ready(function () {
|
||||
partId,
|
||||
currentValue,
|
||||
selectedMacro,
|
||||
true
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1415,6 +1416,7 @@ $(document).ready(function () {
|
||||
partId,
|
||||
idmatrice,
|
||||
selectedMacro = null,
|
||||
fromFilter = false
|
||||
) {
|
||||
if (typeof $.fn.select2 === "undefined") {
|
||||
$select.replaceWith(
|
||||
@@ -1484,16 +1486,24 @@ $(document).ready(function () {
|
||||
true,
|
||||
true,
|
||||
);
|
||||
$select.append(option).trigger("change");
|
||||
|
||||
if (!fromFilter) $select.append(option).trigger("change");
|
||||
else $select.append(option);
|
||||
|
||||
partMatrice[partNumber] = matrice.IdMatrice;
|
||||
} else {
|
||||
// Aggiusta valore non valido
|
||||
$select.val(null).trigger("change");
|
||||
if (!fromFilter) $select.val(null).trigger("change");
|
||||
|
||||
partMatrice[partNumber] = null;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$select.val(null).trigger("change", [{ skipHandler: true }]);
|
||||
}
|
||||
|
||||
$select.on("change", function (event, data) {
|
||||
if (data && data?.skipHandler) return;
|
||||
|
||||
$select.on("change", function () {
|
||||
const idmatrice = $(this).val();
|
||||
const $row = $(this).closest("tr");
|
||||
const partId = $row.data("part-id");
|
||||
@@ -2000,3 +2010,19 @@ $(document).on("click", ".save-common-note-btn", function () {
|
||||
markUnsaved();
|
||||
}
|
||||
});
|
||||
|
||||
$(document).on("click", "#showHideImageBtn", function () {
|
||||
let mainRow = $(this).closest(".parts-row");
|
||||
let photoContainer = mainRow.find(".col-md-3");
|
||||
let tableContainer = mainRow.find("#partsTable").closest("div[class*='col-md']");
|
||||
|
||||
if (photoContainer.hasClass("d-none")) {
|
||||
photoContainer.removeClass("d-none");
|
||||
tableContainer.removeClass("col-md-12").addClass("col-md-9");
|
||||
$(this).html("<i class='fas fa-eye-slash' style='font-size: 0.8rem;'></i><i class='fas fa-image ms-1' style='font-size: 0.8rem;'></i>");
|
||||
} else {
|
||||
photoContainer.addClass("d-none");
|
||||
tableContainer.removeClass("col-md-9").addClass("col-md-12");
|
||||
$(this).html("<i class='fas fa-eye' style='font-size: 0.8rem;'></i><i class='fas fa-image ms-1' style='font-size: 0.8rem;'></i>");
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user