|
|
@@ -2618,8 +2618,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
props: ['initialnotes', 'authusername', 'noteType', 'woid'],
|
|
|
data: function data() {
|
|
|
return {
|
|
|
- notes: Object.values(this.initialnotes),
|
|
|
- currentOrder: 'order-first',
|
|
|
+ notes: this.initialnotes,
|
|
|
newNote: {
|
|
|
notetype: this.noteType,
|
|
|
thenote: '',
|
|
|
@@ -2628,6 +2627,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ noteOrders: function noteOrders() {
|
|
|
+ return this.getNoteOrders(this.notes);
|
|
|
+ }
|
|
|
+ },
|
|
|
mounted: function mounted() {
|
|
|
var _this = this;
|
|
|
|
|
|
@@ -2655,6 +2659,23 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
$('#note' + _this2.noteType + 'add').collapse('hide');
|
|
|
_this2.newNote.thenote = '';
|
|
|
});
|
|
|
+ },
|
|
|
+ getNoteOrders: function getNoteOrders(notes) {
|
|
|
+ var noteOrders = [];
|
|
|
+ notes.forEach(function (note, index) {
|
|
|
+ if (index === 0) {
|
|
|
+ noteOrders[index] = 'order-first';
|
|
|
+ } else if (note.noteuser !== notes[index - 1].noteuser) {
|
|
|
+ if (noteOrders[index - 1] === 'order-first') {
|
|
|
+ noteOrders[index] = 'order-last';
|
|
|
+ } else {
|
|
|
+ noteOrders[index] = 'order-first';
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ noteOrders[index] = noteOrders[index - 1];
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return noteOrders;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -50204,45 +50225,53 @@ var render = function() {
|
|
|
}
|
|
|
}),
|
|
|
_vm._v(" "),
|
|
|
- _c("div", { staticClass: "col-md-1 d-flex flex-column mx-md-3" }, [
|
|
|
- _c("div", { staticClass: "text-center p-0 m-0" }, [
|
|
|
- _vm._v(_vm._s(note.noteuser))
|
|
|
- ]),
|
|
|
- _vm._v(" "),
|
|
|
- _c(
|
|
|
- "div",
|
|
|
- { staticClass: "text-muted text-small text-center p-0 m-0" },
|
|
|
- [_vm._v(_vm._s(_vm.getHRDate(note.notetime)))]
|
|
|
- ),
|
|
|
- _vm._v(" "),
|
|
|
- _c(
|
|
|
- "div",
|
|
|
- { staticClass: "btn-group justify-content-center p-0 m-0" },
|
|
|
- [
|
|
|
- _vm.authusername === note.noteuser ||
|
|
|
- _vm.authusername === "admin"
|
|
|
- ? [
|
|
|
- _c(
|
|
|
- "button",
|
|
|
- {
|
|
|
- staticClass: "btn btn-sm btn-primary m-1",
|
|
|
- attrs: {
|
|
|
- "data-toggle": "modal",
|
|
|
- "data-target": "#note" + note.noteid + "editModal"
|
|
|
- }
|
|
|
- },
|
|
|
- [_c("i", { staticClass: "fas fa-fw fa-edit" })]
|
|
|
- ),
|
|
|
- _vm._v(" "),
|
|
|
- _vm._m(0, true),
|
|
|
- _vm._v(" "),
|
|
|
- _vm._m(1, true)
|
|
|
- ]
|
|
|
- : _vm._e()
|
|
|
- ],
|
|
|
- 2
|
|
|
- )
|
|
|
- ]),
|
|
|
+ _c(
|
|
|
+ "div",
|
|
|
+ {
|
|
|
+ staticClass: "col-md-1 d-flex flex-column mx-md-3",
|
|
|
+ class: _vm.noteOrders[index]
|
|
|
+ },
|
|
|
+ [
|
|
|
+ _c("div", { staticClass: "text-center p-0 m-0" }, [
|
|
|
+ _vm._v(_vm._s(note.noteuser))
|
|
|
+ ]),
|
|
|
+ _vm._v(" "),
|
|
|
+ _c(
|
|
|
+ "div",
|
|
|
+ { staticClass: "text-muted text-small text-center p-0 m-0" },
|
|
|
+ [_vm._v(_vm._s(_vm.getHRDate(note.notetime)))]
|
|
|
+ ),
|
|
|
+ _vm._v(" "),
|
|
|
+ _c(
|
|
|
+ "div",
|
|
|
+ { staticClass: "btn-group justify-content-center p-0 m-0" },
|
|
|
+ [
|
|
|
+ _vm.authusername === note.noteuser ||
|
|
|
+ _vm.authusername === "admin"
|
|
|
+ ? [
|
|
|
+ _c(
|
|
|
+ "button",
|
|
|
+ {
|
|
|
+ staticClass: "btn btn-sm btn-primary m-1",
|
|
|
+ attrs: {
|
|
|
+ "data-toggle": "modal",
|
|
|
+ "data-target":
|
|
|
+ "#note" + note.noteid + "editModal"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ [_c("i", { staticClass: "fas fa-fw fa-edit" })]
|
|
|
+ ),
|
|
|
+ _vm._v(" "),
|
|
|
+ _vm._m(0, true),
|
|
|
+ _vm._v(" "),
|
|
|
+ _vm._m(1, true)
|
|
|
+ ]
|
|
|
+ : _vm._e()
|
|
|
+ ],
|
|
|
+ 2
|
|
|
+ )
|
|
|
+ ]
|
|
|
+ ),
|
|
|
_vm._v(" "),
|
|
|
_c("div", { staticClass: "col-md-10" }, [
|
|
|
_c("div", { staticClass: "card m-2" }, [
|