Skip to content

Commit fcaf5ae

Browse files
committed
chore(tracker): reconcile Gantt sources + ru.json after develop rebase
Signed-off-by: Michael Uray <michaeluray@users.noreply.github.com>
1 parent 68d607b commit fcaf5ae

4 files changed

Lines changed: 612 additions & 371 deletions

File tree

plugins/tracker-assets/lang/ru.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,12 @@
303303
"GanttBarLabelRight": "Bar label (right)",
304304
"GanttQuickInfoOnClick": "Single-click shows quick info popover",
305305
"QuickInfoOpenFullEditor": "Open full editor",
306+
"DependencyShifted": "Dependency shifted",
307+
"DependencyShiftedHeader": "{sender} shifted {trigger}",
308+
"DependencyShiftedMessage": "{count, plural, =1 {1 dependent issue moved} other {# dependent issues moved}}",
309+
"DependencyShiftedSubject": "Dependency shift",
310+
"DependencyShiftedDeltaDays": "{delta, plural, =0 {no shift} =1 {+1 day} =-1 {-1 day} other {{deltaSigned} days}}",
311+
"DependencyShiftedNoChange": "no schedule change",
306312
"AllowCreatingIssues": "Разрешить создание задач",
307313
"Day": "Day",
308314
"Week": "Week",
@@ -378,6 +384,12 @@
378384
"DependencyDeleteConfirm": "Delete this dependency?",
379385
"DependencyCycle": "This would create a circular dependency",
380386
"DependencyEditTitle": "Edit dependency",
387+
"DependencyKindHintFS": "Finish-to-Start: successor starts when predecessor finishes",
388+
"DependencyKindHintSS": "Start-to-Start: successor starts when predecessor starts",
389+
"DependencyKindHintFF": "Finish-to-Finish: successor finishes when predecessor finishes",
390+
"DependencyKindHintSF": "Start-to-Finish: successor finishes when predecessor starts",
391+
"DependencyPickKind": "Pick dependency type",
392+
"DependencyChangeKind": "Change type",
381393
"GanttShowPredecessors": "Show predecessors column",
382394
"Predecessors": "Predecessors",
383395
"NoPredecessors": "",

