diff options
| -rw-r--r-- | src/components/AssignLabs/AssignLabs.svelte | 6 | ||||
| -rw-r--r-- | src/components/AssignLabs/LabBox.svelte | 34 | ||||
| -rw-r--r-- | src/components/helpers/Icon.svelte | 2 |
3 files changed, 22 insertions, 20 deletions
diff --git a/src/components/AssignLabs/AssignLabs.svelte b/src/components/AssignLabs/AssignLabs.svelte index 9623560..1bbc006 100644 --- a/src/components/AssignLabs/AssignLabs.svelte +++ b/src/components/AssignLabs/AssignLabs.svelte @@ -78,6 +78,7 @@ } function unassignLab(id: number) { + console.log("unassiging", id) const lab = $labStore.get(id); if (lab === undefined) return; lab.assigned = false; @@ -119,7 +120,6 @@ : ""} on:click={() => { selectedPeerTeacher = pt; - console.log(pt); }} > <svelte:component this={PT} {pt} /> @@ -133,7 +133,7 @@ <div class="assign-box-header">Labs</div> <div class="assign-box-body"> {#each compatibleLabs as lab} - <svelte:component this={Lab} {lab} {selectedPeerTeacher} /> + <svelte:component this={Lab} {lab} iconClick={()=>{assignLab(lab.id)}} /> {/each} </div> </div> @@ -145,7 +145,7 @@ </div> <div class="assign-box-body"> {#each assignedLabs as lab} - <svelte:component this={Lab} {lab} assign={false} /> + <svelte:component this={Lab} {lab} icon="minus-circle" iconClick={()=>{unassignLab(lab.id)}} /> {/each} </div> </div> diff --git a/src/components/AssignLabs/LabBox.svelte b/src/components/AssignLabs/LabBox.svelte index 7888884..0b9c8f2 100644 --- a/src/components/AssignLabs/LabBox.svelte +++ b/src/components/AssignLabs/LabBox.svelte @@ -5,10 +5,8 @@ export let lab: Lab; export let assign: boolean = true; export let selectedPeerTeacher: PeerTeacher | null = null; - - function onIconClick() { - console.log("Clicked lab", lab.course, lab.section); - } + export let iconClick = () => {} + export let iconName :string = "plus-circle"; </script> <!-- Lab box --> @@ -20,15 +18,27 @@ <!-- Top Half --> <div class="flex flex-row"> <strong class="flex-grow">CSCE {lab.course} - {lab.section}</strong> - {#if assign} + <Icon name="minus-circle" class="h-6 w-6" handleClick={()=>{iconClick()}}/> + </div> + </div> + <!-- Bottom half --> + <div> + <p class="text-xs">{lab.event.info}</p> + <p class="text-xs">{lab.building} {lab.room}</p> + </div> +</div> + + <!-- {#if assign} <Icon name="plus-circle" class="h-6 w-6" handleClick={() => { - selectedPeerTeacher?.assignLab(lab.id); + iconClick() + // selectedPeerTeacher?.assignLab(lab.id); //TODO Adding a lab to a PT doesn't update the current "Labs" and "PT's Labs" columns //TODO This was handled by self assignment in the assign labs function in Scott's version, but now this logic is passed down into a child component (this component) and self-assigning down here does not seem to help - selectedPeerTeacher = selectedPeerTeacher; + + //// selectedPeerTeacher = selectedPeerTeacher; }} /> {:else} @@ -43,12 +53,4 @@ ); }} /> - {/if} - </div> - </div> - <!-- Bottom half --> - <div> - <p class="text-xs">{lab.event.info}</p> - <p class="text-xs">{lab.building} {lab.room}</p> - </div> -</div> + {/if} -->
\ No newline at end of file diff --git a/src/components/helpers/Icon.svelte b/src/components/helpers/Icon.svelte index c9154f3..8dc2a89 100644 --- a/src/components/helpers/Icon.svelte +++ b/src/components/helpers/Icon.svelte @@ -4,7 +4,7 @@ export let height = "1rem"; export let focusable = "false"; export let handleClick = () => { - console.log("Default icon on:click function prints this"); + console.log("Default on:click handler for Icon.svelte. No handler passed"); }; let icons = [ { |