update UI for timekeeping page
This commit is contained in:
		
							parent
							
								
									75637b8499
								
							
						
					
					
						commit
						a1b2246666
					
				| 
						 | 
				
			
			@ -26,7 +26,6 @@ import {
 | 
			
		|||
  IconPasswordUser,
 | 
			
		||||
  IconReport,
 | 
			
		||||
  IconScan,
 | 
			
		||||
  IconSubtask,
 | 
			
		||||
  IconSun
 | 
			
		||||
} from '@tabler/icons-react'
 | 
			
		||||
import { useCallback, useEffect, useState } from 'react'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,11 +23,14 @@ import {
 | 
			
		|||
} from '@mantine/core'
 | 
			
		||||
import { useDisclosure } from '@mantine/hooks'
 | 
			
		||||
import { notifications } from '@mantine/notifications'
 | 
			
		||||
import { IconCheck, IconExclamationMark, IconX } from '@tabler/icons-react'
 | 
			
		||||
import {
 | 
			
		||||
  IconCheck,
 | 
			
		||||
  IconExclamationMark,
 | 
			
		||||
  IconPointFilled,
 | 
			
		||||
  IconX
 | 
			
		||||
} from '@tabler/icons-react'
 | 
			
		||||
import moment from 'moment'
 | 
			
		||||
import React, { useEffect, useRef, useState } from 'react'
 | 
			
		||||
import { Link } from 'react-router-dom'
 | 
			
		||||
import { Popover, PopoverBody } from 'reactstrap'
 | 
			
		||||
import { useEffect, useState } from 'react'
 | 
			
		||||
 | 
			
		||||
import classes from './Timekeeping.module.css'
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -762,8 +765,10 @@ const Timekeeping = () => {
 | 
			
		|||
                  {daysInMonth.map((d) => {
 | 
			
		||||
                    var total =
 | 
			
		||||
                      user.history.find((h) => h.day === d)?.total ?? 0
 | 
			
		||||
                    var notes = user.history.find((h) => h.day === d)?.notes
 | 
			
		||||
                    return (
 | 
			
		||||
                      <Table.Td
 | 
			
		||||
                        pos={'relative'}
 | 
			
		||||
                        key={d}
 | 
			
		||||
                        ta={'center'}
 | 
			
		||||
                        bg={
 | 
			
		||||
| 
						 | 
				
			
			@ -774,6 +779,14 @@ const Timekeeping = () => {
 | 
			
		|||
                            : ''
 | 
			
		||||
                        }
 | 
			
		||||
                      >
 | 
			
		||||
                        <Box
 | 
			
		||||
                          pos={'absolute'}
 | 
			
		||||
                          top={-3}
 | 
			
		||||
                          right={-3}
 | 
			
		||||
                          display={notes && notes.length > 0 ? 'block' : 'none'}
 | 
			
		||||
                        >
 | 
			
		||||
                          <IconPointFilled width={15} height={15} style={{color:"#2767e1"}} />
 | 
			
		||||
                        </Box>
 | 
			
		||||
                        {total / 60 / 60 < 7 &&
 | 
			
		||||
                        user.history.find(
 | 
			
		||||
                          (h) => h.day === d && h.values && h.values.length > 0,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue