Added next run and last run time to timers display. #4503

harishanand95 · 2016-05-30T11:24:25Z

@dperpeet @petervo I need moment.js in this. i did like this selinux/moment to get moment as of now. Can u tell me how to add moment right way?
@andreasn can u look into designs here?

also what should I do when it shows last run 46 years ago i.e 1970 ?

petervo · 2016-05-30T11:29:19Z

You should rebase this on the latest master.

To use moment you should create a link in your directory to the moment.js file in bower_components and then change the makefile to include it in the bundle for this package. You can see an example of this in either the selinux, kubernetes or ostree package.

harishanand95 · 2016-06-02T11:29:05Z

@andreasn why does the disabled section has a different style than enabled and static ?

andreasn · 2016-06-02T12:45:16Z

What do you mean more specifically?
That they don't have the "Previous Run" and "Next Run"? or that they are kind of centered in the middle of the table?

harishanand95 · 2016-06-02T14:52:08Z

@andreasn Previous run and next run is what I added extra. Is it okay? Is the repetition of the words next run and last run for each of entry good?
and yes I was actually talking about the id's being centered in the middle for disable? Why is that? I felt it would have been nice to have it like enabled and static.

harishanand95 · 2016-06-08T08:53:13Z

dperpeet · 2016-06-16T13:49:42Z

pkg/systemd/Makefile.am

@@ -127,4 +131,4 @@ update-lib:: update-bower
 	$(JSMODULE) -m -d jquery -o $(srcdir)/pkg/systemd/bootstrap-datepicker.js \
 	    $(BOWER)/bootstrap-datepicker/dist/js/bootstrap-datepicker.js
 	$(JSMODULE) -m -d jquery -o $(srcdir)/pkg/systemd/bootstrap-combobox.js \
-	    $(BOWER)/bootstrap-combobox/js/bootstrap-combobox.js
+	    $(BOWER)/bootstrap-combobox/js/bootstrap-combobox.js


missing newline

dperpeet · 2016-06-16T13:59:58Z

looks good, but there is still some work to be done

dperpeet · 2016-06-16T14:01:01Z

pkg/systemd/init.js

                if (name.indexOf("@") != -1) {
+
+                    if ( name.slice(-5) == "timer")


whitespace, better: if (name

harishanand95 · 2016-06-16T19:31:10Z

@dperpeet I have changed next run time and last trigger time from relative time to calendar time-stamp.
Sorry abt the indentation and spaces

harishanand95 · 2016-06-16T19:40:01Z

pkg/systemd/init.js

+                    next_run_time = timer_unit.NextElapseUSecRealtime;
+            }
+            unit.NextRunTime = moment(next_run_time/1000).calendar();
+        }


I found in init.js that variables are written like next_run_time, active_state, systemd_manager etc while properties of unit are like unit.LoadState, unit.UnitFileState, unit.CombinedState et cetera.
so I think having properties as unit.NextRunTime, unit.LastTriggerTime and variables as next_run_time is better than changing?

I found in init.js that variables are written like next_run_time, active_state, systemd_manager etc while properties of unit are like unit.LoadState, unit.UnitFileState, unit.CombinedState et cetera.
so I think having properties as unit.NextRunTime, unit.LastTriggerTime and variables as next_run_time is better than changing?

Old cockpit code uses the underscore notation. In newer code, we've switched to the way most of the other js code seems to be written: camelCase.

The exposed DBUS properties (e.g. unit.NextRunTime) are actually a special case, since that is a DBUS convention. Cockpit API will automatically expose the properties if they begin with a capital letter.

Looking at your code again, I believe you did this right - you can remain consistent with the current code.

harishanand95 · 2016-06-22T11:42:22Z

test/verify/check-services

+        b.wait_visible('#services')
+        m.execute("systemctl start test.timer")
+        b.wait_in_text(svc_sel('test.timer'), "Today")
+        b.wait_in_text(svc_sel('test.timer'), "unknown")


@dperpeet The test checks if test.timer shows "Today" as part of next run and "unknown" in last trigger time.

andreasn · 2016-06-23T11:31:01Z

the labels "Next Run Time" and "Last Trigger Time" sounds a bit off to me.
Could it be just "Next Run" and "Last Trigger" instead?
That it's times you'll be able to see from the fact that the labels are times and dates.

harishanand95 · 2016-06-23T12:15:49Z

@andreasn removed "Time" from Next Run Time and Last Trigger Time and also added few deleted new lines that was already present in the code.

andreasn · 2016-06-23T12:38:00Z

Can current state be just "State"?

harishanand95 · 2016-06-23T13:38:02Z

@andreasn Corrected

andreasn · 2016-06-23T13:50:20Z

Looks good to me.
Thanks for fixing this!

dperpeet · 2016-06-27T12:22:22Z

test/verify/check-services

+        b.click('#services-filter :nth-child(4)')
+        b.wait_visible('#services')
+        m.execute("systemctl start test.timer")
+        b.wait_in_text(svc_sel('test.timer'), "Today")


I think this is our most common source for race conditions in our tests: before you can wait for the text to be there, you should first wait for the element o be present.
In this case, add a line before: b.wait_present(svc_sel('test.timer'))

also, make sure that svc_sel('test.timer') is exactly the selector you want to use here

dperpeet · 2016-06-30T07:52:05Z

There's a merge conflict - can you please rebase on master and squash the commits into one? Thanks!

dperpeet · 2016-06-30T07:52:48Z

@andreasn Right now this code doesn't update the display, it only shows the time differences (e.g. "in 5 seconds") on load. I think this is ok for now. Do you agree?

