{"action":"created","comment":{"url":"https://api.github.com/repos/starteam/starcellbio_html/pulls/comments/30149047","id":30149047,"diff_hunk":"@@ -864,46 +782,47 @@\n @param experiment\n @param microscopy\n @param cell_treatment\n-@param lane\n-@param kinds\n+@param row\n+@param kinds - micro_kinds\n */\n {template .display_slide_types}\n- \n-{if length(keys($kinds)) ==1  and length(keys($kinds.IF.conditions)) ==1 }\n-\t\t{foreach $k in keys($kinds)}\n-\t\t<span class=\"scb_f_microscopy_select_slide_type {if $lane.is_sample_enabled}{else}scb_s_microscopy_dim_conditions{/if}\" cell_treatment_id='{$cell_treatment.id}'\n-\t\t\t\tmicroscopy_id='{$microscopy.id}' assignment_id=\"{$assignment.id}\" experiment_id=\"{$experiment.id}\" value=\"{$k}\"\n-\t\t\t\tlane_kind=\"{$lane.kind}\" lane_id=\"{if $lane.kind == 'existing'}{$lane.lane.id}{/if}\">{$kinds[$k].name}</span>\n-\t\t{/foreach}\n-{elseif length($lane.cell_treatment.treatment_list.list[0].microscope) == 1 and $lane.cell_treatment.treatment_list.list[0].microscope[0] == 'na'}\n-\t\t<span class=\"scb_f_microscopy_select_slide_type\" cell_treatment_id='{$cell_treatment.id}'\n-\t\t\t\tmicroscopy_id='{$microscopy.id}' assignment_id=\"{$assignment.id}\" experiment_id=\"{$experiment.id}\" value=\"IF\"\n-\t\t\t\tlane_kind=\"{$lane.kind}\" lane_id=\"{if $lane.kind == 'existing'}{$lane.lane.id}{/if}\">{$assignment.template.micro_kinds.IF.conditions.na.name}</span>\n+\n+\n+{if length(keys($cell_treatment.treatment_list.list[0].conditions)) == 1}\n+\n+        {foreach $k in keys($cell_treatment.treatment_list.list[0].conditions)}\n+            <span class=\"scb_f_microscopy_select_slide_type {if $row.is_sample_enabled}{else}scb_s_microscopy_dim_conditions{/if}\"\n+            cell_treatment_id='{$cell_treatment.id}' microscopy_id='{$microscopy.id}'\n+            assignment_id=\"{$assignment.id}\" experiment_id=\"{$experiment.id}\" value=\"{$k}\"\n+            lane_kind=\"{$row.kind}\" lane_id=\"{if $row.kind == 'existing'}{$row.lane.id}{/if}\">{$kinds[$k].name}</span>\n+        {/foreach}\n {else}\n \t<select class=\"scb_f_microscopy_select_slide_type\" cell_treatment_id='{$cell_treatment.id}' role='select'\n \t\t\tmicroscopy_id='{$microscopy.id}' assignment_id=\"{$assignment.id}\" experiment_id=\"{$experiment.id}\"\n-\t\t\tlane_kind=\"{$lane.kind}\" lane_id=\"{if $lane.kind == 'existing'}{$lane.lane.id}{/if}\"\n-\t{if $lane.is_sample_enabled}{else}disabled=\"disabled\"{/if}\n+\t\t\tlane_kind=\"{$row.kind}\" lane_id=\"{if $row.kind == 'existing'}{$row.lane.id}{/if}\"\n+\t        {if $row.is_sample_enabled}{else}disabled=\"disabled\"{/if}\n \t>\n-\t{if $lane.kind == 'existing'}\n-\t\t{if $lane.cell_treatment.cell_line == $assignment.template.model.microscopy.valid[0] and $lane.cell_treatment.treatment_list.first.drug_list.list[0].drug_id == $assignment.template.model.microscopy.valid[1]}\n-\t\t\t{foreach $k in keys($assignment.template.slide_parser[$lane.cell_treatment.treatment_list.first.collection_id])}\t\n+\n+\t{if $row.kind == 'existing'}\n+\t\t{if $row.cell_treatment.cell_line == $assignment.template.model.microscopy.valid[0] and $row.cell_treatment.treatment_list.first.drug_list.list[0].drug_id == $assignment.template.model.microscopy.valid[1]}","path":"html_app/ui/microscopy.soy","position":193,"original_position":193,"commit_id":"f3690187513a2417a917f7b7405d855a2df36af7","original_commit_id":"f3690187513a2417a917f7b7405d855a2df36af7","user":{"login":"carsongee","id":596029,"avatar_url":"https://avatars.githubusercontent.com/u/596029?v=3","gravatar_id":"","url":"https://api.github.com/users/carsongee","html_url":"https://github.com/carsongee","followers_url":"https://api.github.com/users/carsongee/followers","following_url":"https://api.github.com/users/carsongee/following{/other_user}","gists_url":"https://api.github.com/users/carsongee/gists{/gist_id}","starred_url":"https://api.github.com/users/carsongee/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/carsongee/subscriptions","organizations_url":"https://api.github.com/users/carsongee/orgs","repos_url":"https://api.github.com/users/carsongee/repos","events_url":"https://api.github.com/users/carsongee/events{/privacy}","received_events_url":"https://api.github.com/users/carsongee/received_events","type":"User","site_admin":false},"body":"multiple lines if possible","created_at":"2015-05-12T15:54:54Z","updated_at":"2015-05-12T15:54:54Z","html_url":"https://github.com/starteam/starcellbio_html/pull/190#discussion_r30149047","pull_request_url":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190","_links":{"self":{"href":"https://api.github.com/repos/starteam/starcellbio_html/pulls/comments/30149047"},"html":{"href":"https://github.com/starteam/starcellbio_html/pull/190#discussion_r30149047"},"pull_request":{"href":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190"}}},"pull_request":{"url":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190","id":35193061,"html_url":"https://github.com/starteam/starcellbio_html/pull/190","diff_url":"https://github.com/starteam/starcellbio_html/pull/190.diff","patch_url":"https://github.com/starteam/starcellbio_html/pull/190.patch","issue_url":"https://api.github.com/repos/starteam/starcellbio_html/issues/190","number":190,"state":"open","locked":false,"title":"microscopy: rewrite analysis and condition in template sample_prep","user":{"login":"annagav","id":7574259,"avatar_url":"https://avatars.githubusercontent.com/u/7574259?v=3","gravatar_id":"","url":"https://api.github.com/users/annagav","html_url":"https://github.com/annagav","followers_url":"https://api.github.com/users/annagav/followers","following_url":"https://api.github.com/users/annagav/following{/other_user}","gists_url":"https://api.github.com/users/annagav/gists{/gist_id}","starred_url":"https://api.github.com/users/annagav/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annagav/subscriptions","organizations_url":"https://api.github.com/users/annagav/orgs","repos_url":"https://api.github.com/users/annagav/repos","events_url":"https://api.github.com/users/annagav/events{/privacy}","received_events_url":"https://api.github.com/users/annagav/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-05-12T04:49:56Z","updated_at":"2015-05-12T15:54:54Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e06b89142624746f387b6be0238622582714254b","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190/commits","review_comments_url":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190/comments","review_comment_url":"https://api.github.com/repos/starteam/starcellbio_html/pulls/comments{/number}","comments_url":"https://api.github.com/repos/starteam/starcellbio_html/issues/190/comments","statuses_url":"https://api.github.com/repos/starteam/starcellbio_html/statuses/f3690187513a2417a917f7b7405d855a2df36af7","head":{"label":"annagav:feature/refactor_microscopy_template","ref":"feature/refactor_microscopy_template","sha":"f3690187513a2417a917f7b7405d855a2df36af7","user":{"login":"annagav","id":7574259,"avatar_url":"https://avatars.githubusercontent.com/u/7574259?v=3","gravatar_id":"","url":"https://api.github.com/users/annagav","html_url":"https://github.com/annagav","followers_url":"https://api.github.com/users/annagav/followers","following_url":"https://api.github.com/users/annagav/following{/other_user}","gists_url":"https://api.github.com/users/annagav/gists{/gist_id}","starred_url":"https://api.github.com/users/annagav/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annagav/subscriptions","organizations_url":"https://api.github.com/users/annagav/orgs","repos_url":"https://api.github.com/users/annagav/repos","events_url":"https://api.github.com/users/annagav/events{/privacy}","received_events_url":"https://api.github.com/users/annagav/received_events","type":"User","site_admin":false},"repo":{"id":26652367,"name":"starcellbio_html","full_name":"annagav/starcellbio_html","owner":{"login":"annagav","id":7574259,"avatar_url":"https://avatars.githubusercontent.com/u/7574259?v=3","gravatar_id":"","url":"https://api.github.com/users/annagav","html_url":"https://github.com/annagav","followers_url":"https://api.github.com/users/annagav/followers","following_url":"https://api.github.com/users/annagav/following{/other_user}","gists_url":"https://api.github.com/users/annagav/gists{/gist_id}","starred_url":"https://api.github.com/users/annagav/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/annagav/subscriptions","organizations_url":"https://api.github.com/users/annagav/orgs","repos_url":"https://api.github.com/users/annagav/repos","events_url":"https://api.github.com/users/annagav/events{/privacy}","received_events_url":"https://api.github.com/users/annagav/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/annagav/starcellbio_html","description":"","fork":true,"url":"https://api.github.com/repos/annagav/starcellbio_html","forks_url":"https://api.github.com/repos/annagav/starcellbio_html/forks","keys_url":"https://api.github.com/repos/annagav/starcellbio_html/keys{/key_id}","collaborators_url":"https://api.github.com/repos/annagav/starcellbio_html/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/annagav/starcellbio_html/teams","hooks_url":"https://api.github.com/repos/annagav/starcellbio_html/hooks","issue_events_url":"https://api.github.com/repos/annagav/starcellbio_html/issues/events{/number}","events_url":"https://api.github.com/repos/annagav/starcellbio_html/events","assignees_url":"https://api.github.com/repos/annagav/starcellbio_html/assignees{/user}","branches_url":"https://api.github.com/repos/annagav/starcellbio_html/branches{/branch}","tags_url":"https://api.github.com/repos/annagav/starcellbio_html/tags","blobs_url":"https://api.github.com/repos/annagav/starcellbio_html/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/annagav/starcellbio_html/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/annagav/starcellbio_html/git/refs{/sha}","trees_url":"https://api.github.com/repos/annagav/starcellbio_html/git/trees{/sha}","statuses_url":"https://api.github.com/repos/annagav/starcellbio_html/statuses/{sha}","languages_url":"https://api.github.com/repos/annagav/starcellbio_html/languages","stargazers_url":"https://api.github.com/repos/annagav/starcellbio_html/stargazers","contributors_url":"https://api.github.com/repos/annagav/starcellbio_html/contributors","subscribers_url":"https://api.github.com/repos/annagav/starcellbio_html/subscribers","subscription_url":"https://api.github.com/repos/annagav/starcellbio_html/subscription","commits_url":"https://api.github.com/repos/annagav/starcellbio_html/commits{/sha}","git_commits_url":"https://api.github.com/repos/annagav/starcellbio_html/git/commits{/sha}","comments_url":"https://api.github.com/repos/annagav/starcellbio_html/comments{/number}","issue_comment_url":"https://api.github.com/repos/annagav/starcellbio_html/issues/comments{/number}","contents_url":"https://api.github.com/repos/annagav/starcellbio_html/contents/{+path}","compare_url":"https://api.github.com/repos/annagav/starcellbio_html/compare/{base}...{head}","merges_url":"https://api.github.com/repos/annagav/starcellbio_html/merges","archive_url":"https://api.github.com/repos/annagav/starcellbio_html/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/annagav/starcellbio_html/downloads","issues_url":"https://api.github.com/repos/annagav/starcellbio_html/issues{/number}","pulls_url":"https://api.github.com/repos/annagav/starcellbio_html/pulls{/number}","milestones_url":"https://api.github.com/repos/annagav/starcellbio_html/milestones{/number}","notifications_url":"https://api.github.com/repos/annagav/starcellbio_html/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/annagav/starcellbio_html/labels{/name}","releases_url":"https://api.github.com/repos/annagav/starcellbio_html/releases{/id}","created_at":"2014-11-14T18:45:00Z","updated_at":"2014-11-14T18:45:01Z","pushed_at":"2015-05-12T04:45:55Z","git_url":"git://github.com/annagav/starcellbio_html.git","ssh_url":"git@github.com:annagav/starcellbio_html.git","clone_url":"https://github.com/annagav/starcellbio_html.git","svn_url":"https://github.com/annagav/starcellbio_html","homepage":null,"size":316404,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"starteam:develop","ref":"develop","sha":"b46b14d5f8f61e4906f39573c507e933f467f97e","user":{"login":"starteam","id":2973496,"avatar_url":"https://avatars.githubusercontent.com/u/2973496?v=3","gravatar_id":"","url":"https://api.github.com/users/starteam","html_url":"https://github.com/starteam","followers_url":"https://api.github.com/users/starteam/followers","following_url":"https://api.github.com/users/starteam/following{/other_user}","gists_url":"https://api.github.com/users/starteam/gists{/gist_id}","starred_url":"https://api.github.com/users/starteam/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/starteam/subscriptions","organizations_url":"https://api.github.com/users/starteam/orgs","repos_url":"https://api.github.com/users/starteam/repos","events_url":"https://api.github.com/users/starteam/events{/privacy}","received_events_url":"https://api.github.com/users/starteam/received_events","type":"Organization","site_admin":false},"repo":{"id":7005293,"name":"starcellbio_html","full_name":"starteam/starcellbio_html","owner":{"login":"starteam","id":2973496,"avatar_url":"https://avatars.githubusercontent.com/u/2973496?v=3","gravatar_id":"","url":"https://api.github.com/users/starteam","html_url":"https://github.com/starteam","followers_url":"https://api.github.com/users/starteam/followers","following_url":"https://api.github.com/users/starteam/following{/other_user}","gists_url":"https://api.github.com/users/starteam/gists{/gist_id}","starred_url":"https://api.github.com/users/starteam/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/starteam/subscriptions","organizations_url":"https://api.github.com/users/starteam/orgs","repos_url":"https://api.github.com/users/starteam/repos","events_url":"https://api.github.com/users/starteam/events{/privacy}","received_events_url":"https://api.github.com/users/starteam/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/starteam/starcellbio_html","description":"","fork":false,"url":"https://api.github.com/repos/starteam/starcellbio_html","forks_url":"https://api.github.com/repos/starteam/starcellbio_html/forks","keys_url":"https://api.github.com/repos/starteam/starcellbio_html/keys{/key_id}","collaborators_url":"https://api.github.com/repos/starteam/starcellbio_html/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/starteam/starcellbio_html/teams","hooks_url":"https://api.github.com/repos/starteam/starcellbio_html/hooks","issue_events_url":"https://api.github.com/repos/starteam/starcellbio_html/issues/events{/number}","events_url":"https://api.github.com/repos/starteam/starcellbio_html/events","assignees_url":"https://api.github.com/repos/starteam/starcellbio_html/assignees{/user}","branches_url":"https://api.github.com/repos/starteam/starcellbio_html/branches{/branch}","tags_url":"https://api.github.com/repos/starteam/starcellbio_html/tags","blobs_url":"https://api.github.com/repos/starteam/starcellbio_html/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/starteam/starcellbio_html/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/starteam/starcellbio_html/git/refs{/sha}","trees_url":"https://api.github.com/repos/starteam/starcellbio_html/git/trees{/sha}","statuses_url":"https://api.github.com/repos/starteam/starcellbio_html/statuses/{sha}","languages_url":"https://api.github.com/repos/starteam/starcellbio_html/languages","stargazers_url":"https://api.github.com/repos/starteam/starcellbio_html/stargazers","contributors_url":"https://api.github.com/repos/starteam/starcellbio_html/contributors","subscribers_url":"https://api.github.com/repos/starteam/starcellbio_html/subscribers","subscription_url":"https://api.github.com/repos/starteam/starcellbio_html/subscription","commits_url":"https://api.github.com/repos/starteam/starcellbio_html/commits{/sha}","git_commits_url":"https://api.github.com/repos/starteam/starcellbio_html/git/commits{/sha}","comments_url":"https://api.github.com/repos/starteam/starcellbio_html/comments{/number}","issue_comment_url":"https://api.github.com/repos/starteam/starcellbio_html/issues/comments{/number}","contents_url":"https://api.github.com/repos/starteam/starcellbio_html/contents/{+path}","compare_url":"https://api.github.com/repos/starteam/starcellbio_html/compare/{base}...{head}","merges_url":"https://api.github.com/repos/starteam/starcellbio_html/merges","archive_url":"https://api.github.com/repos/starteam/starcellbio_html/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/starteam/starcellbio_html/downloads","issues_url":"https://api.github.com/repos/starteam/starcellbio_html/issues{/number}","pulls_url":"https://api.github.com/repos/starteam/starcellbio_html/pulls{/number}","milestones_url":"https://api.github.com/repos/starteam/starcellbio_html/milestones{/number}","notifications_url":"https://api.github.com/repos/starteam/starcellbio_html/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/starteam/starcellbio_html/labels{/name}","releases_url":"https://api.github.com/repos/starteam/starcellbio_html/releases{/id}","created_at":"2012-12-04T19:09:23Z","updated_at":"2015-05-07T16:10:07Z","pushed_at":"2015-05-12T04:49:56Z","git_url":"git://github.com/starteam/starcellbio_html.git","ssh_url":"git@github.com:starteam/starcellbio_html.git","clone_url":"https://github.com/starteam/starcellbio_html.git","svn_url":"https://github.com/starteam/starcellbio_html","homepage":null,"size":587450,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":6,"mirror_url":null,"open_issues_count":75,"forks":6,"open_issues":75,"watchers":0,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190"},"html":{"href":"https://github.com/starteam/starcellbio_html/pull/190"},"issue":{"href":"https://api.github.com/repos/starteam/starcellbio_html/issues/190"},"comments":{"href":"https://api.github.com/repos/starteam/starcellbio_html/issues/190/comments"},"review_comments":{"href":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190/comments"},"review_comment":{"href":"https://api.github.com/repos/starteam/starcellbio_html/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/starteam/starcellbio_html/pulls/190/commits"},"statuses":{"href":"https://api.github.com/repos/starteam/starcellbio_html/statuses/f3690187513a2417a917f7b7405d855a2df36af7"}}}}