Skip to content

Commit

Permalink
Merge pull request #755 from WildMeOrg/project-table-column-width
Browse files Browse the repository at this point in the history 
adjust project table column width
  • Loading branch information
@erinz2020
erinz2020 authored Sep 12, 2024
2 parents c00ba0a + a673077 commit e7554c7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/main/webapp/projects/project.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@
<table class="row project-style js-sort-table" >
<thead>
<tr>
<th class="project-style"><%= projectProps.getProperty("OccurrenceTableHeader")%></th>
<th class="project-style"><%= projectProps.getProperty("EncounterTableHeader")%></th>
<th class="project-style" data-js-sort-colnum="0"><%= projectProps.getProperty("IndividualTableHeader")%></th>
<th class="project-style" style="max-width: 180px; word-break: break-all; over-flow:hidden"><%= projectProps.getProperty("OccurrenceTableHeader")%></th>
<th class="project-style" style="max-width: 180px; word-break: break-all; over-flow:hidden"><%= projectProps.getProperty("EncounterTableHeader")%></th>
<th class="project-style" style="max-width: 180px; word-break: break-all; over-flow:hidden" data-js-sort-colnum="0"><%= projectProps.getProperty("IndividualTableHeader")%></th>
<th class="project-style js-sort-date" data-js-sort-colnum="1"><%= projectProps.getProperty("DateTimeTableHeader")%></th>
<th class="project-style"><%= projectProps.getProperty("LocationTableHeader")%></th>
<th class="project-style"><%= projectProps.getProperty("DataOwnerTableHeader")%></th>
Expand Down Expand Up @@ -296,9 +296,9 @@ function projectHTMLForTable(json, encounters, currentEncounterIndex) {
let projectHTML = '';
projectHTML += '<tr id="enc-'+encounterId+'" class="encounterRow">';
projectHTML += '<td id="occurrenceID-'+encounterId+'" class="project-style"><a target="_new" href="../occurrence.jsp?number='+occurrenceUUID+'">'+occurrenceUUID+'</a></td>';
projectHTML += '<td id="catalogNumber-'+encounterId+'" class="project-style"><a target="_new" href="../encounters/encounter.jsp?number='+encounterId+'">'+encounterId+'</a></td>';
projectHTML += '<td id="indivID-'+encounterId+'" class="project-style"><a target="_new" href="../individuals.jsp?id='+individualUUID+'">'+individualDisplayName+'</a></td>';
projectHTML += '<td id="occurrenceID-'+encounterId+'" class="project-style" style="max-width: 180px; word-break: break-all; over-flow:hidden"><a target="_new" href="../occurrence.jsp?number='+occurrenceUUID+'">'+occurrenceUUID+'</a></td>';
projectHTML += '<td id="catalogNumber-'+encounterId+'" class="project-style" style="max-width: 180px; word-break: break-all; over-flow:hidden"><a target="_new" href="../encounters/encounter.jsp?number='+encounterId+'">'+encounterId+'</a></td>';
projectHTML += '<td id="indivID-'+encounterId+'" class="project-style" style="max-width: 180px; word-break: break-all; over-flow:hidden"><a target="_new" href="../individuals.jsp?id='+individualUUID+'">'+individualDisplayName+'</a></td>';
projectHTML += '<td class="project-style">'+encounterDate+' </td>';
projectHTML += '<td class="project-style">'+locationId+' </td>';
projectHTML += '<td class="project-style">'+submitterId+' </td>';
Expand All @@ -321,15 +321,15 @@ function projectHTMLForTable(json, encounters, currentEncounterIndex) {
//upper row action
projectHTML += '<div class="row">';
projectHTML += ' <div class="col-sm-6 col-md-6 col-lg-6">';
projectHTML += ' <div class="col-sm-12 col-md-12 col-lg-6">';
// add JS check for ia availability onload
projectHTML += ' <button id="encId-'+encounterId+'" class="startMatchButton proj-action-btn" onclick="startMatchForEncounter(this, \'' + encounterId + '\')">'+txt.startMatch+'</button>';
projectHTML += ' <button id="disabled-encId-'+encounterId+'" class="disabled-btn proj-action-btn" style="display: none;">'+txt.startMatch+'</button>';
projectHTML += ' </br>';
projectHTML += ' </div>';
// add JS check for exisitng results onload (add .disabled-btn if appropriate)
projectHTML += ' <div class="col-sm-6 col-md-6 col-lg-6">';
projectHTML += ' <div class="col-sm-12 col-md-12 col-lg-6">';
projectHTML += ' <button id="disabled-match-results-encId-'+encounterId+'" style="display: none;" class="disabled-btn visitResultsButton proj-action-btn">'+txt.matchResults+'</button>';
projectHTML += ' <button id="match-results-encId-'+encounterId+'" class="visitResultsButton proj-action-btn" onclick="openIaResultsOptions(this)">'+txt.matchResults+'</button>';
projectHTML += ' </br>';
Expand All @@ -339,7 +339,7 @@ function projectHTMLForTable(json, encounters, currentEncounterIndex) {
//lower row action
projectHTML += '<div class="row">';
projectHTML += ' <div class="col-sm-6 col-md-6 col-lg-6">';
projectHTML += ' <div class="col-sm-12 col-md-12 col-lg-6">';
let disabledMarkNew = ' <button class="disabled-btn proj-action-btn" id="disabled-mark-new-button_'+encounterId+'" style="display: none;"><%= projectProps.getProperty("MarkNew")%></button>';
if(!hasNameKeyMatchingProject){
Expand All @@ -357,7 +357,7 @@ function projectHTMLForTable(json, encounters, currentEncounterIndex) {
projectHTML += ' </div>';
projectHTML += ' <div class="col-sm-6 col-md-6 col-lg-6">';
projectHTML += ' <div class="col-sm-12 col-md-12 col-lg-6">';
projectHTML += ' <button class="btn-warn proj-action-btn" onclick="removeEncounterFromProject(this)" title="remove encounter from project">'+txt.remove+'</button>';
projectHTML += ' <span class="deleteMessage text-danger"></span>';
projectHTML += ' </div>';
Expand Down

0 comments on commit e7554c7

Please sign in to comment.