andreasn · 2016-06-30T08:44:34Z

@dperpeet yeah, I think it's all right for now, but I would like it to be fixed as a followup.

stefwalter added the needswork label May 30, 2016

harishanand95 force-pushed the systemd-nextrun-lastrun branch from a12908c to fa4eec5 Compare May 31, 2016 16:11

harishanand95 force-pushed the systemd-nextrun-lastrun branch 3 times, most recently from 295b6b9 to f5f9156 Compare June 8, 2016 08:33

harishanand95 force-pushed the systemd-nextrun-lastrun branch 3 times, most recently from 79791ab to c5059eb Compare June 15, 2016 10:36

dperpeet reviewed Jun 16, 2016
View reviewed changes

pkg/systemd/init.js

if (name.indexOf("@") != -1) {

if ( name.slice(-5) == "timer")

Copy link

Contributor

dperpeet Jun 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whitespace, better: if (name

harishanand95 force-pushed the systemd-nextrun-lastrun branch from c5059eb to a879454 Compare June 16, 2016 19:21

harishanand95 reviewed Jun 16, 2016
View reviewed changes

dperpeet added question Further information is requested and removed needswork labels Jun 20, 2016

harishanand95 force-pushed the systemd-nextrun-lastrun branch 2 times, most recently from 378cf80 to 4ba4abd Compare June 22, 2016 11:37

harishanand95 reviewed Jun 22, 2016
View reviewed changes

andreasn self-assigned this Jun 22, 2016

harishanand95 force-pushed the systemd-nextrun-lastrun branch 2 times, most recently from 0447b9a to 5b3bd23 Compare June 23, 2016 12:05

dperpeet removed the question Further information is requested label Jun 24, 2016

harishanand95 force-pushed the systemd-nextrun-lastrun branch from de38899 to b4dedaf Compare June 27, 2016 06:25

dperpeet reviewed Jun 27, 2016
View reviewed changes

dperpeet added the needswork label Jun 27, 2016

harishanand95 force-pushed the systemd-nextrun-lastrun branch from b4dedaf to 17316ee Compare June 27, 2016 13:57

harishanand95 mentioned this pull request Jun 28, 2016

systemd create timer option #4645

Closed

6 tasks

dperpeet removed the needswork label Jun 28, 2016

harishanand95 force-pushed the systemd-nextrun-lastrun branch 2 times, most recently from 24deff7 to 9575f8d Compare June 29, 2016 09:21

dperpeet assigned dperpeet and unassigned andreasn Jun 29, 2016

dperpeet added the needswork label Jun 30, 2016

systemd: Added next run and last run time to timers display.

bc4632d

harishanand95 force-pushed the systemd-nextrun-lastrun branch from 9575f8d to bc4632d Compare June 30, 2016 09:33

dperpeet removed the needswork label Jun 30, 2016

dperpeet closed this in bd9e8ae Jul 6, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added next run and last run time to timers display. #4503

Added next run and last run time to timers display. #4503

harishanand95 commented May 30, 2016

petervo commented May 30, 2016

harishanand95 commented Jun 2, 2016

andreasn commented Jun 2, 2016

harishanand95 commented Jun 2, 2016 •

edited

Loading

harishanand95 commented Jun 8, 2016

dperpeet Jun 16, 2016

dperpeet commented Jun 16, 2016

dperpeet Jun 16, 2016

harishanand95 commented Jun 16, 2016 •

edited

Loading

harishanand95 Jun 16, 2016

dperpeet Jun 20, 2016

harishanand95 Jun 22, 2016

andreasn commented Jun 23, 2016

harishanand95 commented Jun 23, 2016

andreasn commented Jun 23, 2016

harishanand95 commented Jun 23, 2016

andreasn commented Jun 23, 2016

dperpeet Jun 27, 2016 •

edited

Loading

dperpeet Jun 27, 2016

dperpeet commented Jun 30, 2016

dperpeet commented Jun 30, 2016

andreasn commented Jun 30, 2016

		if (name.indexOf("@") != -1) {

		if ( name.slice(-5) == "timer")

Added next run and last run time to timers display. #4503

Added next run and last run time to timers display. #4503

Conversation

harishanand95 commented May 30, 2016

petervo commented May 30, 2016

harishanand95 commented Jun 2, 2016

andreasn commented Jun 2, 2016

harishanand95 commented Jun 2, 2016 • edited Loading

harishanand95 commented Jun 8, 2016

dperpeet Jun 16, 2016

Choose a reason for hiding this comment

dperpeet commented Jun 16, 2016

dperpeet Jun 16, 2016

Choose a reason for hiding this comment

harishanand95 commented Jun 16, 2016 • edited Loading

harishanand95 Jun 16, 2016

Choose a reason for hiding this comment

dperpeet Jun 20, 2016

Choose a reason for hiding this comment

harishanand95 Jun 22, 2016

Choose a reason for hiding this comment

andreasn commented Jun 23, 2016

harishanand95 commented Jun 23, 2016

andreasn commented Jun 23, 2016

harishanand95 commented Jun 23, 2016

andreasn commented Jun 23, 2016

dperpeet Jun 27, 2016 • edited Loading

Choose a reason for hiding this comment

dperpeet Jun 27, 2016

Choose a reason for hiding this comment

dperpeet commented Jun 30, 2016

dperpeet commented Jun 30, 2016

andreasn commented Jun 30, 2016

harishanand95 commented Jun 2, 2016 •

edited

Loading

harishanand95 commented Jun 16, 2016 •

edited

Loading

dperpeet Jun 27, 2016 •

edited

Loading