Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cff7e958
Commit
cff7e958
authored
Mar 10, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update timetracking props with type declarations.
parent
2df84af0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
91 additions
and
24 deletions
+91
-24
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js
...ipts/issuable/time_tracking/components/collapsed_state.js
+26
-8
app/assets/javascripts/issuable/time_tracking/components/comparison_pane.js
...ipts/issuable/time_tracking/components/comparison_pane.js
+18
-6
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js
...s/issuable/time_tracking/components/estimate_only_pane.js
+6
-1
app/assets/javascripts/issuable/time_tracking/components/help_state.js
...vascripts/issuable/time_tracking/components/help_state.js
+6
-1
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js
...ipts/issuable/time_tracking/components/spent_only_pane.js
+6
-1
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js
...scripts/issuable/time_tracking/components/time_tracker.js
+25
-7
changelogs/unreleased-ee/1428-fix-lingering-technical-debt-issues-from-timetracking-v1-1.yml
...ingering-technical-debt-issues-from-timetracking-v1-1.yml
+4
-0
No files found.
app/assets/javascripts/issuable/time_tracking/components/collapsed_state.js
View file @
cff7e958
...
...
@@ -6,14 +6,32 @@ require('../../../lib/utils/pretty_time');
(()
=>
{
Vue
.
component
(
'
time-tracking-collapsed-state
'
,
{
name
:
'
time-tracking-collapsed-state
'
,
props
:
[
'
showComparisonState
'
,
'
showSpentOnlyState
'
,
'
showEstimateOnlyState
'
,
'
showNoTimeTrackingState
'
,
'
timeSpentHumanReadable
'
,
'
timeEstimateHumanReadable
'
,
],
props
:
{
showComparisonState
:
{
type
:
Boolean
,
required
:
true
,
},
showSpentOnlyState
:
{
type
:
Boolean
,
required
:
true
,
},
showEstimateOnlyState
:
{
type
:
Boolean
,
required
:
true
,
},
showNoTimeTrackingState
:
{
type
:
Boolean
,
required
:
true
,
},
timeSpentHumanReadable
:
{
type
:
String
,
required
:
false
,
},
timeEstimateHumanReadable
:
{
type
:
String
,
required
:
false
,
},
},
methods
:
{
abbreviateTime
(
timeStr
)
{
return
gl
.
utils
.
prettyTime
.
abbreviateTime
(
timeStr
);
...
...
app/assets/javascripts/issuable/time_tracking/components/comparison_pane.js
View file @
cff7e958
...
...
@@ -6,12 +6,24 @@ require('../../../lib/utils/pretty_time');
Vue
.
component
(
'
time-tracking-comparison-pane
'
,
{
name
:
'
time-tracking-comparison-pane
'
,
props
:
[
'
timeSpent
'
,
'
timeEstimate
'
,
'
timeSpentHumanReadable
'
,
'
timeEstimateHumanReadable
'
,
],
props
:
{
timeSpent
:
{
type
:
Number
,
required
:
true
,
},
timeEstimate
:
{
type
:
Number
,
required
:
true
,
},
timeSpentHumanReadable
:
{
type
:
String
,
required
:
true
,
},
timeEstimateHumanReadable
:
{
type
:
String
,
required
:
true
,
},
},
computed
:
{
parsedRemaining
()
{
const
diffSeconds
=
this
.
timeEstimate
-
this
.
timeSpent
;
...
...
app/assets/javascripts/issuable/time_tracking/components/estimate_only_pane.js
View file @
cff7e958
...
...
@@ -2,7 +2,12 @@
(()
=>
{
Vue
.
component
(
'
time-tracking-estimate-only-pane
'
,
{
name
:
'
time-tracking-estimate-only-pane
'
,
props
:
[
'
timeEstimateHumanReadable
'
],
props
:
{
timeEstimateHumanReadable
:
{
type
:
String
,
required
:
true
,
},
},
template
:
`
<div class='time-tracking-estimate-only-pane'>
<span class='bold'>Estimated:</span>
...
...
app/assets/javascripts/issuable/time_tracking/components/help_state.js
View file @
cff7e958
...
...
@@ -2,7 +2,12 @@
(()
=>
{
Vue
.
component
(
'
time-tracking-help-state
'
,
{
name
:
'
time-tracking-help-state
'
,
props
:
[
'
docsUrl
'
],
props
:
{
docsUrl
:
{
type
:
String
,
required
:
true
,
},
},
template
:
`
<div class='time-tracking-help-state'>
<div class='time-tracking-info'>
...
...
app/assets/javascripts/issuable/time_tracking/components/spent_only_pane.js
View file @
cff7e958
...
...
@@ -2,7 +2,12 @@
(()
=>
{
Vue
.
component
(
'
time-tracking-spent-only-pane
'
,
{
name
:
'
time-tracking-spent-only-pane
'
,
props
:
[
'
timeSpentHumanReadable
'
],
props
:
{
timeSpentHumanReadable
:
{
type
:
String
,
required
:
true
,
},
},
template
:
`
<div class='time-tracking-spend-only-pane'>
<span class='bold'>Spent:</span>
...
...
app/assets/javascripts/issuable/time_tracking/components/time_tracker.js
View file @
cff7e958
...
...
@@ -10,13 +10,30 @@ require('./comparison_pane');
(()
=>
{
Vue
.
component
(
'
issuable-time-tracker
'
,
{
name
:
'
issuable-time-tracker
'
,
props
:
[
'
time_estimate
'
,
'
time_spent
'
,
'
human_time_estimate
'
,
'
human_time_spent
'
,
'
docsUrl
'
,
],
props
:
{
time_estimate
:
{
type
:
Number
,
required
:
true
,
default
:
0
,
},
time_spent
:
{
type
:
Number
,
required
:
true
,
default
:
0
,
},
human_time_estimate
:
{
type
:
String
,
required
:
false
,
},
human_time_spent
:
{
type
:
String
,
required
:
false
,
},
docsUrl
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
return
{
showHelp
:
false
,
...
...
@@ -66,6 +83,7 @@ require('./comparison_pane');
<div class='time_tracker time-tracking-component-wrap' v-cloak>
<time-tracking-collapsed-state
:show-comparison-state='showComparisonState'
:show-no-time-tracking-state='showNoTimeTrackingState'
:show-help-state='showHelpState'
:show-spent-only-state='showSpentOnlyState'
:show-estimate-only-state='showEstimateOnlyState'
...
...
changelogs/unreleased-ee/1428-fix-lingering-technical-debt-issues-from-timetracking-v1-1.yml
0 → 100644
View file @
cff7e958
---
title
:
Fix type declarations for spend/estimate values.
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment