| aelkner | tmi! | 00:02 |
|---|---|---|
| aelkner | ccarey: go for it | 00:02 |
| *** ccarey has quit IRC | 00:03 | |
| *** ccarey has joined #schooltool | 00:03 | |
| aelkner | ccarey: dropped from the network much? :) | 00:05 |
| ccarey | occasionally | 00:06 |
| ccarey | aelkner: tests pass | 00:14 |
| ccarey | it reaches the breaking point i mean | 00:14 |
| aelkner | great | 00:14 |
| aelkner | one thing before we commit | 00:14 |
| aelkner | look at line 285 | 00:15 |
| aelkner | i created this convenience function a while back | 00:15 |
| aelkner | it replaces a couple of dozen test lines near the top | 00:15 |
| ccarey | cool | 00:16 |
| aelkner | while you're doing that i'll see if we can't go ahead and kill the rest of the tests | 00:16 |
| aelkner | ah, nope | 00:17 |
| aelkner | too much useful stuff there | 00:17 |
| aelkner | when you hafve made that change and it still passes the 'End of Test' point. i'll commit | 00:17 |
| ccarey | ok | 00:18 |
| *** th1a has quit IRC | 00:24 | |
| ccarey | aelkner: ok the change to the test has been made | 00:27 |
| aelkner | it passes | 00:27 |
| ccarey | and it passes the End of Test point | 00:27 |
| aelkner | cool | 00:27 |
| aelkner | i;'ll test it and ping you when i commit | 00:27 |
| ccarey | ok | 00:27 |
| ccarey | hold on phone call | 00:28 |
| *** whaddon has quit IRC | 00:30 | |
| aelkner | i submitted the changes | 00:31 |
| aelkner | so here's what i want you and filip to do | 00:31 |
| aelkner | starting with right now for you and as soon as filip gets back | 00:32 |
| aelkner | do an svn up | 00:32 |
| aelkner | also | 00:32 |
| aelkner | as you make changes and want to submit again (filip for now until you have access) | 00:32 |
| aelkner | make sure you svn up before submitting | 00:33 |
| aelkner | this is an important thing with svn | 00:33 |
| aelkner | you need to make sure before submitting changes that someone else hasn't changed one of the same files | 00:33 |
| aelkner | in a way that causes a conflict | 00:33 |
| aelkner | when you do the svn up, if there is a conflict, there will be a 'C' next to the file in the list that svn up gives you | 00:34 |
| aelkner | you will have to edit that file and look for ==== | 00:34 |
| aelkner | there will be two change blocks, on that's yours and one that the other commiter made | 00:35 |
| aelkner | you will have to decide which code is ok to keep | 00:35 |
| aelkner | usually this is easy to do | 00:36 |
| aelkner | like for instance if someone added something to an import statement | 00:36 |
| aelkner | you wouldn'thave a problem with that, so you'd keep their change | 00:36 |
| aelkner | if on the other hand they removed something that you know that you need | 00:37 |
| aelkner | you keep it the way you want it | 00:37 |
| aelkner | so you decide which code needs to stay and make sure to get rid of the === stuff | 00:37 |
| aelkner | then you save the file, but you're not done yet | 00:37 |
| aelkner | you then need to say 'svn resolved FILENAME' for the file that had the conflict | 00:38 |
| aelkner | svn st will then show no C next to that file | 00:38 |
| aelkner | it will then allow you to commit | 00:38 |
| aelkner | let me know when you're back from he phone if this is clear | 00:38 |
| fsufitch | aelkner , ccarey: ping | 00:39 |
| aelkner | he's back! | 00:39 |
| aelkner | ccarey is on the phone | 00:39 |
| fsufitch | yeah | 00:39 |
| fsufitch | ive read the log | 00:39 |
| aelkner | so i had a chance to help out from here in Vilnius | 00:39 |
| fsufitch | sry i've been gone | 00:39 |
| aelkner | distractions? | 00:39 |
| fsufitch | so i see | 00:39 |
| aelkner | like you were saying before? | 00:40 |
| fsufitch | i'd forgotten my aunt was leaving back to romania today, and i needed to babysit my 3 yr old bro while my mom took her to the airport | 00:40 |
| aelkner | ah yes | 00:40 |
| fsufitch | but yea, in general, distractions | 00:40 |
| aelkner | we'll need to get you to that career center :) | 00:40 |
| fsufitch | yup | 00:40 |
| aelkner | to cacth you up | 00:41 |
| fsufitch | i'm still supposed to be babysitting... | 00:41 |
| fsufitch | i just managed to sneak my laptop away from my room | 00:41 |
| fsufitch | by tricking my bro to go there | 00:41 |
| aelkner | hehe | 00:41 |
| fsufitch | meh | 00:41 |
| fsufitch | anyway | 00:41 |
| aelkner | so i sugested to ccarey to get things commited sooner | 00:41 |
| fsufitch | so, yeah, about the Go views | 00:41 |
| aelkner | and he didn't have access so i di it for him | 00:41 |
| aelkner | wait | 00:41 |
| fsufitch | oh crap | 00:42 |
| fsufitch | i had all the changes on my laptop | 00:42 |
| aelkner | what's wrong with that | 00:42 |
| fsufitch | i was going to do the commit right after we finished the filldown and bar functionalities | 00:42 |
| aelkner | there's no prob | 00:42 |
| aelkner | hear me out a sec | 00:42 |
| fsufitch | ookay | 00:42 |
| * fsufitch listens | 00:42 | |
| aelkner | so i told ccarey i wanted you guys to commit more ofter | 00:42 |
| aelkner | in other words, even though you need to do the fill down stuff, and it's great what you already have written | 00:43 |
| aelkner | it would have been better to wait until the tests that ccarey wrote until then were passing and then commit | 00:43 |
| ccarey | ok sorry about that | 00:43 |
| aelkner | it's no biggy, but that's what i want you to do in the future | 00:44 |
| fsufitch | ccarey: hi | 00:44 |
| aelkner | baby steps :) | 00:44 |
| aelkner | i'm catching filip up | 00:44 |
| aelkner | so | 00:44 |
| aelkner | i suggested not removing good partially written code, but just commenting it out | 00:44 |
| aelkner | and getting the tests to work | 00:44 |
| aelkner | i had som esuggestions for getting that go.html thing to work | 00:45 |
| ccarey | hi fsufitch | 00:45 |
| aelkner | and we had an adventure with swtiching groups in the test | 00:45 |
| aelkner | well, ccarey, you could explain that to him | 00:45 |
| aelkner | anyway | 00:45 |
| aelkner | before i sign off | 00:45 |
| ccarey | sure | 00:45 |
| aelkner | ccarey made the necessary changes | 00:45 |
| aelkner | and the tests reached that end point where the old tests start | 00:46 |
| aelkner | so i considered that a time to commit | 00:46 |
| aelkner | we can | 00:46 |
| aelkner | can't get rid of those old tests becuase there's studd in there that you will want to reintrocude at some point | 00:46 |
| aelkner | like the score report | 00:46 |
| aelkner | but not right away | 00:46 |
| aelkner | it's ok as long as the tests reach the end point | 00:47 |
| aelkner | so | 00:47 |
| fsufitch | can | 00:47 |
| fsufitch | *can't we just comment out the nonworking tests? | 00:47 |
| aelkner | we could | 00:47 |
| fsufitch | and just have tests for what we know is implemented and should work? | 00:47 |
| aelkner | i kinda like that idea | 00:47 |
| aelkner | there's just so many | 00:47 |
| aelkner | but you cold do that | 00:48 |
| fsufitch | alrighty | 00:48 |
| aelkner | so do that for your next commit | 00:48 |
| fsufitch | should i svn up? | 00:48 |
| aelkner | so before i go, look at my discussion above about svn up | 00:48 |
| aelkner | yes | 00:48 |
| aelkner | where i explain the need to svn up even if you are the submitter | 00:48 |
| fsufitch | ok | 00:49 |
| aelkner | look at it now and tell me when you think it's clear | 00:49 |
| aelkner | or if you have a question | 00:49 |
| ccarey | its clear | 00:50 |
| aelkner | when filip's ready, i | 00:51 |
| aelkner | i'll sign off | 00:51 |
| aelkner | please explain to him all of the nuances of what we did, | 00:51 |
| aelkner | the comment you made about javascript and the use of form_submitted | 00:51 |
| fsufitch | it's clear | 00:51 |
| aelkner | cool | 00:51 |
| aelkner | also, it | 00:52 |
| aelkner | it's ok to not test fill-down | 00:52 |
| aelkner | ok | 00:52 |
| aelkner | i'm outta here | 00:52 |
| fsufitch | :-P | 00:52 |
| ccarey | i'll explain | 00:52 |
| aelkner | keep up the good work guys | 00:52 |
| fsufitch | k | 00:52 |
| aelkner | cya | 00:52 |
| ccarey | bye | 00:52 |
| *** aelkner has quit IRC | 00:52 | |
| ccarey | ok fsufitch so a quick summary | 00:53 |
| * fsufitch is listening | 00:53 | |
| ccarey | is that javascript doesn't run in functional tests | 00:53 |
| ccarey | if you look at README.txt | 00:53 |
| ccarey | instead of selecting the group from the group selector | 00:53 |
| fsufitch | oh crap | 00:54 |
| fsufitch | it doesn't? | 00:54 |
| ccarey | we put it directly in the url like this | 00:54 |
| ccarey | no =\ | 00:54 |
| fsufitch | what?! | 00:54 |
| fsufitch | testbrowser is not JS compliant?! | 00:54 |
| ccarey | we don't need to test fill down though | 00:54 |
| ccarey | apparently not | 00:54 |
| fsufitch | >_< | 00:54 |
| fsufitch | that's ok then | 00:54 |
| ccarey | >>> browser.open(base_url+'?form-submitted=&selectedCompGroup=Algebra%20-%20Group2') | 00:54 |
| ccarey | is how we submitted the form | 00:55 |
| ccarey | and changed the group | 00:55 |
| fsufitch | but um | 00:55 |
| ccarey | where base_url | 00:55 |
| fsufitch | that submits the data using GET, not POST | 00:55 |
| fsufitch | then we need to change the original form to method="GET" | 00:55 |
| fsufitch | you can't submit the data using POST with a url | 00:56 |
| ccarey | you can't? | 00:56 |
| fsufitch | no | 00:56 |
| fsufitch | that's the whole point | 00:56 |
| fsufitch | POST is used when privacy is needed | 00:56 |
| ccarey | the tests passed, that's strange | 00:56 |
| fsufitch | like on forms that have passwords | 00:56 |
| fsufitch | rly?! | 00:56 |
| fsufitch | o.O | 00:56 |
| fsufitch | mbe post can access get data? | 00:56 |
| fsufitch | i'm confused | 00:56 |
| fsufitch | or maybe i'm thinking in PHP and zope integrates the two | 00:56 |
| fsufitch | well | 00:57 |
| fsufitch | i know in php u can't | 00:57 |
| fsufitch | but if u can in zope | 00:57 |
| fsufitch | then yay! | 00:57 |
| ccarey | yay! | 00:57 |
| fsufitch | yup | 00:57 |
| ccarey | so after svn up we should continue where we left off yesterday | 00:57 |
| ccarey | did you have any other questions? | 00:58 |
| ccarey | oh we also fixed the links to work with go.html | 01:00 |
| fsufitch | ccarey: sorry, i got pulled away by ppl around here | 01:14 |
| ccarey | its ok | 01:14 |
| fsufitch | nope, no other qtns | 01:14 |
| fsufitch | and yay about the go.html | 01:14 |
| fsufitch | we should try to figure out some Go views for the manager too... | 01:14 |
| fsufitch | but that's secondary | 01:14 |
| fsufitch | so i'll get to work | 01:16 |
| fsufitch | as soon as i can get my lappy back to my room | 01:16 |
| fsufitch | ccarey: i'm there | 01:18 |
| fsufitch | so. i'm finishing up my fill-down | 01:19 |
| ccarey | ok that's great | 01:19 |
| ccarey | i'm working on the comp bar | 01:19 |
| ccarey | i don't think its possible with just css | 01:19 |
| ccarey | because position:fixed applies both horizontally and vertically | 01:19 |
| ccarey | so i'm using javascript | 01:20 |
| fsufitch | okay | 01:22 |
| *** th1a has joined #schooltool | 01:28 | |
| *** th1a has quit IRC | 02:05 | |
| fsufitch | ccarey: where's all the JS? | 02:11 |
| fsufitch | gradebook.js is empty! :( | 02:12 |
| fsufitch | well, empty of all the stuff we did... | 02:12 |
| fsufitch | wait, nvm | 02:14 |
| fsufitch | that was in python XD | 02:14 |
| *** whaddon has joined #schooltool | 02:54 | |
| *** whaddon has quit IRC | 03:07 | |
| fsufitch | ccarey: i has filldown working! | 04:23 |
| ccarey | you do! | 04:24 |
| ccarey | sweet | 04:24 |
| ccarey | let's merge our code in gobby then? | 04:24 |
| fsufitch | ccarey: or i could commit <_< | 04:45 |
| fsufitch | isn't that what alan wants? | 04:45 |
| ccarey | well do you have my code with yours? | 04:46 |
| fsufitch | i just did a fresh checkout when i started working | 04:46 |
| fsufitch | i do have your bar thingy | 04:46 |
| ccarey | oh ok | 04:47 |
| fsufitch | and i didnt change any code that you were working on | 04:47 |
| ccarey | i've added some changes since then however | 04:47 |
| fsufitch | hmm | 04:48 |
| fsufitch | okay | 04:48 |
| fsufitch | i'll open gobby | 04:48 |
| fsufitch | point them out and i'll insert them | 04:48 |
| fsufitch | wait! | 04:48 |
| ccarey | i can remove the files | 04:48 |
| ccarey | in gobby | 04:48 |
| fsufitch | even if they ARE to the same file, it doesnt matter | 04:48 |
| ccarey | and then insert my changes | 04:48 |
| fsufitch | cuz we wont have conflicts... | 04:48 |
| ccarey | wouldn't we? | 04:48 |
| fsufitch | er | 04:48 |
| fsufitch | okay | 04:48 |
| fsufitch | actually i dont know | 04:48 |
| fsufitch | so let's just do this | 04:48 |
| fsufitch | tell me wat to open | 04:49 |
| ccarey | oh | 04:52 |
| ccarey | sure | 04:52 |
| ccarey | gradebook.py(2) | 04:52 |
| fsufitch | kk | 04:52 |
| ccarey | gradebook.pt and gradebook.js should have the changes | 04:52 |
| ccarey | i was still working on the widths of the bar and the message display | 04:53 |
| fsufitch | ok | 04:53 |
| ccarey | and also, the bar moves with a delay so that it doesn't jerk | 04:53 |
| ccarey | you'll see when you get it running | 04:54 |
| fsufitch | ok | 05:00 |
| ccarey | fsufitch: you made the changes? | 05:06 |
| fsufitch | my gobby is being insane | 05:07 |
| ccarey | let me find my ssh keys | 05:07 |
| ccarey | you could make an svn up | 05:07 |
| ccarey | sry | 05:07 |
| ccarey | i mean a commit | 05:07 |
| ccarey | then i would commit my changes after that | 05:07 |
| ccarey | oh wait | 05:08 |
| ccarey | nvm your tests pass correct? | 05:09 |
| fsufitch | i didnt run them yet | 05:10 |
| fsufitch | h/o | 05:10 |
| ccarey | ok | 05:10 |
| ccarey | oh i just realized | 05:10 |
| ccarey | the ssh keys are for my pc | 05:11 |
| ccarey | not this laptop | 05:11 |
| ccarey | so i don't think i ever had commit access in the first place | 05:11 |
| fsufitch | heh | 05:12 |
| fsufitch | ok i got the changes | 05:12 |
| fsufitch | let me run tests | 05:13 |
| fsufitch | utest or ftest? | 05:13 |
| fsufitch | okayyy... running all | 05:14 |
| fsufitch | ccarey: uhm | 05:17 |
| fsufitch | something in the SETUP is failing >_< | 05:18 |
| ccarey | setup? | 05:18 |
| fsufitch | File "/home/fsufitch/cando/src/cando/gradebook/browser/README.txt", line 289, in README.txt | 05:18 |
| fsufitch | Failed example: | 05:18 |
| fsufitch | addCompetencyGroup('Basic Programming Techniques', browser.url) | 05:18 |
| ccarey | oh that's good! | 05:18 |
| fsufitch | oh! | 05:18 |
| fsufitch | that's what supposed to fail? | 05:18 |
| ccarey | its past the end of the test | 05:18 |
| ccarey | aelkner wants the old test to still be there for reference | 05:18 |
| ccarey | yes | 05:18 |
| fsufitch | oaky | 05:23 |
| fsufitch | so now | 05:23 |
| fsufitch | commit? | 05:23 |
| ccarey | svn st is good? | 05:23 |
| ccarey | tests good? | 05:24 |
| fsufitch | yup | 05:24 |
| ccarey | ok go ahead then | 05:24 |
| *** th1a has joined #schooltool | 05:26 | |
| fsufitch | ccarey: committed! | 05:30 |
| fsufitch | you can revert, then updatte | 05:30 |
| ccarey | ok | 05:30 |
| *** fsufitch has quit IRC | 05:38 | |
| *** ccarey has quit IRC | 05:41 | |
| *** th1a has quit IRC | 06:28 | |
| *** th1a has joined #schooltool | 06:56 | |
| *** Aiste has joined #schooltool | 09:57 | |
| *** th1a has quit IRC | 10:47 | |
| *** th1a has joined #schooltool | 15:17 | |
| *** th1a has quit IRC | 15:40 | |
| *** jboisture has joined #schooltool | 17:45 | |
| *** whaddon has joined #schooltool | 17:47 | |
| *** Aiste has quit IRC | 17:49 | |
| *** whaddon has quit IRC | 18:50 | |
| *** whaddon has joined #schooltool | 18:51 | |
| *** whaddon has quit IRC | 18:53 | |
| *** whaddon has joined #schooltool | 19:02 | |
| *** jboisture has quit IRC | 19:11 | |
| *** th1a has joined #schooltool | 19:16 | |
| *** ccarey has joined #schooltool | 20:25 | |
| *** th1a has quit IRC | 20:37 | |
| *** ccarey has quit IRC | 20:54 | |
| *** ccarey has joined #schooltool | 20:55 | |
| *** th1a has joined #schooltool | 20:59 | |
| *** th1a has quit IRC | 22:27 | |
| *** ccarey has quit IRC | 23:00 | |
| *** whaddon has quit IRC | 23:05 | |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!