chore: added more data to the applications

api/src/main/kotlin/com/andr3h3nriqu3s/applications/ApplicationsController.kt

@@ -52,6 +52,8 @@ data class Application(
         var create_time: String,
         var simple_url: String,
         var job_level: String,
+        var inperson_type: String,
+        var location: String,
         var flairs: List<Flair>,
         var events: List<Event>,
         var urls: List<String>,
@@ -73,6 +75,8 @@ data class Application(
                     rs.getString("create_time"),
                     rs.getString("simple_url"),
                     rs.getString("job_level"),
+                    rs.getString("inperson_type"),
+                    rs.getString("location"),
                     emptyList(),
                     emptyList(),
                     emptyList(),
@@ -155,6 +159,8 @@ class ApplicationsController(
                         "",
                         "",
                         "",
+                        "",
+                        "",
                         emptyList(),
                         emptyList(),
                         emptyList(),
@@ -511,6 +517,8 @@ class ApplicationService(
                             "",
                             if (elm.contains("linkedin")) elm.split("?")[0] else "",
                             "",
+                            "",
+                            "",
                             emptyList(),
                             emptyList(),
                             emptyList(),
@@ -533,7 +541,7 @@ class ApplicationService(
 
         // Create time is auto created by the database
         db.update(
-                "insert into applications (id, url, title, user_id, extra_data, payrange, status_id, company, recruiter, message, agency, simple_url, job_level) values (?,?,?,?,?,?,?,?,?,?,?,?,?);",
+                "insert into applications (id, url, title, user_id, extra_data, payrange, status_id, company, recruiter, message, agency, simple_url, job_level, inperson_type, location) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);",
                 application.id,
                 application.url,
                 application.title,
@@ -547,6 +555,8 @@ class ApplicationService(
                 application.agency,
                 application.simple_url,
                 application.job_level,
+                application.inperson_type,
+                application.location,
         )
 
         eventService.create(application.id, EventType.Creation)
@@ -594,7 +604,7 @@ class ApplicationService(
     public fun update(application: Application): Application {
         // I don't want ot update create_time
         db.update(
-                "update applications set url=?, title=?, user_id=?, extra_data=?, payrange=?, company=?, recruiter=?, message=?, agency=?, simple_url=?, job_level=? where id=?",
+                "update applications set url=?, title=?, user_id=?, extra_data=?, payrange=?, company=?, recruiter=?, message=?, agency=?, simple_url=?, job_level=?, inperson_type=?, location=? where id=?",
                 application.url,
                 application.title,
                 application.user_id,
@@ -606,6 +616,8 @@ class ApplicationService(
                 application.agency,
                 application.simple_url,
                 application.job_level,
+                application.inperson_type,
+                application.location,
                 application.id,
         )
         return application

api/src/main/resources/schema.sql

@@ -19,6 +19,9 @@ create table if not exists applications (
     user_id text,
     extra_data text,
     job_level text default '',
+    -- remote - hyrbrid - in-person
+    inperson_type text default '',
+    location text default '',
     status_id text default null,
     agency boolean default false,
     create_time timestamp default now ()

extensions/definitions.js

@@ -15,9 +15,13 @@ browser.runtime.onMessage.addListener((message) => {
                 Object.values(document.querySelector('button[class="job-details-preferences-and-skills"]')?.children ?? []).find(a => a.innerText.match(/\d/) && !a.innerText.match('skill'))?.innerText ??
                 '';
 
+            const inperson_type = (Object.values(document.querySelector('button[class="job-details-preferences-and-skills"]')?.children).find(a => a.innerText.match(/hybrid|remote|on-site/i))?.innerText?.split('\n') ?? [])[0]?.trim() ?? ''
+
+            const location = document.querySelector('div[class^="job-details-jobs-unified-top-card__primary-description-container"]')?.children[0]?.children[0]?.innerText ?? ''
+
             const description = document.querySelector('article').textContent;
 
-		    browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description });
+		    browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description, location, inperson_type });
             return;
         }
         // Ignore everything that is no glassdoor
@@ -32,12 +36,14 @@ browser.runtime.onMessage.addListener((message) => {
 
         let money = document.querySelectorAll('div[class^="SalaryEstimate_salaryRange"]')?.[0]?.innerText ?? '';
 
+        const location = document.querySelector('div[data-test="location"]')?.innerText ?? '';
+
         const moneySectionNode = document.querySelector('section>section');
         if (moneySectionNode && ["Base pay range", "Base pay"].includes(moneySectionNode.querySelector('h2')?.textContent)) {
             money = moneySectionNode.querySelector("div>div>div").children[1]?.textContent ?? ''
         }
 
-		browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description });
+		browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description, location, inperson_type: '' });
 	} else if (message.type === "GOT_INFO_R") {
 		window.postMessage(message);
 	}

site/src/lib/ApplicationsStore.svelte.ts

@@ -34,6 +34,8 @@ export type Application = {
     create_time: string;
     status_history: string;
     job_level: string;
+    location: string;
+    inperson_type: string;
     flairs: Flair[];
     events: ApplicationEvent[];
     urls: string[];

site/src/lib/InplaceDialog.svelte

@@ -15,10 +15,11 @@
 
 	let open = $state(false);
 	let ref: HTMLDivElement;
+	let btn: HTMLButtonElement;
 
 	function callOutside(e: MouseEvent) {
 		if (!ref) return;
-		if (!ref.contains(e.target as any)) return;
+		if (ref.contains(e.target as any) || btn.contains(e.target as any)) return;
 		open = false;
 	}
 
@@ -31,7 +32,7 @@
 </script>
 
 <div class="relative">
-	<button class={buttonClass} onclick={() => (open = true)}>
+	<button class={buttonClass} onclick={() => (open = true)} bind:this={btn}>
 		{@render buttonChildren()}
 	</button>
 	{#if open}

site/src/routes/cv/+page.svelte

@@ -328,8 +328,8 @@
 	<div class="bg-white p-2 text-black rounded-lg w-[190mm] print:text-sm">
 		<div>
 			<div>
-				<h1>BCompSc with First Class Honours @ University of Surrey</h1>
+				<h1>BSc Computer Science @ University of Surrey</h1>
-				<div class="ml-5">
+				<div class="ml-2 flex justify-between">
 					<h2>July 2020 - June 2024</h2>
 				</div>
 			</div>

site/src/routes/graphs/+page.svelte

@@ -212,6 +212,71 @@
 							{} as Record<string, number>
 						)}
 					/>
+					<Pie
+						title={'Location'}
+						sensitivity={0.01}
+						data={applicationStore.all.reduce(
+							(acc, item) => {
+								const l = item.location === '' ? 'Unknown' : item.location;
+								if (acc[l]) {
+									acc[l] += 1;
+								} else {
+									acc[l] = 1;
+								}
+								return acc;
+							},
+							{} as Record<string, number>
+						)}
+					/>
+					<Pie
+						title={'In Person type'}
+						sensitivity={0.01}
+						data={applicationStore.all.reduce(
+							(acc, item) => {
+								const l =
+									item.inperson_type === '' ? 'Unknown' : item.inperson_type;
+								if (acc[l]) {
+									acc[l] += 1;
+								} else {
+									acc[l] = 1;
+								}
+								return acc;
+							},
+							{} as Record<string, number>
+						)}
+					/>
+					<Pie
+						title={'Job Level'}
+						data={applicationStore.all.reduce(
+							(acc, a) => {
+								const job_level = a.job_level ? a.job_level : 'Unknown';
+								if (acc[job_level]) {
+									acc[job_level] += 1;
+								} else {
+									acc[job_level] = 1;
+								}
+								return acc;
+							},
+							{} as Record<string, number>
+						)}
+						sensitivity={0.02}
+					/>
+					<Pie
+						title={'Agency'}
+						data={applicationStore.all.reduce(
+							(acc, a) => {
+								const i = a.agency ? 'Agency' : 'Direct';
+								if (acc[i]) {
+									acc[i] += 1;
+								} else {
+									acc[i] = 1;
+								}
+								return acc;
+							},
+							{} as Record<string, number>
+						)}
+						sensitivity={0.02}
+					/>
 				</div>
 				{#if flairStats !== 'loading'}
 					<div class="flex gap-5">
@@ -223,22 +288,6 @@
 								{/each}
 							</ul>
 						</div>
-						<Pie
-							title={'Job Level'}
-							data={applicationStore.all.reduce(
-								(acc, a) => {
-									const job_level = a.job_level ? a.job_level : 'Unknown';
-									if (acc[job_level]) {
-										acc[job_level] += 1;
-									} else {
-										acc[job_level] = 1;
-									}
-									return acc;
-								},
-								{} as Record<string, number>
-							)}
-							sensitivity={0.02}
-						/>
 					</div>
 				{/if}
 				<div bind:clientWidth={width}>

site/src/routes/graphs/Pie.svelte

@@ -45,9 +45,9 @@
 			dataf.push({
 				value: otherSum,
 				name: 'Other',
-				title: other
+				title: `Other: ${otherSum}\n${other
 					.toSorted((a, b) => b.value - a.value)
-					.reduce((acc, a) => `${acc}${a.name}: ${a.value}\n`, '')
+					.reduce((acc, a) => `${acc}${a.name}: ${a.value}\n`, '')}`
 			});
 		}
 

site/src/routes/work-area/SearchApplication.svelte

@@ -11,8 +11,11 @@
 		onreload: (item: Application) => void;
 	} = $props();
 
+	const JobLevels = ['intern', 'entry', 'junior', 'mid', 'senior', 'staff', 'lead', 'none'];
+
 	let filter = $state('');
 	let filterStatus: string[] = $state([]);
+	let jobLevels: string[] = $state([]);
 	let advFilters = $state(false);
 
 	type ExtraFilterType =
@@ -62,6 +65,11 @@
 				return false;
 			}
 
+			const temp = jobLevels.map((a) => (a === 'none' ? '' : a));
+			if (temp.length !== 0 && !temp.includes(i.job_level ?? '')) {
+				return false;
+			}
+
 			if (!filter) {
 				return true;
 			}
@@ -128,9 +136,10 @@
 			</div>
 		</div>
 		{#if advFilters}
-			<div>
+			<div class="flex gap-2">
 				<InplaceDialog
 					buttonClass="border-slate-300 border border-solid color-slate-300 p-1 rounded-md bg-slate-100/50"
+					dialogClass="w-[200px]"
 				>
 					{#snippet buttonChildren()}
 						<i class="bi bi-plus"></i> Status
@@ -150,6 +159,26 @@
 						{/each}
 					</div>
 				</InplaceDialog>
+				<InplaceDialog
+					buttonClass="border-slate-300 border border-solid color-slate-300 p-1 rounded-md bg-slate-100/50"
+					dialogClass="w-[200px]"
+				>
+					{#snippet buttonChildren()}
+						<i class="bi bi-plus"></i> Job Level
+					{/snippet}
+					<div class="flex flex-wrap gap-2">
+						{#each JobLevels.filter((a) => !jobLevels.includes(a)) as jobLevel}
+							<button
+								class="border-red-300 border border-solid color-red-300 bg-red-100/50 p-1 rounded-md text-red-800"
+								onclick={() => {
+									jobLevels = [...jobLevels, jobLevel];
+								}}
+							>
+								{jobLevel}
+							</button>
+						{/each}
+					</div>
+				</InplaceDialog>
 			</div>
 			<h2>Filters</h2>
 			<div class="flex gap-2">
@@ -163,6 +192,16 @@
 						{node.name}
 					</button>
 				{/each}
+				{#each jobLevels.filter((a) => jobLevels.includes(a)) as jobLevel}
+					<button
+						class="border-red-300 border border-solid color-red-300 bg-red-100/50 p-1 rounded-md text-red-800"
+						onclick={() => {
+							jobLevels = jobLevels.filter((a) => a != jobLevel);
+						}}
+					>
+						{jobLevel}
+					</button>
+				{/each}
 				{#each extraFiltersToDisplay as filter}
 					{#if filter.type === 'name'}
 						<span

site/src/routes/work-area/WorkArea.svelte

@@ -136,6 +136,13 @@
 			applicationStore.all[activeItem].payrange = lastExtData.money;
 		}
 
+		applicationStore.all[activeItem].inperson_type = (
+			lastExtData.inperson_type as string
+		).toLowerCase();
+		applicationStore.all[activeItem].location = (lastExtData.location as string).split(',')[0];
+
+		console.log(lastExtData);
+
 		const title: string = lastExtData.jobTitle;
 		if (title.match(/intern|apprenticeship/i)) {
 			applicationStore.all[activeItem].job_level = 'intern';
@@ -275,14 +282,45 @@
 						onchange={save}
 					/>
 				</fieldset>
-				<fieldset>
+				<label class="flabel" for="payrange">Pay Range</label>
-					<label class="flabel" for="payrange">Pay Range</label>
+				<fieldset class="flex items-center gap-2">
 					<input
 						class="finput"
 						id="payrange"
 						bind:value={applicationStore.all[activeItem].payrange}
 						onchange={save}
 					/>
+					<button
+						title="Move hourly to yearly"
+						class="p-2"
+						onclick={() => {
+							const payrange = applicationStore.all[activeItem!].payrange
+								// remove decimal places
+								.replace(/(\d+).(\d+)/g, '$1')
+								.replace(/[kK]/g, '000')
+								.replace(/[^\d\-–]/g, '')
+								.replace(/–/g, '-')
+								.split('-')
+								.map((a) => {
+									console.log('here', a);
+									return +a;
+								});
+
+							payrange[0] = payrange[0] * 8 * 5 * 4 * 12;
+							if (payrange[1] != undefined) {
+								payrange[1] = payrange[1] * 8 * 5 * 4 * 12;
+								applicationStore.all[activeItem!].payrange =
+									`${payrange[0]}-${payrange[1]}`;
+
+								window.requestAnimationFrame(() => save());
+								return;
+							}
+							applicationStore.all[activeItem!].payrange = `${payrange[0]}`;
+							window.requestAnimationFrame(() => save());
+						}}
+					>
+						<span class="bi bi-arrow-clockwise"></span>
+					</button>
 				</fieldset>
 				{#if !derivedItem.simple_url || showExtraData}
 					<fieldset class="max-w-full min-w-0 overflow-hidden">
@@ -317,23 +355,47 @@
 						</div>
 					</div>
 				{/if}
-				<fieldset>
+				<div class="flex gap-2">
-					<label class="flabel" for="title">Job Level</label>
+					<fieldset class="flex-grow">
-					<select
+						<label class="flabel" for="title">Job Level</label>
-						class="finput"
+						<select
-						id="job_level"
+							class="finput"
-						bind:value={applicationStore.all[activeItem].job_level}
+							id="job_level"
-						onchange={save}
+							bind:value={applicationStore.all[activeItem].job_level}
-					>
+							onchange={save}
-						<option value="intern"> Intern </option>
+						>
-						<option value="entry"> Entry </option>
+							<option value="intern"> Intern </option>
-						<option value="junior"> Junior </option>
+							<option value="entry"> Entry </option>
-						<option value="mid"> Mid </option>
+							<option value="junior"> Junior </option>
-						<option value="senior"> Senior </option>
+							<option value="mid"> Mid </option>
-						<option value="staff"> Staff </option>
+							<option value="senior"> Senior </option>
-						<option value="lead"> Lead </option>
+							<option value="staff"> Staff </option>
-					</select>
+							<option value="lead"> Lead </option>
-				</fieldset>
+						</select>
+					</fieldset>
+					<fieldset class="flex-grow">
+						<label class="flabel" for="title">In Person?</label>
+						<select
+							class="finput"
+							id="inperson_type"
+							bind:value={applicationStore.all[activeItem].inperson_type}
+							onchange={save}
+						>
+							<option value="on-site"> On-site </option>
+							<option value="remote"> Remote </option>
+							<option value="hybrid"> Hybrid </option>
+						</select>
+					</fieldset>
+					<fieldset class="flex-grow">
+						<label class="flabel" for="title">Location</label>
+						<input
+							class="finput"
+							id="location"
+							bind:value={applicationStore.all[activeItem].location}
+							onchange={save}
+						/>
+					</fieldset>
+				</div>
 				<div>
 					<div class="flabel">Tags</div>
 					<div class="flex gap-2 flex-wrap">