plugins/tracker-resources/src/components/DependencyEditor.svelte

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838
export let undoManager: import('./gantt/lib/undo-manager').UndoManager | undefined = undefined
3939
40-
const dispatch = createEventDispatcher<{ close: void }>()
40+
const dispatch = createEventDispatcher<{ close: undefined }>()
4141
const client = getClient()
4242
4343
let kindCodeValue: DiagramKindCode = kindCode(relation.kind)
@@ -125,7 +125,7 @@
125125
const ops = client.apply(undefined, 'gantt-dependency-edit')
126126
await ops.update(relation, after)
127127
const result = await ops.commit()
128-
if (result.result !== false && undoManager !== undefined) {
128+
if (result.result && undoManager !== undefined) {
129129
undoManager.push({
130130
kind: 'relation-edit',
131131
relationId: relation._id,
@@ -147,7 +147,7 @@
147147
const ops = client.apply(undefined, 'gantt-dependency-delete')
148148
await ops.remove(relation)
149149
const result = await ops.commit()
150-
if (result.result !== false && undoManager !== undefined) {
150+
if (result.result && undoManager !== undefined) {
151151
undoManager.push({
152152
kind: 'relation-delete',
153153
relation: snapshot,
@@ -226,13 +226,26 @@
226226
<div class="confirm">
227227
<Label label={tracker.string.DependencyDeleteConfirm} />
228228
<div class="confirm-buttons">
229-
<Button kind="regular" label={view.string.Cancel} on:click={() => { confirmingDelete = false }} />
229+
<Button
230+
kind="regular"
231+
label={view.string.Cancel}
232+
on:click={() => {
233+
confirmingDelete = false
234+
}}
235+
/>
230236
<Button kind="dangerous" label={tracker.string.DependencyDelete} on:click={doDelete} />
231237
</div>
232238
</div>
233239
{:else}
234240
<div class="footer">
235-
<Button kind="dangerous" label={tracker.string.DependencyDelete} disabled={!canEdit} on:click={() => { confirmingDelete = true }} />
241+
<Button
242+
kind="dangerous"
243+
label={tracker.string.DependencyDelete}
244+
disabled={!canEdit}
245+
on:click={() => {
246+
confirmingDelete = true
247+
}}
248+
/>
236249
<span class="spacer" />
237250
<Button kind="regular" label={view.string.Cancel} on:click={cancel} />
238251
<Button kind="primary" label={view.string.Save} disabled={!canEdit || !dirty} on:click={save} />
@@ -344,5 +357,7 @@
344357
gap: 8px;
345358
margin-top: 4px;
346359
}
347-
.footer .spacer { flex: 1; }
360+
.footer .spacer {
361+
flex: 1;
362+
}
348363
</style>

plugins/tracker-resources/src/components/gantt/GanttSidebarColumn.svelte

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
export let width: number
3131
export let relations: IssueRelation[] = []
3232
export let issueNumberOf: (ref: Ref<Issue>) => string = () => ''
33-
export let slack: Map<Ref<Issue>, number> = new Map()
34-
export let criticalSet: Set<Ref<Issue>> = new Set()
33+
export let slack = new Map<Ref<Issue>, number>()
34+
export let criticalSet = new Set<Ref<Issue>>()
3535
export let showCriticalPath: boolean = false
3636
3737
const DAY_MS = 86_400_000
@@ -49,11 +49,16 @@
4949
5050
function priorityLabel (p: IssuePriority): string {
5151
switch (p) {
52-
case IssuePriority.Urgent: return 'Urgent'
53-
case IssuePriority.High: return 'High'
54-
case IssuePriority.Medium: return 'Medium'
55-
case IssuePriority.Low: return 'Low'
56-
default: return ''
52+
case IssuePriority.Urgent:
53+
return 'Urgent'
54+
case IssuePriority.High:
55+
return 'High'
56+
case IssuePriority.Medium:
57+
return 'Medium'
58+
case IssuePriority.Low:
59+
return 'Low'
60+
default:
61+
return ''
5762
}
5863
}
5964
@@ -85,14 +90,18 @@
8590
role="link"
8691
tabindex="0"
8792
on:click={onTitleClick}
88-
on:keydown={(e) => { if (e.key === 'Enter') onTitleClick() }}
93+
on:keydown={(e) => {
94+
if (e.key === 'Enter') onTitleClick()
95+
}}
8996
>
9097
{issue.title}
9198
</span>
9299
{:else if column === 'status'}
93100
<span class="cell-content cell-status"><StatusBadge {issue} /></span>
94101
{:else if column === 'priority'}
95-
<span class="cell-content cell-priority" title={priorityLabel(issue.priority)}>{priorityLabel(issue.priority)}</span>
102+
<span class="cell-content cell-priority" title={priorityLabel(issue.priority)}
103+
>{priorityLabel(issue.priority)}</span
104+
>
96105
{:else if column === 'assignee'}
97106
<span class="cell-content cell-assignee dim">
98107
{issue.assignee !== null ? '·' : ''}
@@ -179,16 +188,21 @@
179188
text-overflow: ellipsis;
180189
white-space: nowrap;
181190
}
182-
.cell-title.clickable { cursor: pointer; }
183-
.cell-title.clickable:hover { text-decoration: underline; }
191+
.cell-title.clickable {
192+
cursor: pointer;
193+
}
194+
.cell-title.clickable:hover {
195+
text-decoration: underline;
196+
}
184197
/* Milestone labels in extended-columns mode — same column as issue
185198
titles but italic to match the legacy compact sidebar's milestone
186199
row styling. */
187200
.cell-milestone-title {
188201
font-style: italic;
189202
font-weight: 500;
190203
}
191-
.cell-numeric, .cell-date {
204+
.cell-numeric,
205+
.cell-date {
192206
text-align: right;
193207
font-variant-numeric: tabular-nums;
194208
font-size: 12px;

0 commit comments

Comments
 (0)