Løste bug #26 implementerte datostempler #23

README.md

@@ -6,16 +6,20 @@ A very simple project management system. Uses a custom flat binary file database
 
 At it's current state it has a few very simple features tailored for a specific use set. Features include:
 
-- Create, load, store and manage a list of customers and their contact data
+- Create, load, store, search through and manage a list of customers and their contact data
 - Create, load, store and manage a list of projects and project details
 - Able to sort customers under individual projects
 - Able to set notification thresholds that reminds you before a project starts and/or project ends
 	- Thresholds are coded "green","yellow", and "red". The notification thresholds can be adjusted individually per project or globaly through the application settings
+	
+Check the "issues" page for functions (and bugs) that have been implemented (and resolved).
 
 ## About
 
 I threw this program together over the weekend (version 0.1), because a friend needed project manager such as this. Coincidentally, the program is named after him :)
 
+I know I have been sloppy with the naming convention of variables, which makes it hard (if not very hard) to read the source code by people who don't speak Norwegian. I will probably rewrite a large part of the code with a more understandable naming convention. The default language is also Norwegian which makes it impossible to translate to other languages if you don't already speak Norwegian. I will also addresss this in a future update. 
+
 ## License
 
 The program it's source and derivatives are licensed under GNU general public license (version 3) and copyrighted by me (Helge-Mikael Nordgård). See file "LICENSE" for more details.

Saeterprosjekt.pro

@@ -1,5 +1,20 @@
-TEMPLATE = subdirs
+QT       += core gui
 
-CONFIG += ordered
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-SUBDIRS += src
+CONFIG += c++11
+RC_ICONS = saeterprosjekt_256.ico
+
+include(src/core/core.pri)
+include(src/mainwidgets/mainwidgets.pri)
+include(src/uidialogs/maindialogs/maindialogs.pri)
+include(src/uidialogs/widgetdialogs/kunde/kundedialoger.pri)
+include(src/uidialogs/widgetdialogs/prosjekt/prosjektdialoger.pri)
+
+TRANSLATIONS += \
+    $$PWD/trans/Saeterprosjekt_EN.ts
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target

Saeterprosjekt.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.15.0, 2021-09-21T11:59:51. -->
+<!-- Written by QtCreator 4.15.0, 2021-09-29T00:16:25. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -99,8 +99,8 @@
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\qt prosjekter\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -137,8 +137,8 @@
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\qt prosjekter\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -177,8 +177,8 @@
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\qt prosjekter\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -294,14 +294,14 @@
     <valuelist type="QVariantList" key="CustomOutputParsers"/>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/src/core/core.pro</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/src/core/core.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/Saeterprosjekt.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/Saeterprosjekt.pro</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug/src/core</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

res/LICENSE

@@ -0,0 +1,625 @@
+GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and
+other kinds of works.
+
+The licenses for most software and other practical works are designed to take
+away your freedom to share and change the works. By contrast, the GNU General
+Public License is intended to guarantee your freedom to share and change all
+versions of a program--to make sure it remains free software for all its users.
+We, the Free Software Foundation, use the GNU General Public License for most
+of our software; it applies also to any other work released this way by its
+authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom
+to distribute copies of free software (and charge for them if you wish), that
+you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs, and that you know you
+can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights
+or asking you to surrender the rights. Therefore, you have certain responsibilities
+if you distribute copies of the software, or if you modify it: responsibilities
+to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or
+for a fee, you must pass on to the recipients the same freedoms that you received.
+You must make sure that they, too, receive or can get the source code. And
+you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert
+copyright on the software, and (2) offer you this License giving you legal
+permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that
+there is no warranty for this free software. For both users' and authors'
+sake, the GPL requires that modified versions be marked as changed, so that
+their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified
+versions of the software inside them, although the manufacturer can do so.
+This is fundamentally incompatible with the aim of protecting users' freedom
+to change the software. The systematic pattern of such abuse occurs in the
+area of products for individuals to use, which is precisely where it is most
+unacceptable. Therefore, we have designed this version of the GPL to prohibit
+the practice for those products. If such problems arise substantially in other
+domains, we stand ready to extend this provision to those domains in future
+versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States
+should not allow patents to restrict development and use of software on general-purpose
+computers, but in those that do, we wish to avoid the special danger that
+patents applied to a free program could make it effectively proprietary. To
+prevent this, the GPL assures that patents cannot be used to render the program
+non-free.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS
+
+   0. Definitions.
+
+   "This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of works,
+such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this License.
+Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
+or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work in
+a fashion requiring copyright permission, other than the making of an exact
+copy. The resulting work is called a "modified version" of the earlier work
+or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based on the
+Program.
+
+To "propagate" a work means to do anything with it that, without permission,
+would make you directly or secondarily liable for infringement under applicable
+copyright law, except executing it on a computer or modifying a private copy.
+Propagation includes copying, distribution (with or without modification),
+making available to the public, and in some countries other activities as
+well.
+
+To "convey" a work means any kind of propagation that enables other parties
+to make or receive copies. Mere interaction with a user through a computer
+network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to the
+extent that it includes a convenient and prominently visible feature that
+(1) displays an appropriate copyright notice, and (2) tells the user that
+there is no warranty for the work (except to the extent that warranties are
+provided), that licensees may convey the work under this License, and how
+to view a copy of this License. If the interface presents a list of user commands
+or options, such as a menu, a prominent item in the list meets this criterion.
+
+   1. Source Code.
+
+The "source code" for a work means the preferred form of the work for making
+modifications to it. "Object code" means any non-source form of a work.
+
+A "Standard Interface" means an interface that either is an official standard
+defined by a recognized standards body, or, in the case of interfaces specified
+for a particular programming language, one that is widely used among developers
+working in that language.
+
+The "System Libraries" of an executable work include anything, other than
+the work as a whole, that (a) is included in the normal form of packaging
+a Major Component, but which is not part of that Major Component, and (b)
+serves only to enable use of the work with that Major Component, or to implement
+a Standard Interface for which an implementation is available to the public
+in source code form. A "Major Component", in this context, means a major essential
+component (kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to produce
+the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all the source
+code needed to generate, install, and (for an executable work) run the object
+code and to modify the work, including scripts to control those activities.
+However, it does not include the work's System Libraries, or general-purpose
+tools or generally available free programs which are used unmodified in performing
+those activities but which are not part of the work. For example, Corresponding
+Source includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically linked
+subprograms that the work is specifically designed to require, such as by
+intimate data communication or control flow between those subprograms and
+other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate
+automatically from other parts of the Corresponding Source.
+
+   The Corresponding Source for a work in source code form is that same work.
+
+   2. Basic Permissions.
+
+All rights granted under this License are granted for the term of copyright
+on the Program, and are irrevocable provided the stated conditions are met.
+This License explicitly affirms your unlimited permission to run the unmodified
+Program. The output from running a covered work is covered by this License
+only if the output, given its content, constitutes a covered work. This License
+acknowledges your rights of fair use or other equivalent, as provided by copyright
+law.
+
+You may make, run and propagate covered works that you do not convey, without
+conditions so long as your license otherwise remains in force. You may convey
+covered works to others for the sole purpose of having them make modifications
+exclusively for you, or provide you with facilities for running those works,
+provided that you comply with the terms of this License in conveying all material
+for which you do not control copyright. Those thus making or running the covered
+works for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of your copyrighted
+material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions
+stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+   3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological measure
+under any applicable law fulfilling obligations under article 11 of the WIPO
+copyright treaty adopted on 20 December 1996, or similar laws prohibiting
+or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention
+of technological measures to the extent such circumvention is effected by
+exercising rights under this License with respect to the covered work, and
+you disclaim any intention to limit operation or modification of the work
+as a means of enforcing, against the work's users, your or third parties'
+legal rights to forbid circumvention of technological measures.
+
+   4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you receive
+it, in any medium, provided that you conspicuously and appropriately publish
+on each copy an appropriate copyright notice; keep intact all notices stating
+that this License and any non-permissive terms added in accord with section
+7 apply to the code; keep intact all notices of the absence of any warranty;
+and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you
+may offer support or warranty protection for a fee.
+
+   5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to produce
+it from the Program, in the form of source code under the terms of section
+4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified it, and
+giving a relevant date.
+
+b) The work must carry prominent notices stating that it is released under
+this License and any conditions added under section 7. This requirement modifies
+the requirement in section 4 to "keep intact all notices".
+
+c) You must license the entire work, as a whole, under this License to anyone
+who comes into possession of a copy. This License will therefore apply, along
+with any applicable section 7 additional terms, to the whole of the work,
+and all its parts, regardless of how they are packaged. This License gives
+no permission to license the work in any other way, but it does not invalidate
+such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display Appropriate
+Legal Notices; however, if the Program has interactive interfaces that do
+not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works,
+which are not by their nature extensions of the covered work, and which are
+not combined with it such as to form a larger program, in or on a volume of
+a storage or distribution medium, is called an "aggregate" if the compilation
+and its resulting copyright are not used to limit the access or legal rights
+of the compilation's users beyond what the individual works permit. Inclusion
+of a covered work in an aggregate does not cause this License to apply to
+the other parts of the aggregate.
+
+   6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of sections
+4 and 5, provided that you also convey the machine-readable Corresponding
+Source under the terms of this License, in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product (including
+a physical distribution medium), accompanied by the Corresponding Source fixed
+on a durable physical medium customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product (including
+a physical distribution medium), accompanied by a written offer, valid for
+at least three years and valid for as long as you offer spare parts or customer
+support for that product model, to give anyone who possesses the object code
+either (1) a copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical medium customarily
+used for software interchange, for a price no more than your reasonable cost
+of physically performing this conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the written
+offer to provide the Corresponding Source. This alternative is allowed only
+occasionally and noncommercially, and only if you received the object code
+with such an offer, in accord with subsection 6b.
+
+d) Convey the object code by offering access from a designated place (gratis
+or for a charge), and offer equivalent access to the Corresponding Source
+in the same way through the same place at no further charge. You need not
+require recipients to copy the Corresponding Source along with the object
+code. If the place to copy the object code is a network server, the Corresponding
+Source may be on a different server (operated by you or a third party) that
+supports equivalent copying facilities, provided you maintain clear directions
+next to the object code saying where to find the Corresponding Source. Regardless
+of what server hosts the Corresponding Source, you remain obligated to ensure
+that it is available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided you inform
+other peers where the object code and Corresponding Source of the work are
+being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from
+the Corresponding Source as a System Library, need not be included in conveying
+the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any tangible
+personal property which is normally used for personal, family, or household
+purposes, or (2) anything designed or sold for incorporation into a dwelling.
+In determining whether a product is a consumer product, doubtful cases shall
+be resolved in favor of coverage. For a particular product received by a particular
+user, "normally used" refers to a typical or common use of that class of product,
+regardless of the status of the particular user or of the way in which the
+particular user actually uses, or expects or is expected to use, the product.
+A product is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent the
+only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods, procedures,
+authorization keys, or other information required to install and execute modified
+versions of a covered work in that User Product from a modified version of
+its Corresponding Source. The information must suffice to ensure that the
+continued functioning of the modified object code is in no case prevented
+or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically
+for use in, a User Product, and the conveying occurs as part of a transaction
+in which the right of possession and use of the User Product is transferred
+to the recipient in perpetuity or for a fixed term (regardless of how the
+transaction is characterized), the Corresponding Source conveyed under this
+section must be accompanied by the Installation Information. But this requirement
+does not apply if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has been installed
+in ROM).
+
+The requirement to provide Installation Information does not include a requirement
+to continue to provide support service, warranty, or updates for a work that
+has been modified or installed by the recipient, or for the User Product in
+which it has been modified or installed. Access to a network may be denied
+when the modification itself materially and adversely affects the operation
+of the network or violates the rules and protocols for communication across
+the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord
+with this section must be in a format that is publicly documented (and with
+an implementation available to the public in source code form), and must require
+no special password or key for unpacking, reading or copying.
+
+   7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this License
+by making exceptions from one or more of its conditions. Additional permissions
+that are applicable to the entire Program shall be treated as though they
+were included in this License, to the extent that they are valid under applicable
+law. If additional permissions apply only to part of the Program, that part
+may be used separately under those permissions, but the entire Program remains
+governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any
+additional permissions from that copy, or from any part of it. (Additional
+permissions may be written to require their own removal in certain cases when
+you modify the work.) You may place additional permissions on material, added
+by you to a covered work, for which you have or can give appropriate copyright
+permission.
+
+Notwithstanding any other provision of this License, for material you add
+to a covered work, you may (if authorized by the copyright holders of that
+material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the terms of
+sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or author
+attributions in that material or in the Appropriate Legal Notices displayed
+by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or requiring
+that modified versions of such material be marked in reasonable ways as different
+from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or authors
+of the material; or
+
+e) Declining to grant rights under trademark law for use of some trade names,
+trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that material by
+anyone who conveys the material (or modified versions of it) with contractual
+assumptions of liability to the recipient, for any liability that these contractual
+assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further restrictions"
+within the meaning of section 10. If the Program as you received it, or any
+part of it, contains a notice stating that it is governed by this License
+along with a term that is a further restriction, you may remove that term.
+If a license document contains a further restriction but permits relicensing
+or conveying under this License, you may add to a covered work material governed
+by the terms of that license document, provided that the further restriction
+does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place,
+in the relevant source files, a statement of the additional terms that apply
+to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form
+of a separately written license, or stated as exceptions; the above requirements
+apply either way.
+
+   8. Termination.
+
+You may not propagate or modify a covered work except as expressly provided
+under this License. Any attempt otherwise to propagate or modify it is void,
+and will automatically terminate your rights under this License (including
+any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from
+a particular copyright holder is reinstated (a) provisionally, unless and
+until the copyright holder explicitly and finally terminates your license,
+and (b) permanently, if the copyright holder fails to notify you of the violation
+by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently
+if the copyright holder notifies you of the violation by some reasonable means,
+this is the first time you have received notice of violation of this License
+(for any work) from that copyright holder, and you cure the violation prior
+to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses
+of parties who have received copies or rights from you under this License.
+If your rights have been terminated and not permanently reinstated, you do
+not qualify to receive new licenses for the same material under section 10.
+
+   9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run a copy
+of the Program. Ancillary propagation of a covered work occurring solely as
+a consequence of using peer-to-peer transmission to receive a copy likewise
+does not require acceptance. However, nothing other than this License grants
+you permission to propagate or modify any covered work. These actions infringe
+copyright if you do not accept this License. Therefore, by modifying or propagating
+a covered work, you indicate your acceptance of this License to do so.
+
+   10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically receives
+a license from the original licensors, to run, modify and propagate that work,
+subject to this License. You are not responsible for enforcing compliance
+by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an organization,
+or substantially all assets of one, or subdividing an organization, or merging
+organizations. If propagation of a covered work results from an entity transaction,
+each party to that transaction who receives a copy of the work also receives
+whatever licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the Corresponding
+Source of the work from the predecessor in interest, if the predecessor has
+it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights
+granted or affirmed under this License. For example, you may not impose a
+license fee, royalty, or other charge for exercise of rights granted under
+this License, and you may not initiate litigation (including a cross-claim
+or counterclaim in a lawsuit) alleging that any patent claim is infringed
+by making, using, selling, offering for sale, or importing the Program or
+any portion of it.
+
+   11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this License
+of the Program or a work on which the Program is based. The work thus licensed
+is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned or controlled
+by the contributor, whether already acquired or hereafter acquired, that would
+be infringed by some manner, permitted by this License, of making, using,
+or selling its contributor version, but do not include claims that would be
+infringed only as a consequence of further modification of the contributor
+version. For purposes of this definition, "control" includes the right to
+grant patent sublicenses in a manner consistent with the requirements of this
+License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent
+license under the contributor's essential patent claims, to make, use, sell,
+offer for sale, import and otherwise run, modify and propagate the contents
+of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express agreement
+or commitment, however denominated, not to enforce a patent (such as an express
+permission to practice a patent or covenant not to sue for patent infringement).
+To "grant" such a patent license to a party means to make such an agreement
+or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the
+Corresponding Source of the work is not available for anyone to copy, free
+of charge and under the terms of this License, through a publicly available
+network server or other readily accessible means, then you must either (1)
+cause the Corresponding Source to be so available, or (2) arrange to deprive
+yourself of the benefit of the patent license for this particular work, or
+(3) arrange, in a manner consistent with the requirements of this License,
+to extend the patent license to downstream recipients. "Knowingly relying"
+means you have actual knowledge that, but for the patent license, your conveying
+the covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that country
+that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement,
+you convey, or propagate by procuring conveyance of, a covered work, and grant
+a patent license to some of the parties receiving the covered work authorizing
+them to use, propagate, modify or convey a specific copy of the covered work,
+then the patent license you grant is automatically extended to all recipients
+of the covered work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the scope
+of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
+of one or more of the rights that are specifically granted under this License.
+You may not convey a covered work if you are a party to an arrangement with
+a third party that is in the business of distributing software, under which
+you make payment to the third party based on the extent of your activity of
+conveying the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by you
+(or copies made from those copies), or (b) primarily for and in connection
+with specific products or compilations that contain the covered work, unless
+you entered into that arrangement, or that patent license was granted, prior
+to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied
+license or other defenses to infringement that may otherwise be available
+to you under applicable patent law.
+
+   12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or otherwise)
+that contradict the conditions of this License, they do not excuse you from
+the conditions of this License. If you cannot convey a covered work so as
+to satisfy simultaneously your obligations under this License and any other
+pertinent obligations, then as a consequence you may not convey it at all.
+For example, if you agree to terms that obligate you to collect a royalty
+for further conveying from those to whom you convey the Program, the only
+way you could satisfy both those terms and this License would be to refrain
+entirely from conveying the Program.
+
+   13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have permission to
+link or combine any covered work with a work licensed under version 3 of the
+GNU Affero General Public License into a single combined work, and to convey
+the resulting work. The terms of this License will continue to apply to the
+part which is the covered work, but the special requirements of the GNU Affero
+General Public License, section 13, concerning interaction through a network
+will apply to the combination as such.
+
+   14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the
+GNU General Public License from time to time. Such new versions will be similar
+in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+that a certain numbered version of the GNU General Public License "or any
+later version" applies to it, you have the option of following the terms and
+conditions either of that numbered version or of any later version published
+by the Free Software Foundation. If the Program does not specify a version
+number of the GNU General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of
+the GNU General Public License can be used, that proxy's public statement
+of acceptance of a version permanently authorizes you to choose that version
+for the Program.
+
+Later license versions may give you additional or different permissions. However,
+no additional obligations are imposed on any author or copyright holder as
+a result of your choosing to follow a later version.
+
+   15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
+PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+   16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
+AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
+USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+   17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided above cannot
+be given local legal effect according to their terms, reviewing courts shall
+apply local law that most closely approximates an absolute waiver of all civil
+liability in connection with the Program, unless a warranty or assumption
+of liability accompanies a copy of the Program in return for a fee. END OF
+TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively state the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+<one line to give the program's name and a brief idea of what it does.>
+
+Copyright (C) <year> <name of author>
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like
+this when it starts in an interactive mode:
+
+<program> Copyright (C) <year> <name of author>
+
+This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+
+This is free software, and you are welcome to redistribute it under certain
+conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands might
+be different; for a GUI interface, you would use an "about box".
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary. For
+more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General Public
+License instead of this License. But first, please read <https://www.gnu.org/
+licenses /why-not-lgpl.html>.

resources.qrc

@@ -286,5 +286,9 @@
         <file>res/zap-off.svg</file>
         <file>res/zoom-in.svg</file>
         <file>res/zoom-out.svg</file>
+        <file>res/postnummerregister-ansi.txt</file>
+        <file>res/ArcticSoftwareBear.png</file>
+        <file>res/saeterprosjekt_128.png</file>
+        <file>res/LICENSE</file>
     </qresource>
 </RCC>

src/core/core.pri

@@ -0,0 +1,34 @@
+INCLUDEPATH += \
+	$$PWD/../mainwidgets \
+	$$PWD/../uidialogs/maindialogs \
+	$$PWD/../uidialogs/widgetdialogs/kunde \
+	$$PWD/../uidialogs/widgetdialogs/prosjekt
+DEPENDPATH += \
+	$$PWD/../mainwidgets \
+	$$PWD/../uidialogs/maindialogs \
+	$$PWD/../uidialogs/widgetdialogs/kunde \
+	$$PWD/../uidialogs/widgetdialogs/prosjekt
+
+SOURCES += \
+    $$PWD/loaderdialog.cpp \
+    $$PWD/main.cpp \
+    $$PWD/mainwindow.cpp  \
+    $$PWD/arbeidshest.cpp \
+    $$PWD/datahandler.cpp \
+    $$PWD/datatypes.cpp \
+    $$PWD/globals.cpp 
+
+HEADERS += \
+    $$PWD/loaderdialog.h \
+    $$PWD/mainwindow.h  \
+    $$PWD/arbeidshest.h \
+    $$PWD/datahandler.h \
+    $$PWD/datatypes.h \
+    $$PWD/globals.h 
+
+FORMS += \
+    $$PWD/loaderdialog.ui \
+    $$PWD/mainwindow.ui  
+
+RESOURCES += \
+    $$PWD/../../resources.qrc

src/core/core.pro

@@ -1,65 +0,0 @@
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++11
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-    $$PWD/main.cpp \
-    $$PWD/mainwindow.cpp  \
-    arbeidshest.cpp \
-    datahandler.cpp \
-    datatypes.cpp \
-    globals.cpp \
-    innstillingdialog.cpp \
-    kundewidget.cpp \
-    nykundedialog.cpp \
-    nyttprosjektdialog.cpp \
-    omdialog.cpp \
-    prosjektwidget.cpp \
-    redigerkundedialog.cpp \
-    redigerprosjektdialog.cpp \
-    varsledialog.cpp \
-    velgkundeprosjektdialog.cpp
-
-HEADERS += \
-    $$PWD/mainwindow.h  \
-    arbeidshest.h \
-    datahandler.h \
-    datatypes.h \
-    globals.h \
-    innstillingdialog.h \
-    kundewidget.h \
-    nykundedialog.h \
-    nyttprosjektdialog.h \
-    omdialog.h \
-    prosjektwidget.h \
-    redigerkundedialog.h \
-    redigerprosjektdialog.h \
-    varsledialog.h \
-    velgkundeprosjektdialog.h
-
-FORMS += \
-    $$PWD/mainwindow.ui  \
-    innstillingdialog.ui \
-    kundewidget.ui \
-    nykundedialog.ui \
-    nyttprosjektdialog.ui \
-    omdialog.ui \
-    prosjektwidget.ui \
-    redigerkundedialog.ui \
-    redigerprosjektdialog.ui \
-    varsledialog.ui \
-    velgkundeprosjektdialog.ui
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-RESOURCES += \
-    $$PWD/../../resources.qrc

src/core/datahandler.cpp

@@ -4,7 +4,7 @@ DataHandler::DataHandler(QObject *parent) : QObject(parent) {
     errorState = false;
 }
 
-bool DataHandler::lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger) {
+bool DataHandler::lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler) {
     QFile fil(filSti);
     if (!fil.open(QIODevice::WriteOnly)) {
         errorState = true;
@@ -20,13 +20,14 @@ bool DataHandler::lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKart
     ut << kartotek;
     ut << pKartotek;
     ut << bindinger;
+    ut << bindingerDatoStempler;
     fil.flush();
     fil.close();
 
     return true;
 }
 
-bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger) {
+bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler) {
     QFile fil(filSti);
     if (!fil.open(QIODevice::ReadOnly)) {
         errorState = true;
@@ -47,9 +48,9 @@ bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKarto
         errorState = true;
         errorCode = ErrorCodes::UGYLDIG_FIL;
         return false;
-    } else if (appVersjon != APP_VERSJON) {
+    }
 
-    } else if (dbVersjon != DB_VERSJON) {
+    if (dbVersjon != DB_VERSJON) {
         errorState = true;
         errorCode = ErrorCodes::DB_VERSJONSKONFLIKT;
         return false;
@@ -58,11 +59,18 @@ bool DataHandler::lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKarto
     inn >> kartotek;
     inn >> pKartotek;
     inn >> bindinger;
+    inn >> bindingerDatoStempler;
     fil.close();
 
     return true;
 }
 
+QString DataHandler::datoStempel() {
+    QDateTime nu = QDateTime::currentDateTime();
+    QString tidsFormat = "yyyy-MM-dd HH:mm:ss";
+    return nu.toString(tidsFormat);
+}
+
 bool DataHandler::hasError() {
     return errorState;
 }

src/core/datahandler.h

@@ -2,6 +2,7 @@
 #define DATAHANDLER_H
 
 #include <QObject>
+#include <QDateTime>
 
 #include "datatypes.h"
 #include "globals.h"
@@ -13,8 +14,9 @@ class DataHandler : public QObject
     Q_OBJECT
 public:
     explicit DataHandler(QObject *parent = nullptr);
-    bool lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger);
-    bool lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger);
+    bool lagreFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler);
+    bool lastFil(QString filSti, KundeKartotek &kartotek, ProsjektKartotek &pKartotek, ProsjektBindinger &bindinger, ProsjektBindingerDatoStempler &bindingerDatoStempler);
+    static QString datoStempel();
 
     bool hasError();
     ErrorCodes getError();

src/core/datatypes.h

@@ -11,6 +11,8 @@ typedef QList<QHash<QString, QVariant>> ProsjektKartotek;
 typedef QHash<QString, QVariant> ProsjektFil;
 
 typedef QHash<int, QList<int>> ProsjektBindinger;
+typedef QHash<int, QHash<QString, QString>> ProsjektBindingerDatoStempler;
+typedef QHash<int, QString> PostNummerTabell;
 
 enum ErrorCodes {
     APP_VERSJONSKONFLIKT,
@@ -37,4 +39,18 @@ enum UIElementer {
     FIRMANAVN
 };
 
+enum CustomerFilters {
+    ID,
+    NAME,
+    COMPANYNAME,
+    PHONE,
+    EMAIL
+};
+
+enum ProjectFilters {
+    ALL,
+    ACTIVE,
+    INACTIVE
+};
+
 #endif // DATATYPES_H

src/core/globals.cpp

@@ -1,5 +1,5 @@
 #include "globals.h"
 
-qreal APP_VERSJON = 0.2;
-qreal DB_VERSJON = 0.1;
+qreal APP_VERSJON = 0.7;
+qreal DB_VERSJON = 0.2;
 quint64 APPLIKASJON_STEMPEL = (quint64)0xc4b351957b3bcf8;

src/core/loaderdialog.cpp

@@ -0,0 +1,48 @@
+#include "loaderdialog.h"
+#include "ui_loaderdialog.h"
+
+LoaderDialog::LoaderDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::LoaderDialog) {
+    ui->setupUi(this);
+
+    ui->labelAppVer->setText(tr("Versjon %1").arg(APP_VERSJON));
+}
+
+LoaderDialog::~LoaderDialog() {
+    delete ui;
+}
+
+void LoaderDialog::load() {
+    QFile postNummerFil(":/res/postnummerregister-ansi.txt");
+    QTimer *timer = new QTimer(this);
+    connect(timer, &QTimer::timeout, this, QOverload<>::of(&LoaderDialog::timerDone));
+
+    int linjeNum = 0;
+    if (postNummerFil.open(QIODevice::ReadOnly)) {
+        QTextStream pIn(&postNummerFil);
+        QStringList postnrListe = pIn.readAll().split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
+        linjeNum = postnrListe.size();
+
+        ui->progressBar->setMinimum(0);
+        ui->progressBar->setMaximum(linjeNum);
+
+        for (int i = 0; i < linjeNum; ++i) {
+            QStringList linjeVerdi = postnrListe.at(i).split(":");
+            ui->labelArbeidsBeskrivelse->setText(tr("Laster postkode %1 for by/sted: %2").arg(linjeVerdi.at(0).toInt()).arg(linjeVerdi.at(1)));
+            emit sendPostNummer(linjeVerdi.at(0).toInt(), linjeVerdi.at(1));
+            ui->progressBar->setValue(i + 1);
+        }
+
+        ui->labelArbeidsBeskrivelse->setText(tr("Alle postkoder lastet inn"));
+    }
+
+    postNummerFil.close();
+    timer->setSingleShot(true);
+    timer->start(7000);
+}
+
+void LoaderDialog::timerDone() {
+    emit finish();
+    this->hide();
+}

src/core/loaderdialog.h

@@ -0,0 +1,36 @@
+#ifndef LOADERDIALOG_H
+#define LOADERDIALOG_H
+
+#include <QDialog>
+#include <QFile>
+#include <QTextStream>
+#include <QTimer>
+#include <QTranslator>
+
+#include "globals.h"
+
+namespace Ui {
+class LoaderDialog;
+}
+
+class LoaderDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit LoaderDialog(QWidget *parent = nullptr);
+    ~LoaderDialog();
+    void load();
+
+signals:
+    void sendPostNummer(int postNummer, QString postSted);
+    void finish();
+
+private slots:
+    void timerDone();
+
+private:
+    Ui::LoaderDialog *ui;
+};
+
+#endif // LOADERDIALOG_H

src/core/loaderdialog.ui

@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LoaderDialog</class>
+ <widget class="QDialog" name="LoaderDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>434</width>
+    <height>598</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QFrame" name="frame">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>0</y>
+     <width>421</width>
+     <height>471</height>
+    </rect>
+   </property>
+   <property name="autoFillBackground">
+    <bool>false</bool>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-image: url(:/res/ArcticSoftwareBear.png);
+background-repeat: no-repeat;</string>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::NoFrame</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth">
+    <number>4</number>
+   </property>
+   <property name="midLineWidth">
+    <number>2</number>
+   </property>
+   <widget class="QLabel" name="labelAppVer">
+    <property name="geometry">
+     <rect>
+      <x>290</x>
+      <y>30</y>
+      <width>86</width>
+      <height>37</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Arial</family>
+      <pointsize>10</pointsize>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background: none;</string>
+    </property>
+    <property name="text">
+     <string>Versjon 0.0.0</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+    </property>
+    <property name="margin">
+     <number>3</number>
+    </property>
+   </widget>
+   <widget class="QLabel" name="labelAppName">
+    <property name="geometry">
+     <rect>
+      <x>150</x>
+      <y>10</y>
+      <width>309</width>
+      <height>37</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Arial</family>
+      <pointsize>24</pointsize>
+      <weight>75</weight>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background: none;</string>
+    </property>
+    <property name="text">
+     <string>Sæterprosjekt</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+    </property>
+   </widget>
+  </widget>
+  <widget class="QWidget" name="verticalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>470</y>
+     <width>421</width>
+     <height>44</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="labelLaster">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">background: none;</string>
+        </property>
+        <property name="text">
+         <string>Laster inn ... vennligst vent</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelArbeidsBeskrivelse">
+        <property name="styleSheet">
+         <string notr="true">background: none;</string>
+        </property>
+        <property name="text">
+         <string>-</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QProgressBar" name="progressBar">
+      <property name="styleSheet">
+       <string notr="true"/>
+      </property>
+      <property name="value">
+       <number>0</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="labelCopyRight">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>520</y>
+     <width>421</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">color: rgb(255, 255, 255);
+background-color: rgb(0, 0, 0, 110);</string>
+   </property>
+   <property name="text">
+    <string>Copyright (C) 2021 Helge-Mikael Nordgård. This software is licensed under the GNU general public license. By using this program you agree to the license terms as stipulated in the about box</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+   <property name="margin">
+    <number>6</number>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/core/main.cpp

@@ -1,10 +1,21 @@
 #include "mainwindow.h"
+#include "loaderdialog.h"
 
 #include <QApplication>
+#include <QObject>
 
 int main(int argc, char *argv[]) {
     QApplication a(argc, argv);
     MainWindow w;
-    w.show();
+    // w.show();
+    LoaderDialog loader;
+    QObject::connect(&loader, SIGNAL(sendPostNummer(int,QString)), &w, SLOT(mottaPostNrSted(int,QString)));
+    QObject::connect(&loader, SIGNAL(finish()), &w, SLOT(splashDone()));
+    loader.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+    loader.setAttribute(Qt::WA_NoSystemBackground);
+    loader.setAttribute(Qt::WA_TranslucentBackground);
+    loader.setAttribute(Qt::WA_PaintOnScreen);
+    loader.show();
+    loader.load();
     return a.exec();
 }

src/core/mainwindow.cpp

@@ -15,6 +15,12 @@ MainWindow::MainWindow(QWidget *parent)
     oppdaterUI();
     filLagret = true;
 
+    QCoreApplication::setOrganizationName("Arctic Software");
+    QCoreApplication::setOrganizationDomain("arcticsoftware.no");
+    QCoreApplication::setApplicationName("Saeterprosjekt");
+
+    konstruerHistorikk();
+
     innstillingDlg = new InnstillingDialog(this);
     connect(innstillingDlg, SIGNAL(rejected()), this, SLOT(barnDialogLukket()));
 
@@ -32,33 +38,39 @@ MainWindow::~MainWindow() {
  */
 
 void MainWindow::on_actionNy_triggered() {
+    QString stdSted = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     // konstruer stien ved hjelp av QFileDialog
-    filSti = QFileDialog::getSaveFileName(this, "Opprett ny databasefil", "/", "Database fil (*.saeter)");
+    //: First string "Create new database file", second string "Database file (*.saeter)
+    filSti = QFileDialog::getSaveFileName(this, tr("Opprett ny databasefil"), stdSted, tr("Database fil (*.saeter)"));
     // invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger, kontroller om vi kan skrive til filen
-    if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger)) {
-        ErrorCodes error = ioHandler->getError();
-        switch (error) {
-        case ErrorCodes::SKRIVEFEIL:
-            QMessageBox::critical(this, "Feil oppstod", "Kan ikke opprette databasefilen. Kontroller at du har skriverettigheter der du har oppgitt stedet på harddisken.");
-            break;
-        default:
-            break;
+    if (!filSti.isEmpty()) {
+        if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
+            ErrorCodes error = ioHandler->getError();
+            switch (error) {
+            case ErrorCodes::SKRIVEFEIL:
+                //: First string "An error occurred" Second string "Can not create the database file. Make sure you have write access in the location you have specified"
+                QMessageBox::critical(this, tr("Feil oppstod"), tr("Kan ikke opprette databasefilen. Kontroller at du har skriverettigheter der du har oppgitt stedet på harddisken."));
+                break;
+            default:
+                break;
+            }
+        } else {
+            // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
+            harFil = true;
+            filLagret = true;
+            oppdaterTittel();
+            oppdaterUI();
+            leggFilbaneTilHistorikk(filSti);
+
+            delete hest;
+            hest = new ArbeidsHest(this);
+
+            connect(hest, SIGNAL(alert(ProsjektFil,AlertConditions)), this, SLOT(varsle(ProsjektFil,AlertCondition)));
+
+            hest->setTidTaging(1000);
+            hest->settProsjekt(prosjektKart);
+            hest->run();
         }
-    } else {
-        // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
-        harFil = true;
-        filLagret = true;
-        oppdaterTittel();
-        oppdaterUI();
-
-        delete hest;
-        hest = new ArbeidsHest(this);
-
-        connect(hest, SIGNAL(alert(ProsjektFil,AlertConditions)), this, SLOT(varsle(ProsjektFil,AlertCondition)));
-
-        hest->setTidTaging(1000);
-        hest->settProsjekt(prosjektKart);
-        hest->run();
     }
 }
 
@@ -69,59 +81,122 @@ void MainWindow::on_actionNy_triggered() {
  */
 
 void MainWindow::on_action_pne_triggered() {
+    QString stdSted = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
     // konstruer stien ved hjelp av QFileDialog
-    filSti = QFileDialog::getOpenFileName(this, "Åpne databasefil", "/", "Database fil (*.saeter)");
-    // invokerer lastFil fra DataHandler klassen der alle IO funksjoner ligger
-    if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger)) {
-        ErrorCodes error = ioHandler->getError();
-        switch (error) {
-        case ErrorCodes::UGYLDIG_FIL:
-            QMessageBox::critical(this, "Feil oppstod", "Dette ser ikke ut til å være en gyldig sæterprosjekt databasefil");
-            break;
-        case ErrorCodes::APP_VERSJONSKONFLIKT:
-            QMessageBox::critical(this, "Feil oppstod", "Versjonskonflikt i programmet. Sjekk hjemmesiden for programvareoppdateringer før du prøver å åpne denne filen");
-            break;
-        case ErrorCodes::DB_VERSJONSKONFLIKT:
-            QMessageBox::critical(this, "Feil oppstod", "Versjonskonflikt i databasefilen. Filen du prøver å åpne er enten en eldre eller nyere versjon av hva programmet er skrevet for å håndtere. Sjekk hjemmesiden for programvareoppdateringer før du prøver å åpne denne filen");
-            break;
-        case ErrorCodes::LESEFEIL:
-            QMessageBox::critical(this, "Feil oppstod", "Kunne ikke lese fra disken. Sjekk at du har de nødvenige rettighetene til katalogen og/eller filen før du åpner databasen");
-            break;
-        default:
-            break;
+    filSti = QFileDialog::getOpenFileName(this, tr("Åpne databasefil"), stdSted, tr("Database fil (*.saeter)"));
+
+    if (!filSti.isEmpty()) {
+        // invokerer lastFil fra DataHandler klassen der alle IO funksjoner ligger
+        if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
+            ErrorCodes error = ioHandler->getError();
+            switch (error) {
+            case ErrorCodes::UGYLDIG_FIL:
+                //: First string "An error occurred" Second string "This does not appear to be a valid sæterproject database file"
+                QMessageBox::critical(this, tr("Feil oppstod"), tr("Dette ser ikke ut til å være en gyldig sæterprosjekt databasefil"));
+                break;
+            case ErrorCodes::APP_VERSJONSKONFLIKT:
+                QMessageBox::critical(this, tr("Feil oppstod"), tr("Versjonskonflikt i programmet. Sjekk hjemmesiden for programvareoppdateringer før du prøver å åpne denne filen"));
+                break;
+            case ErrorCodes::DB_VERSJONSKONFLIKT:
+                QMessageBox::critical(this, tr("Feil oppstod"), tr("Versjonskonflikt i databasefilen. Filen du prøver å åpne er enten en eldre eller nyere versjon av hva programmet er skrevet for å håndtere. Sjekk hjemmesiden for programvareoppdateringer før du prøver å åpne denne filen"));
+                break;
+            case ErrorCodes::LESEFEIL:
+                QMessageBox::critical(this, tr("Feil oppstod"), tr("Kunne ikke lese fra disken. Sjekk at du har de nødvenige rettighetene til katalogen og/eller filen før du åpner databasen"));
+                break;
+            default:
+                break;
+            }
+
+            harFil = false;
+            filLagret = false;
+        } else { // hvis databasefilen kan åpnes, er alt fryd og gammen. Hvis ikke kan ikke denne filen brukes
+            // oppdater grensesnittet med antall kunder og prosjekter som er lagret i filen
+            oppdaterTellere();
+            // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
+            harFil = true;
+            filLagret = true;
+
+            // Sjekk om kundekartoteket allerede er åpnet, hvis ikke trenger vi ikke å foreta oss noe. Hvis den er åpen må vi oppdatere tabellen
+            if (kListe) {
+                kundeW->lagKundeTabell(kundeKart);
+            } else if (pListe) { // Hvis prosjektkartoteket er åpen, oppdater dette grensesnittet
+                prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart);
+            }
+
+            leggFilbaneTilHistorikk(filSti);
+
+            delete hest;
+            hest = new ArbeidsHest(this);
+
+            connect(hest, SIGNAL(alert(ProsjektFil,AlertConditions)), this, SLOT(varsle(ProsjektFil,AlertConditions)));
+
+            hest->setTidTaging(1000);
+            hest->settProsjekt(prosjektKart);
+            hest->run();
         }
 
-        harFil = false;
-        filLagret = false;
-    } else { // hvis databasefilen kan åpnes, er alt fryd og gammen. Hvis ikke kan ikke denne filen brukes
-        // oppdater grensesnittet med antall kunder og prosjekter som er lagret i filen
-        oppdaterTellere();
-        // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
-        harFil = true;
-        filLagret = true;
-
-        // Sjekk om kundekartoteket allerede er åpnet, hvis ikke trenger vi ikke å foreta oss noe. Hvis den er åpen må vi oppdatere tabellen
-        if (kListe) {
-            kundeW->lagKundeTabell(kundeKart);
-        } else if (pListe) { // Hvis prosjektkartoteket er åpen, oppdater dette grensesnittet
-            prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart);
-        }
-
-        delete hest;
-        hest = new ArbeidsHest(this);
-
-        connect(hest, SIGNAL(alert(ProsjektFil,AlertConditions)), this, SLOT(varsle(ProsjektFil,AlertConditions)));
-
-        hest->setTidTaging(1000);
-        hest->settProsjekt(prosjektKart);
-        hest->run();
+        // oppdater grensesnittet basert på de boolske verdiene i klassen
+        oppdaterTittel();
+        oppdaterUI();
     }
+}
 
-    // oppdater grensesnittet basert på de boolske verdiene i klassen
+/* on_actionLagre_triggered():
+ * ------------------------------
+ *
+ * Lagrer endringer i databasen til fil
+ */
+
+void MainWindow::on_actionLagre_triggered() {
+    // invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger
+    ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler);
+    // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
+    harFil = true;
+    filLagret = true;
     oppdaterTittel();
     oppdaterUI();
 }
 
+/* on_actionL_agre_som_triggered():
+ * --------------------------------
+ *
+ * Lagrer en kopi av databasefilen
+ */
+
+void MainWindow::on_actionL_agre_som_triggered() {
+    QString stdSted = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
+    // konstruer stien ved hjelp av QFileDialog
+    filSti = QFileDialog::getSaveFileName(this, tr("Lagre gjeldende database med nytt navn"), stdSted, tr("Database fil (*.saeter)"));
+    // invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger, kontroller om vi kan skrive til filen
+    if (!filSti.isEmpty()) {
+        if (!ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
+            ErrorCodes error = ioHandler->getError();
+            switch (error) {
+            case ErrorCodes::SKRIVEFEIL:
+                QMessageBox::critical(this, tr("Feil oppstod"), tr("Kan ikke opprette databasefilen. Kontroller at du har skriverettigheter der du har oppgitt stedet på harddisken."));
+                break;
+            default:
+                break;
+            }
+        } else {
+            // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
+            harFil = true;
+            filLagret = true;
+            oppdaterTittel();
+            oppdaterUI();
+
+            delete hest;
+            hest = new ArbeidsHest(this);
+
+            connect(hest, SIGNAL(alert(ProsjektFil,AlertConditions)), this, SLOT(varsle(ProsjektFil,AlertCondition)));
+
+            hest->setTidTaging(1000);
+            hest->settProsjekt(prosjektKart);
+            hest->run();
+        }
+    }
+}
+
 /* oppdaterTittel():
  * ------------------------
  *
@@ -154,6 +229,33 @@ void MainWindow::oppdaterUI() {
     ui->actionLagre->setEnabled(harFil);
 }
 
+/* oppdaterTellere():
+ * ------------------------
+ *
+ * Fyller historikk menyen med de siste åpnede filene
+ */
+
+void MainWindow::konstruerHistorikk() {
+    QSettings settings;
+    qRegisterMetaTypeStreamOperators<QList<QString> >("QList<QString>");
+
+    QList<QString> filHistorikkListe = settings.value("filhistorikk").value<QList<QString>>();
+    if (filHistorikkListe.isEmpty()) {
+        QAction *tomListe = new QAction(tr("Ingen filer i historikk"), this);
+        ui->menuH_istorikk->addAction(tomListe);
+        tomListe->setEnabled(false);
+    } else {
+        ui->menuH_istorikk->clear();
+        for (int i = 0; i < filHistorikkListe.size(); ++i) {
+            QAction *historikkAction = new QAction(filHistorikkListe.at(i), this);
+            connect(historikkAction, &QAction::triggered, this, [=]() {
+                lastDatabaseFil(filHistorikkListe.at(i));
+            });
+            ui->menuH_istorikk->addAction(historikkAction);
+        }
+    }
+}
+
 /* oppdaterTellere():
  * ------------------------
  *
@@ -199,6 +301,95 @@ void MainWindow::erstattProsjekt(ProsjektFil prosjekt) {
     oppdaterTittel();
 }
 
+
+/* leggFilbaneTilHistorikk():
+ * --------------------------
+ *
+ * Legger ny filbane inn i historikken
+ */
+
+void MainWindow::leggFilbaneTilHistorikk(QString filBane) {
+    QSettings settings;
+    qRegisterMetaTypeStreamOperators<QList<QString> >("QList<QString>");
+
+    QList<QString> filHistorikkListe = settings.value("filhistorikk").value<QList<QString>>();
+
+    if (filHistorikkListe.contains(filBane)) {
+        filHistorikkListe.removeOne(filBane);
+        filHistorikkListe.prepend(filBane);
+        settings.setValue("filhistorikk",QVariant::fromValue(filHistorikkListe));
+    } else {
+        if (filHistorikkListe.size() > 9)
+            filHistorikkListe.removeLast();
+
+        filHistorikkListe.prepend(filBane);
+        settings.setValue("filhistorikk",QVariant::fromValue(filHistorikkListe));
+    }
+
+    konstruerHistorikk();
+}
+
+/* lastDatabaseFil(QString):
+ * --------------------------
+ *
+ * Åpner en database med stien fil
+ */
+
+void MainWindow::lastDatabaseFil(QString fil) {
+    filSti = fil;
+    // invokerer lastFil fra DataHandler klassen der alle IO funksjoner ligger
+    if (!ioHandler->lastFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler)) {
+        ErrorCodes error = ioHandler->getError();
+        switch (error) {
+        case ErrorCodes::UGYLDIG_FIL:
+            QMessageBox::critical(this, tr("Feil oppstod"), tr("Dette ser ikke ut til å være en gyldig sæterprosjekt databasefil"));
+            break;
+        case ErrorCodes::APP_VERSJONSKONFLIKT:
+            QMessageBox::critical(this, tr("Feil oppstod"), tr("Versjonskonflikt i programmet. Sjekk hjemmesiden for programvareoppdateringer før du prøver å åpne denne filen"));
+            break;
+        case ErrorCodes::DB_VERSJONSKONFLIKT:
+            QMessageBox::critical(this, tr("Feil oppstod"), tr("Versjonskonflikt i databasefilen. Filen du prøver å åpne er enten en eldre eller nyere versjon av hva programmet er skrevet for å håndtere. Sjekk hjemmesiden for programvareoppdateringer før du prøver å åpne denne filen"));
+            break;
+        case ErrorCodes::LESEFEIL:
+            QMessageBox::critical(this, tr("Feil oppstod"), tr("Kunne ikke lese fra disken. Sjekk at du har de nødvenige rettighetene til katalogen og/eller filen før du åpner databasen"));
+            break;
+        default:
+            break;
+        }
+
+        harFil = false;
+        filLagret = false;
+    } else { // hvis databasefilen kan åpnes, er alt fryd og gammen. Hvis ikke kan ikke denne filen brukes
+        // oppdater grensesnittet med antall kunder og prosjekter som er lagret i filen
+        oppdaterTellere();
+        // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
+        harFil = true;
+        filLagret = true;
+
+        // Sjekk om kundekartoteket allerede er åpnet, hvis ikke trenger vi ikke å foreta oss noe. Hvis den er åpen må vi oppdatere tabellen
+        if (kListe) {
+            kundeW->lagKundeTabell(kundeKart);
+        } else if (pListe) { // Hvis prosjektkartoteket er åpen, oppdater dette grensesnittet
+            prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart);
+        }
+
+        leggFilbaneTilHistorikk(filSti);
+
+        delete hest;
+        hest = new ArbeidsHest(this);
+
+        connect(hest, SIGNAL(alert(ProsjektFil,AlertConditions)), this, SLOT(varsle(ProsjektFil,AlertConditions)));
+
+        hest->setTidTaging(1000);
+        hest->settProsjekt(prosjektKart);
+        hest->run();
+    }
+
+    // oppdater grensesnittet basert på de boolske verdiene i klassen
+    oppdaterTittel();
+    oppdaterUI();
+}
+
 /* tellKunder():
  * ------------------------
  *
@@ -244,10 +435,13 @@ int MainWindow::tellProsjekter() {
  */
 
 int MainWindow::hentKundeIndeksPosisjon(int kundeNummer) {
+    int indeks = 0;
     for (int i = 0; i < kundeKart.size(); ++i) {
         if (kundeKart.at(i).value("id").toInt() == kundeNummer)
-            return i;
+            indeks = i;
     }
+
+    return indeks;
 }
 
 
@@ -265,14 +459,14 @@ void MainWindow::closeEvent(QCloseEvent *event) {
     } else {
         QMessageBox bekreftBoks;
         bekreftBoks.setText("Bekreft avslutting");
-        bekreftBoks.setInformativeText("Du har ulagrede endringer i databasen. Vil du lagre endringene før du avslutter?");
+        bekreftBoks.setInformativeText(tr("Du har ulagrede endringer i databasen. Vil du lagre endringene før du avslutter?"));
         bekreftBoks.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
         bekreftBoks.setDefaultButton(QMessageBox::Save);
 
         int svar = bekreftBoks.exec();
         switch (svar) {
         case QMessageBox::Save:
-            ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger);
+            ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger, prosjektBindingerStempler);
             event->accept();
             break;
         case QMessageBox::Discard:
@@ -313,7 +507,8 @@ void MainWindow::on_commandCustomers_clicked() {
             delete prosjektW;
             pListe = false;
         } else if (utlop) {
-
+            delete utlopW;
+            utlop = false;
         }
 
         kundeW = new KundeWidget(this);
@@ -322,6 +517,7 @@ void MainWindow::on_commandCustomers_clicked() {
         connect(kundeW, SIGNAL(redigerKunde(int)), this, SLOT(visRedigerKundeDlg(int)));
         connect(kundeW, SIGNAL(slettKunde(int)), this, SLOT(slettKunde(int)));
         connect(kundeW, SIGNAL(tilordneProsjekt(int)), this, SLOT(visProsjektListe(int)));
+        connect(kundeW, SIGNAL(startSok(QString)), this, SLOT(kundeSok(QString)));
 
         ui->hovedLayout->insertWidget(0, kundeW);
         kundeW->lagKundeTabell(kundeKart);
@@ -342,6 +538,9 @@ void MainWindow::on_commandProsjekter_clicked() {
         if (kListe) {
             delete kundeW;
             kListe = false;
+        } else if (utlop) {
+            delete utlopW;
+            utlop = false;
         }
 
         prosjektW = new ProsjektWidget(this);
@@ -352,6 +551,7 @@ void MainWindow::on_commandProsjekter_clicked() {
         connect(prosjektW, SIGNAL(slettProsjekt(int)), this, SLOT(slettProsjekt(int)));
         connect(prosjektW, SIGNAL(settAktiv(int)), this, SLOT(settAktivInaktiv(int)));
         connect(prosjektW, SIGNAL(fjernKunde(int,int)), this, SLOT(fjernKundeFraProsjekt(int,int)));
+        connect(prosjektW, SIGNAL(filtrerKunKunder(bool)), SLOT(filtrerProsjektMedKunKunder(bool)));
 
         ui->hovedLayout->insertWidget(0, prosjektW);
         prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart);
@@ -360,6 +560,84 @@ void MainWindow::on_commandProsjekter_clicked() {
     }
 }
 
+/* on_commandDeadlines_clicked():
+ * -------------------------------
+ *
+ * Setter inn listen over fremtidige prosjekter widgeten inn i hoved dialogboksen.
+ */
+
+void MainWindow::on_commandDeadlines_clicked() {
+    if (!utlop) {
+        if (kListe) {
+            delete kundeW;
+            kListe = false;
+        } else if (pListe) {
+            delete prosjektW;
+            pListe = false;
+        }
+    } else {
+        delete utlopW;
+        utlop = false;
+    }
+
+    utlopW = new UtlopWidget(this);
+
+    connect(utlopW, SIGNAL(prosjektListeStarter()), this, SLOT(prosjektOppstartsListe()));
+    connect(utlopW, SIGNAL(prosjektListeAvslutter()), this, SLOT(prosjektAvslutterListe()));
+    connect(utlopW, SIGNAL(visProsjekt(int)), this, SLOT(hoppTilProsjekt(int)));
+
+    ui->hovedLayout->insertWidget(0, utlopW);
+    utlopW->tegnUtlopsDatoer(prosjektKart);
+    utlopW->show();
+    utlop = true;
+}
+
+
+/* prosjektOppstartsListe():
+ * -------------------------------
+ *
+ * Tegner utløpsdato tabellen på ny for å vise når prosjekter starter
+ */
+
+void MainWindow::prosjektOppstartsListe() {
+    utlopW->tegnOppstartsDatoer(prosjektKart);
+}
+
+/* prosjektAvslutterListe():
+ * -------------------------------
+ *
+ * Tegner utløpsdato tabellen på ny for å vise når prosjekter slutter
+ */
+
+void MainWindow::prosjektAvslutterListe() {
+    utlopW->tegnUtlopsDatoer(prosjektKart);
+}
+
+/* hoppTilProsjekt():
+ * -------------------------------
+ *
+ * Hopper fra utløpsdato til prosjekt widget og viser prosjektet brukeren dobbelklikket på
+ */
+
+void MainWindow::hoppTilProsjekt(int prosjektId) {
+    prosjektW = new ProsjektWidget(this);
+
+    connect(prosjektW, SIGNAL(opprettProsjekt()), this, SLOT(visNyttProsjektDlg()));
+    connect(prosjektW, SIGNAL(hentProsjektFil(int)), this, SLOT(sendProsjektFil(int)));
+    connect(prosjektW, SIGNAL(redigerProsjekt(int)), this, SLOT(visRedigerProsjektDialog(int)));
+    connect(prosjektW, SIGNAL(slettProsjekt(int)), this, SLOT(slettProsjekt(int)));
+    connect(prosjektW, SIGNAL(settAktiv(int)), this, SLOT(settAktivInaktiv(int)));
+    connect(prosjektW, SIGNAL(fjernKunde(int,int)), this, SLOT(fjernKundeFraProsjekt(int,int)));
+    connect(prosjektW, SIGNAL(filtrerKunKunder(bool)), SLOT(filtrerProsjektMedKunKunder(bool)));
+
+    ui->hovedLayout->insertWidget(0, prosjektW);
+    prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart, prosjektId);
+    prosjektW->show();
+    pListe = true;
+    delete utlopW;
+    utlop = false;
+}
+
 /* visNyttProsjektDlg():
  * -------------------------------
  *
@@ -460,7 +738,7 @@ void MainWindow::lagreProsjektEndringer(ProsjektFil endringer) {
 void MainWindow::slettProsjekt(int kartotekPlassering) {
     QMessageBox bekreftBoks;
     bekreftBoks.setText("Er du sikker?");
-    bekreftBoks.setInformativeText("Vil du slette dette prosjektet? Kundene som eventuelt er tilknyttet prosjektet vil ikke bli slettet");
+    bekreftBoks.setInformativeText(tr("Vil du slette dette prosjektet? Kundene som eventuelt er tilknyttet prosjektet vil ikke bli slettet"));
     bekreftBoks.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
     bekreftBoks.setDefaultButton(QMessageBox::Cancel);
 
@@ -516,6 +794,16 @@ void MainWindow::fjernKundeFraProsjekt(int prosjektKartotekPosisjon, int kundeID
     oppdaterTittel();
 }
 
+/* filtrerProsjektMedKunKunder():
+ * ------------------------------
+ *
+ * Tegner prosjekttreet på nytt og filtrerer og viser kun prosjekter med tilordnet kunder hvis bool = sann
+ */
+
+void MainWindow::filtrerProsjektMedKunKunder(bool kunKunder) {
+    prosjektW->oppdaterProsjektListe(prosjektKart, bindinger, kundeKart, 0, kunKunder);
+}
+
 /* varsle():
  * ------------------------------
  *
@@ -531,6 +819,27 @@ void MainWindow::varsle(ProsjektFil prosjekt, AlertConditions kondisjon) {
     varsleDlg->show();
 }
 
+
+/* mottaPostNrSted():
+ * ------------------------------
+ *
+ * Mater inn postnr og sted i postnr tabell hashen for bruk til autoutfylling av stedsnavn
+ */
+
+void MainWindow::mottaPostNrSted(int postNr, QString postSted) {
+    postStedTabell.insert(postNr, postSted);
+}
+
+/* splashDone():
+ * ------------------------------
+ *
+ * Starter funksjon som trigges når alle dataene er lastet og splashscreen lukkes
+ */
+
+void MainWindow::splashDone() {
+    this->show();
+}
+
 /* visNyKundeDlg():
  * ------------------------------
  *
@@ -538,7 +847,7 @@ void MainWindow::varsle(ProsjektFil prosjekt, AlertConditions kondisjon) {
  */
 
 void MainWindow::visNyKundeDlg() {
-    nyKdlg = new NyKundeDialog(this);
+    nyKdlg = new NyKundeDialog(this, &postStedTabell);
 
     connect(nyKdlg, SIGNAL(leggTilKunde(KundeFil)), this, SLOT(settInnNyKunde(KundeFil)));
     connect(nyKdlg, SIGNAL(rejected()), this, SLOT(barnDialogLukket()));
@@ -560,7 +869,7 @@ void MainWindow::visNyKundeDlg() {
  */
 
 void MainWindow::visRedigerKundeDlg(int posisjon) {
-    redigerKdlg = new RedigerKundeDialog(this);
+    redigerKdlg = new RedigerKundeDialog(this, &postStedTabell);
 
     connect(redigerKdlg, SIGNAL(oppdaterKundeFil(KundeFil)), this, SLOT(redigerKunde(KundeFil)));
     connect(redigerKdlg, SIGNAL(rejected()), this, SLOT(barnDialogLukket()));
@@ -569,7 +878,7 @@ void MainWindow::visRedigerKundeDlg(int posisjon) {
     redigerKdlg->show();
     redigerKdlg->setFocus();
     redigerKdlg->activateWindow();
-    redigerKdlg->settInnGamleVerdier(kundeKart.at(posisjon));
+    redigerKdlg->settInnGamleVerdier(kundeKart.at(hentKundeIndeksPosisjon(posisjon)));
 }
 
 /* settInnNyKunde():
@@ -581,10 +890,10 @@ void MainWindow::visRedigerKundeDlg(int posisjon) {
 
 void MainWindow::settInnNyKunde(KundeFil kunde) {
     if (kunde.value("fornavn").toString().isEmpty()) {
-        nyKdlg->settFeilMelding("Fornavn feltet er påkrevd");
+        nyKdlg->settFeilMelding(tr("Fornavn feltet er påkrevd"));
         nyKdlg->fokuserElement(UIElementer::FORNAVN);
     } else if (kunde.value("etternavn").toString().isEmpty()) {
-        nyKdlg->settFeilMelding("Etternavn feltet er påkrevd");
+        nyKdlg->settFeilMelding(tr("Etternavn feltet er påkrevd"));
         nyKdlg->fokuserElement(UIElementer::ETTERNAVN);
     } else {
         kundeKart.append(kunde);
@@ -605,13 +914,13 @@ void MainWindow::settInnNyKunde(KundeFil kunde) {
 
 void MainWindow::redigerKunde(KundeFil redigertKunde) {
     if (redigertKunde.value("fornavn").toString().isEmpty()) {
-        redigerKdlg->settFeilMelding("Fornavn feltet er påkrevd");
+        redigerKdlg->settFeilMelding(tr("Fornavn feltet er påkrevd"));
         redigerKdlg->fokuserElement(UIElementer::FORNAVN);
     } else if (redigertKunde.value("etternavn").toString().isEmpty()) {
-        redigerKdlg->settFeilMelding("Etternavn feltet er påkrevd");
+        redigerKdlg->settFeilMelding(tr("Etternavn feltet er påkrevd"));
         redigerKdlg->fokuserElement(UIElementer::ETTERNAVN);
     } else if (redigertKunde.value("firmanavn").toString().isEmpty()) {
-        redigerKdlg->settFeilMelding("Firmanavn feltet er påkrevd");
+        redigerKdlg->settFeilMelding(tr("Firmanavn feltet er påkrevd"));
         redigerKdlg->fokuserElement(UIElementer::FIRMANAVN);
     } else {
         for (int i = 0; i < kundeKart.size(); ++i) {
@@ -638,7 +947,7 @@ void MainWindow::redigerKunde(KundeFil redigertKunde) {
 void MainWindow::slettKunde(int posisjon) {
     QMessageBox bekreftBoks;
     bekreftBoks.setText("Er du sikker?");
-    bekreftBoks.setInformativeText("Vil du slette denne kunden? Prosjektdataene som eventuelt er tilknyttet, vil ikke bli slettet.");
+    bekreftBoks.setInformativeText(tr("Vil du slette denne kunden? Prosjektdataene som eventuelt er tilknyttet, vil ikke bli slettet."));
     bekreftBoks.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
     bekreftBoks.setDefaultButton(QMessageBox::Cancel);
 
@@ -694,13 +1003,22 @@ void MainWindow::knyttProsjekt(int kunde, int prosjekt) {
     QList<int> kundeListe;
     QList<int> prosjektBindinger = bindinger.keys();
     if (!prosjektBindinger.contains(prosjekt)) {
+        QHash<QString, QString> datoStempler;
+        datoStempler.insert("created_at", DataHandler::datoStempel());
+        datoStempler.insert("updated_at", DataHandler::datoStempel());
+
         kundeListe.append(kunde);
         bindinger.insert(prosjekt, kundeListe);
+        prosjektBindingerStempler.insert(prosjekt, datoStempler);
     } else {
         kundeListe = bindinger.value(prosjekt);
+        QHash<QString, QString> datoStempler = prosjektBindingerStempler.value(prosjekt);
         if (!kundeListe.contains(kunde)) {
             kundeListe.append(kunde);
+            datoStempler["updated_at"] = DataHandler::datoStempel();
+
             bindinger[prosjekt] = kundeListe;
+            prosjektBindingerStempler[prosjekt] = datoStempler;
         }
     }
 
@@ -711,20 +1029,17 @@ void MainWindow::knyttProsjekt(int kunde, int prosjekt) {
     QMessageBox::information(this, "Tilknyttet", tr("Kunde med kundenummer %1 er tilknyttet prosjekt med ordrenummer %2").arg(kunde).arg(prosjekt));
 }
 
-/* on_actionLagre_triggered():
- * ------------------------------
+/* kundeSok():
+ * --------------------------------------
  *
- * Lagrer endringer i databasen til fil
+ * Tegner kundetabellen på ny med filteret i Qstring
  */
 
-void MainWindow::on_actionLagre_triggered() {
-    // invokerer lagreFil fra DataHandler klassen der alle IO funksjoner ligger
-    ioHandler->lagreFil(filSti, kundeKart, prosjektKart, bindinger);
-    // Oppdaterer diverse brytere i klassen for å reflektere endringer i programmet
-    harFil = true;
-    filLagret = true;
-    oppdaterTittel();
-    oppdaterUI();
+void MainWindow::kundeSok(QString sok) {
+    if (sok.isEmpty())
+        kundeW->lagKundeTabell(kundeKart);
+    else
+        kundeW->lagKundeTabell(kundeKart, true, sok);
 }
 
 /* on_action_Innstillinger_triggered():
@@ -762,3 +1077,4 @@ void MainWindow::on_actionOm_triggered() {
     this->hide();
     om->show();
 }
+

src/core/mainwindow.h

@@ -2,12 +2,15 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <QSettings>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QCloseEvent>
+#include <QAction>
 
 #include "kundewidget.h"
 #include "prosjektwidget.h"
+#include "utlopwidget.h"
 #include "datahandler.h"
 #include "nykundedialog.h"
 #include "redigerkundedialog.h"
@@ -23,6 +26,8 @@ QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QList<QString>)
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -36,6 +41,7 @@ private slots:
     void on_actionNy_triggered();
     void on_action_pne_triggered();
     void on_action_Avslutt_triggered();
+    void on_actionL_agre_som_triggered();
     void on_actionLagre_triggered();
     void on_action_Innstillinger_triggered();
     void barnDialogLukket();
@@ -50,6 +56,7 @@ private slots:
     void slettKunde(int posisjon);
     void visProsjektListe(int posisjon);
     void knyttProsjekt(int kunde, int prosjekt);
+    void kundeSok(QString sok);
 
     /* Prosjektslots */
     void on_commandProsjekter_clicked();
@@ -61,14 +68,26 @@ private slots:
     void slettProsjekt(int kartotekPlassering);
     void settAktivInaktiv(int kartotekPlassering);
     void fjernKundeFraProsjekt(int prosjektKartotekPosisjon, int kundeID);
+    void filtrerProsjektMedKunKunder(bool kunKunder);
+
+    /* Ultøpslots */
+    void on_commandDeadlines_clicked();
+    void prosjektOppstartsListe();
+    void prosjektAvslutterListe();
+    void hoppTilProsjekt(int prosjektId);
 
     /* Arbeidshest slots */
     void varsle(ProsjektFil prosjekt, AlertConditions kondisjon);
 
+    /* Splashscreen slots */
+    void mottaPostNrSted(int postNr, QString postSted);
+    void splashDone();
+
 private:
     Ui::MainWindow *ui;
     KundeWidget *kundeW;
     ProsjektWidget *prosjektW;
+    UtlopWidget *utlopW;
     DataHandler *ioHandler;
     NyKundeDialog *nyKdlg;
     RedigerKundeDialog *redigerKdlg;
@@ -82,9 +101,12 @@ private:
 
     void oppdaterTittel();
     void oppdaterUI();
+    void konstruerHistorikk();
     void oppdaterTellere();
     void slettKundeFraKartotek(int kundeNummer);
     void erstattProsjekt(ProsjektFil prosjekt);
+    void leggFilbaneTilHistorikk(QString filBane);
+    void lastDatabaseFil(QString fil);
     int tellKunder();
     int tellProsjekter();
     int hentKundeIndeksPosisjon(int kundeNummer);
@@ -99,5 +121,7 @@ private:
     ProsjektFil prosjektKort;
     ProsjektKartotek prosjektKart;
     ProsjektBindinger bindinger;
+    ProsjektBindingerDatoStempler prosjektBindingerStempler;
+    PostNummerTabell postStedTabell;
 };
 #endif // MAINWINDOW_H

src/core/mainwindow.ui

@@ -74,7 +74,7 @@
         <item>
          <widget class="QCommandLinkButton" name="commandDeadlines">
           <property name="text">
-           <string>Utløpsdatoer</string>
+           <string>Tidsfrister</string>
           </property>
           <property name="icon">
            <iconset resource="../../resources.qrc">
@@ -214,7 +214,13 @@
     </property>
     <addaction name="actionOm"/>
    </widget>
+   <widget class="QMenu" name="menuH_istorikk">
+    <property name="title">
+     <string>H&amp;istorikk</string>
+    </property>
+   </widget>
    <addaction name="menu_Fil"/>
+   <addaction name="menuH_istorikk"/>
    <addaction name="menuOm"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
@@ -309,6 +315,10 @@
  </widget>
  <resources>
   <include location="../../resources.qrc"/>
+  <include location="../../resources.qrc"/>
+  <include location="../../resources.qrc"/>
+  <include location="../../resources.qrc"/>
+  <include location="../../resources.qrc"/>
  </resources>
  <connections/>
 </ui>

src/core/omdialog.ui

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OmDialog</class>
- <widget class="QDialog" name="OmDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>386</width>
-    <height>257</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Om dette programmet</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="labelAppHeadline">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt; font-weight:600; color:#ff0000;&quot;&gt;Sæte&lt;/span&gt;&lt;span style=&quot; font-size:18pt; font-weight:600; color:#004add;&quot;&gt;rp&lt;/span&gt;&lt;span style=&quot; font-size:18pt; font-weight:600; color:#ffffff;&quot;&gt;r&lt;/span&gt;&lt;span style=&quot; font-size:18pt; font-weight:600; color:#004add;&quot;&gt;os&lt;/span&gt;&lt;span style=&quot; font-size:18pt; font-weight:600; color:#ff0000;&quot;&gt;jekt&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignHCenter|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="labelVersjon">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignHCenter|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="labelCopyright">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Kopirett(c) av Helge-Mikael Nordgård</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignHCenter|Qt::AlignTop</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="labelDesc">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dette programmet er kopibeskyttet og lisensiert under GPLv3 (GNU General Public License versjon 3). Programmet er åpen og fri kildekode og kan modifiseres og redistribueres under visse betingelser. &lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Du kan lese lisensen i sin helhet her.&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;For å laste ned kildekoden, nye utgivelser, rapportere bugs m.m. kan du besøke &lt;a href=&quot;https://git.outlands.no/heno/Saeterprosjekt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;prosjektets hjemmeside&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushOk">
-       <property name="text">
-        <string>Ok</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/mainwidgets/kundewidget.cpp

@@ -1,93 +1,183 @@
-#include "kundewidget.h"
-#include "ui_kundewidget.h"
-
-KundeWidget::KundeWidget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::KundeWidget) {
-    ui->setupUi(this);
-}
-
-KundeWidget::~KundeWidget() {
-    delete ui;
-}
-
-void KundeWidget::lagKundeTabell(KundeKartotek &kundeKart) {
-    ui->kundeTabell->clear();
-
-    connect(ui->kundeTabell, SIGNAL(itemClicked(QTableWidgetItem*)), this, SLOT(celleKlikk(QTableWidgetItem*)));
-
-    // Sett aktive poster i et eget kartotek
-    KundeKartotek aktivKartotek;
-    for (int i = 0; i < kundeKart.size(); ++i) {
-        if (kundeKart.at(i).value("active").toBool()) {
-            aktivKartotek << kundeKart.at(i);
-        }
-    }
-
-    QStringList overskrifter;
-    overskrifter << "Kundenummer" << "Fornavn" << "Etternavn" << "Firmanavn" <<"Telefonnr" <<"Epostadresse";
-    ui->kundeTabell->setRowCount(aktivKartotek.size());
-    ui->kundeTabell->setColumnCount(6);
-    ui->kundeTabell->setHorizontalHeaderLabels(overskrifter);
-
-    for (int i = 0; i < aktivKartotek.size(); ++i) {
-        QTableWidgetItem *kundeID = new QTableWidgetItem(aktivKartotek.at(i).value("id").toString());
-        kundeID->setFlags(kundeID->flags() ^ Qt::ItemIsEditable);
-        kundeID->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
-
-        QTableWidgetItem *fornavn = new QTableWidgetItem(aktivKartotek.at(i).value("fornavn").toString());
-        fornavn->setFlags(fornavn->flags() ^ Qt::ItemIsEditable);
-        fornavn->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
-
-        QTableWidgetItem *etternavn = new QTableWidgetItem(aktivKartotek.at(i).value("etternavn").toString());
-        etternavn->setFlags(etternavn->flags() ^ Qt::ItemIsEditable);
-        etternavn->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
-
-        QTableWidgetItem *firmanavn = new QTableWidgetItem(aktivKartotek.at(i).value("firmanavn").toString());
-        firmanavn->setFlags(firmanavn->flags() ^ Qt::ItemIsEditable);
-        firmanavn->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
-
-        QTableWidgetItem *telefon = new QTableWidgetItem(aktivKartotek.at(i).value("tlf").toString());
-        telefon->setFlags(telefon->flags() ^ Qt::ItemIsEditable);
-        telefon->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
-
-        QTableWidgetItem *epost = new QTableWidgetItem(aktivKartotek.at(i).value("epost").toString());
-        epost->setFlags(epost->flags() ^ Qt::ItemIsEditable);
-        epost->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
-
-        ui->kundeTabell->setItem(i, 0, kundeID);
-        ui->kundeTabell->setItem(i, 1, fornavn);
-        ui->kundeTabell->setItem(i, 2, etternavn);
-        ui->kundeTabell->setItem(i, 3, firmanavn);
-        ui->kundeTabell->setItem(i, 4, telefon);
-        ui->kundeTabell->setItem(i, 5, epost);
-    }
-}
-
-void KundeWidget::on_pushNyKunde_clicked() {
-    emit opprettKunde();
-}
-
-void KundeWidget::on_pushRediger_clicked() {
-    emit redigerKunde(kundeNummer);
-}
-
-void KundeWidget::celleKlikk(QTableWidgetItem *celleGjenstand) {
-    kundeNummer = celleGjenstand->data(Qt::UserRole).toInt();
-
-    ui->pushRediger->setEnabled(true);
-    ui->pushSlett->setEnabled(true);
-    ui->pushProsjekt->setEnabled(true);
-
-    ui->labelValgteKundeVerdi->setText(tr("kundenr. %1").arg(QString::number(kundeNummer)));
-}
-
-void KundeWidget::on_pushSlett_clicked() {
-    emit slettKunde(kundeNummer);
-}
-
-
-void KundeWidget::on_pushProsjekt_clicked() {
-    emit tilordneProsjekt(kundeNummer);
-}
-
+#include "kundewidget.h"
+#include "ui_kundewidget.h"
+
+KundeWidget::KundeWidget(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::KundeWidget) {
+    ui->setupUi(this);
+
+    filterFelt = CustomerFilters::ID;
+}
+
+KundeWidget::~KundeWidget() {
+    delete ui;
+}
+
+void KundeWidget::lagKundeTabell(KundeKartotek &kundeKart, bool filtrer, QString filter) {
+    ui->kundeTabell->clear();
+
+    connect(ui->kundeTabell, SIGNAL(itemClicked(QTableWidgetItem*)), this, SLOT(celleKlikk(QTableWidgetItem*)));
+
+    // Sett aktive poster i et eget kartotek
+    KundeKartotek aktivKartotek;
+    for (int i = 0; i < kundeKart.size(); ++i) {
+        if (kundeKart.at(i).value("active").toBool()) {
+            aktivKartotek << kundeKart.at(i);
+        }
+    }
+
+    // Hvis filtrer er sann, opprett nytt kundekartotek kalt "filtrertKartotek" og iterer igjennom aktivKartotek for dermed å legge til
+    // felter som kun passer med filteret. Sett dermed "aktivKartotek" til det filtrerte kartoteket ("filtrertKartotek")
+    if (filtrer) {
+        KundeKartotek filtrertKartotek;
+        for (int i = 0; i < aktivKartotek.size(); ++i) {
+            switch (filterFelt) {
+                case CustomerFilters::ID: {
+                    if (aktivKartotek.at(i).value("id").toString().contains(filter)) {
+                        kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
+                    }
+                    break;
+                }
+                case CustomerFilters::NAME: {
+                    QString fulltNavn = aktivKartotek.at(i).value("fornavn").toString() + " " + aktivKartotek.at(i).value("etternavn").toString();
+                    if (fulltNavn.contains(filter, Qt::CaseSensitive)) {
+                        kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
+                    }
+                    break;
+                }
+                case CustomerFilters::COMPANYNAME: {
+                    if (aktivKartotek.at(i).value("firmanavn").toString().contains(filter, Qt::CaseSensitive)) {
+                        kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
+                    }
+                    break;
+                }
+                case CustomerFilters::PHONE: {
+                    if (aktivKartotek.at(i).value("tlf").toString().contains(filter)) {
+                        kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
+                    }
+                    break;
+                }
+                case CustomerFilters::EMAIL: {
+                    if (aktivKartotek.at(i).value("epost").toString().contains(filter)) {
+                        kopierKartotekFelt(aktivKartotek.at(i), filtrertKartotek);
+                    }
+                    break;
+                }
+            }
+        }
+
+        aktivKartotek = filtrertKartotek;
+    }
+
+    QStringList overskrifter;
+    overskrifter << tr("Kundenummer") << tr("Fornavn") << tr("Etternavn") << tr("Firmanavn") << tr("Telefonnr") << tr("Epostadresse");
+    ui->kundeTabell->setRowCount(aktivKartotek.size());
+    ui->kundeTabell->setColumnCount(6);
+    ui->kundeTabell->setHorizontalHeaderLabels(overskrifter);
+
+    for (int i = 0; i < aktivKartotek.size(); ++i) {
+        QTableWidgetItem *kundeID = new QTableWidgetItem(aktivKartotek.at(i).value("id").toString());
+        kundeID->setFlags(kundeID->flags() ^ Qt::ItemIsEditable);
+        kundeID->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
+
+        QTableWidgetItem *fornavn = new QTableWidgetItem(aktivKartotek.at(i).value("fornavn").toString());
+        fornavn->setFlags(fornavn->flags() ^ Qt::ItemIsEditable);
+        fornavn->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
+
+        QTableWidgetItem *etternavn = new QTableWidgetItem(aktivKartotek.at(i).value("etternavn").toString());
+        etternavn->setFlags(etternavn->flags() ^ Qt::ItemIsEditable);
+        etternavn->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
+
+        QTableWidgetItem *firmanavn = new QTableWidgetItem(aktivKartotek.at(i).value("firmanavn").toString());
+        firmanavn->setFlags(firmanavn->flags() ^ Qt::ItemIsEditable);
+        firmanavn->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
+
+        QTableWidgetItem *telefon = new QTableWidgetItem(aktivKartotek.at(i).value("tlf").toString());
+        telefon->setFlags(telefon->flags() ^ Qt::ItemIsEditable);
+        telefon->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
+
+        QTableWidgetItem *epost = new QTableWidgetItem(aktivKartotek.at(i).value("epost").toString());
+        epost->setFlags(epost->flags() ^ Qt::ItemIsEditable);
+        epost->setData(Qt::UserRole, aktivKartotek.at(i).value("id").toInt());
+
+        ui->kundeTabell->setItem(i, 0, kundeID);
+        ui->kundeTabell->setItem(i, 1, fornavn);
+        ui->kundeTabell->setItem(i, 2, etternavn);
+        ui->kundeTabell->setItem(i, 3, firmanavn);
+        ui->kundeTabell->setItem(i, 4, telefon);
+        ui->kundeTabell->setItem(i, 5, epost);
+    }
+
+    ui->kundeTabell->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+}
+
+void KundeWidget::on_pushNyKunde_clicked() {
+    emit opprettKunde();
+}
+
+void KundeWidget::on_pushRediger_clicked() {
+    emit redigerKunde(kundeNummer);
+}
+
+void KundeWidget::celleKlikk(QTableWidgetItem *celleGjenstand) {
+    kundeNummer = celleGjenstand->data(Qt::UserRole).toInt();
+
+    ui->pushRediger->setEnabled(true);
+    ui->pushSlett->setEnabled(true);
+    ui->pushProsjekt->setEnabled(true);
+
+    ui->labelValgteKundeVerdi->setText(tr("kundenr. %1").arg(QString::number(kundeNummer)));
+}
+
+void KundeWidget::on_pushSlett_clicked() {
+    emit slettKunde(kundeNummer);
+}
+
+
+void KundeWidget::on_pushProsjekt_clicked() {
+    emit tilordneProsjekt(kundeNummer);
+}
+
+
+void KundeWidget::on_radioSokKundeNummer_clicked() {
+    ui->lineSok->clear();
+    ui->lineSok->setFocus();
+    filterFelt = CustomerFilters::ID;
+}
+
+
+void KundeWidget::on_radioSokIFornavn_clicked() {
+    ui->lineSok->clear();
+    ui->lineSok->setFocus();
+    filterFelt = CustomerFilters::NAME;
+}
+
+
+void KundeWidget::on_radioSokIFirma_clicked() {
+    ui->lineSok->clear();
+    ui->lineSok->setFocus();
+    filterFelt = CustomerFilters::COMPANYNAME;
+}
+
+
+void KundeWidget::on_radioSokITlf_clicked() {
+    ui->lineSok->clear();
+    ui->lineSok->setFocus();
+    filterFelt = CustomerFilters::PHONE;
+}
+
+
+void KundeWidget::on_radioSokIEpost_clicked() {
+    ui->lineSok->clear();
+    ui->lineSok->setFocus();
+    filterFelt = CustomerFilters::EMAIL;
+}
+
+
+void KundeWidget::on_lineSok_textChanged(const QString &arg1) {
+    emit startSok(arg1);
+}
+
+void KundeWidget::kopierKartotekFelt(KundeFil kilde, KundeKartotek &maal) {
+    maal << kilde;
+}

src/mainwidgets/kundewidget.h

@@ -1,42 +1,54 @@
-#ifndef KUNDEWIDGET_H
-#define KUNDEWIDGET_H
-
-#include <QWidget>
-#include <QTableWidgetItem>
-
-#include "datahandler.h"
-#include "datatypes.h"
-
-namespace Ui {
-class KundeWidget;
-}
-
-class KundeWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit KundeWidget(QWidget *parent = nullptr);
-    ~KundeWidget();
-
-    void lagKundeTabell(KundeKartotek &kundeKart);
-
-signals:
-    void opprettKunde();
-    void redigerKunde(int posisjon);
-    void slettKunde(int posisjon);
-    void tilordneProsjekt(int posisjon);
-
-private slots:
-    void on_pushNyKunde_clicked();
-    void celleKlikk(QTableWidgetItem *celleGjenstand);
-    void on_pushRediger_clicked();
-    void on_pushSlett_clicked();   
-    void on_pushProsjekt_clicked();
-
-private:
-    Ui::KundeWidget *ui;
-    int kundeNummer;
-};
-
-#endif // KUNDEWIDGET_H
+#ifndef KUNDEWIDGET_H
+#define KUNDEWIDGET_H
+
+#include <QWidget>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+
+#include "datahandler.h"
+#include "datatypes.h"
+
+namespace Ui {
+class KundeWidget;
+}
+
+class KundeWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit KundeWidget(QWidget *parent = nullptr);
+    ~KundeWidget();
+
+    void lagKundeTabell(KundeKartotek &kundeKart, bool filtrer = false, QString filter = QString());
+
+signals:
+    void opprettKunde();
+    void redigerKunde(int posisjon);
+    void slettKunde(int posisjon);
+    void tilordneProsjekt(int posisjon);
+    void startSok(QString soekeStreng);
+
+private slots:
+    void on_pushNyKunde_clicked();
+    void celleKlikk(QTableWidgetItem *celleGjenstand);
+    void on_pushRediger_clicked();
+    void on_pushSlett_clicked();   
+    void on_pushProsjekt_clicked();
+    void on_radioSokKundeNummer_clicked();
+    void on_radioSokIFornavn_clicked();
+    void on_radioSokIFirma_clicked();
+    void on_radioSokITlf_clicked();
+    void on_radioSokIEpost_clicked();
+    void on_lineSok_textChanged(const QString &arg1);
+
+private:
+    Ui::KundeWidget *ui;
+    int kundeNummer;
+    CustomerFilters filterFelt;
+    void kopierKartotekFelt(KundeFil kilde, KundeKartotek &maal);
+};
+
+#endif // KUNDEWIDGET_H

src/mainwidgets/kundewidget.ui

@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>KundeWidget</class>
+ <widget class="QWidget" name="KundeWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>532</width>
+    <height>378</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelHeadline">
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Kundeliste</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <spacer name="horizontalSpacer_7">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="labelSok">
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>Søk:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="lineSok"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <widget class="QLabel" name="labelSokI">
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>Søk i:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="radioSokKundeNummer">
+           <property name="text">
+            <string>Kundenummer</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="radioSokIFornavn">
+           <property name="text">
+            <string>Navn</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="radioSokIFirma">
+           <property name="text">
+            <string>Firma</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="radioSokITlf">
+           <property name="text">
+            <string>Telefon</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="radioSokIEpost">
+           <property name="text">
+            <string>Epost</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_8">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTableWidget" name="kundeTabell">
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelValgteKunde">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Valgte kunde: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelValgteKundeVerdi">
+       <property name="text">
+        <string>Ingen kunde valgt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushNyKunde">
+       <property name="text">
+        <string>Ny kunde</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushRediger">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Rediger kunde</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushSlett">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Slett kunde</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushProsjekt">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Tilordne prosjekt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/mainwidgets/mainwidgets.pri

@@ -0,0 +1,24 @@
+INCLUDEPATH += \
+	$$PWD/../core \
+	$$PWD/../uidialogs/widgetdialogs/kunde
+DEPENDPATH += \
+	$$PWD/../core \
+	$$PWD/../uidialogs/widgetdialogs/kunde
+
+SOURCES += \
+    $$PWD/kundewidget.cpp \
+    $$PWD/prosjektwidget.cpp \
+    $$PWD/utlopwidget.cpp
+
+HEADERS += \
+    $$PWD/kundewidget.h \
+    $$PWD/prosjektwidget.h  \
+    $$PWD/utlopwidget.h
+
+FORMS += \
+    $$PWD/kundewidget.ui \
+    $$PWD/prosjektwidget.ui \
+    $$PWD/utlopwidget.ui
+	
+RESOURCES += \
+    $$PWD/../../resources.qrc

src/mainwidgets/prosjektwidget.cpp

@@ -1,140 +1,224 @@
-#include "prosjektwidget.h"
-#include "ui_prosjektwidget.h"
-
-ProsjektWidget::ProsjektWidget(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ProsjektWidget) {
-    ui->setupUi(this);
-}
-
-ProsjektWidget::~ProsjektWidget() {
-    delete ui;
-}
-
-void ProsjektWidget::oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart) {
-    ui->prosjektTre->clear();
-    ui->prosjektTre->setColumnCount(1);
-
-    connect(ui->prosjektTre, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(gjenstandKlikk(QTreeWidgetItem*,int)));
-
-    QList<QTreeWidgetItem *> prosjektListe;
-    QIcon prosjektIkon(":/res/clipboard.svg");
-    QIcon prosjektFerdigIkon(":/res/check.svg");
-    QIcon kundeIkon(":/res/user.svg");
-
-    for (int i = 0; i < kartotek.size(); ++i) {
-        bool aktiv = kartotek.at(i).value("active").toBool();
-        if (aktiv) {
-            bool ferdig = kartotek.at(i).value("ferdig").toBool();
-            QTreeWidgetItem *prosjektGjenstand = new QTreeWidgetItem(QTreeWidgetItem::Type);
-            prosjektGjenstand->setText(0, kartotek.at(i).value("prosjektnavn").toString());
-
-            if (ferdig)
-                prosjektGjenstand->setIcon(0,prosjektFerdigIkon);
-            else
-                prosjektGjenstand->setIcon(0, prosjektIkon);
-
-            int ordrenummer = kartotek.at(i).value("ordrenummer").toInt();
-            QList<QTreeWidgetItem *> kundeGjenstander;
-            if (bindinger.contains(ordrenummer)) {
-                QList<int> kunder = bindinger.value(ordrenummer);
-                for (int x = 0; x < kunder.size(); ++x) {
-                    QString kundeFornavn, kundeEtternavn, kundeFirmanavn;
-                    for (int z = 0; z < kundeKart.size(); ++z) {
-                        if (kundeKart.at(z).value("id").toInt() == kunder.at(x)) {
-                            kundeFornavn = kundeKart.at(z).value("fornavn").toString();
-                            kundeEtternavn = kundeKart.at(z).value("etternavn").toString();
-                            if (!kundeKart.at(z).value("firmanavn").toString().isEmpty()) {
-                                kundeFirmanavn = QString(tr("(%1)").arg(kundeKart.at(z).value("firmanavn").toString()));
-                            }
-                        }
-                    }
-                    QTreeWidgetItem *kunde = new QTreeWidgetItem(QTreeWidgetItem::UserType);
-                    kunde->setText(0, tr("%1 %2 %3").arg(kundeFornavn, kundeEtternavn, kundeFirmanavn));
-                    kunde->setIcon(0, kundeIkon);
-                    kunde->setData(0, Qt::UserRole, kunder.at(x));
-                    kundeGjenstander.append(kunde);
-                }
-                prosjektGjenstand->addChildren(kundeGjenstander);
-            }
-
-            prosjektGjenstand->setData(0, Qt::UserRole, i);
-            prosjektListe.append(prosjektGjenstand);
-        }
-    }
-
-    ui->prosjektTre->addTopLevelItems(prosjektListe);
-}
-
-void ProsjektWidget::settGjeldendeProsjekt(ProsjektFil prosjekt) {
-    valgtProsjekt = prosjekt;
-}
-
-void ProsjektWidget::on_pushNy_clicked() {
-    emit opprettProsjekt();
-}
-
-void ProsjektWidget::gjenstandKlikk(QTreeWidgetItem *gjenstand, int kolonne) {
-    if (gjenstand->type() == QTreeWidgetItem::Type) {
-        emit hentProsjektFil(gjenstand->data(kolonne, Qt::UserRole).toInt());
-        kartotekPosisjon = gjenstand->data(kolonne, Qt::UserRole).toInt();
-
-        ui->labelProsjektNavn->setText(valgtProsjekt.value("prosjektnavn").toString());
-        ui->labelOrdrenrValue->setText(valgtProsjekt.value("ordrenummer").toString());
-        ui->ordreText->setHtml(valgtProsjekt.value("prosjektbeskrivelse").toString());
-
-        quint64 prosjektStart = valgtProsjekt.value("prosjektstart").toULongLong();
-        quint64 prosjektSlutt = valgtProsjekt.value("prosjektslutt").toULongLong();
-        QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(prosjektStart));
-        QDateTime tProsjektSlutt(QDateTime::fromMSecsSinceEpoch(prosjektSlutt));
-        ui->labelBegynnerValue->setText(tProsjektStart.toString("dd.MM.yyyy hh:mm"));
-        ui->labelSlutterValue->setText(tProsjektSlutt.toString("dd.MM.yyyy hh:mm"));
-
-        prosjektUI();
-    } else {
-        QTreeWidgetItem *forelder = gjenstand->parent();
-        kartotekPosisjon = forelder->data(kolonne, Qt::UserRole).toInt();
-        kundeID = gjenstand->data(kolonne, Qt::UserRole).toInt();
-        ui->labelProsjektNavn->setText("Ingen prosjekt valgt");
-        ui->labelOrdrenrValue->setText("-");
-        ui->labelBegynnerValue->setText("-");
-        ui->labelSlutterValue->setText("-");
-        ui->ordreText->clear();
-
-        kundeUI();
-    }
-}
-
-void ProsjektWidget::prosjektUI() {
-    ui->pushFjernKunde->setEnabled(false);
-    ui->pushRediger->setEnabled(true);
-    ui->pushSlett->setEnabled(true);
-    ui->pushMerkFerdig->setEnabled(true);
-}
-
-void ProsjektWidget::kundeUI() {
-    ui->pushFjernKunde->setEnabled(true);
-    ui->pushRediger->setEnabled(false);
-    ui->pushSlett->setEnabled(false);
-    ui->pushMerkFerdig->setEnabled(false);
-}
-
-
-void ProsjektWidget::on_pushRediger_clicked() {
-    emit redigerProsjekt(kartotekPosisjon);
-}
-
-
-void ProsjektWidget::on_pushSlett_clicked() {
-    emit slettProsjekt(kartotekPosisjon);
-}
-
-
-void ProsjektWidget::on_pushMerkFerdig_clicked() {
-    emit settAktiv(kartotekPosisjon);
-}
-
-
-void ProsjektWidget::on_pushFjernKunde_clicked() {
-    emit fjernKunde(kartotekPosisjon, kundeID);
-}
+#include "prosjektwidget.h"
+#include "ui_prosjektwidget.h"
+
+ProsjektWidget::ProsjektWidget(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ProsjektWidget) {
+    ui->setupUi(this);
+
+    prosjektFiltre = ProjectFilters::ALL;
+}
+
+ProsjektWidget::~ProsjektWidget() {
+    delete ui;
+}
+
+void ProsjektWidget::oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart, int prosjekt, bool visKunKunder) {
+    lokaltKartotek = kartotek;
+    ui->prosjektTre->clear();
+    ui->prosjektTre->setColumnCount(1);
+
+    connect(ui->prosjektTre, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(gjenstandKlikk(QTreeWidgetItem*,int)));
+
+    QList<QTreeWidgetItem *> prosjektListe;
+    QIcon prosjektIkon(":/res/clipboard.svg");
+    QIcon prosjektFerdigIkon(":/res/check.svg");
+    QIcon kundeIkon(":/res/user.svg");
+
+    ProsjektKartotek filtrertKartotek = kartotek;
+
+    if (visKunKunder) {
+        filtrertKartotek.clear();
+        for (int i = 0; i < kartotek.size(); ++i) {
+            bool harBinding = false;
+            if (bindinger.contains(kartotek.at(i).value("ordrenummer").toInt()))
+                harBinding = true;
+
+            if (harBinding)
+                filtrertKartotek << kartotek.at(i);
+        }
+    }
+
+    ProsjektKartotek ytterligereFiltrertKartotek;
+
+    switch (prosjektFiltre) {
+        case ProjectFilters::ALL: {
+            ytterligereFiltrertKartotek = filtrertKartotek;
+            break;
+        }
+        case ProjectFilters::ACTIVE: {
+            for (int i = 0; i < filtrertKartotek.size(); ++i) {
+                bool ferdig = filtrertKartotek.at(i).value("ferdig").toBool();
+                if (!ferdig)
+                    ytterligereFiltrertKartotek << filtrertKartotek.at(i);
+            }
+            break;
+        }
+        case ProjectFilters::INACTIVE: {
+            for (int i = 0; i < filtrertKartotek.size(); ++i) {
+                bool ferdig = filtrertKartotek.at(i).value("ferdig").toBool();
+                if (ferdig)
+                    ytterligereFiltrertKartotek << filtrertKartotek.at(i);
+            }
+            break;
+        }
+    }
+
+    filtrertKartotek = ytterligereFiltrertKartotek;
+
+    for (int i = 0; i < filtrertKartotek.size(); ++i) {
+        bool aktiv = filtrertKartotek.at(i).value("active").toBool();
+        if (aktiv) {
+            bool ferdig = filtrertKartotek.at(i).value("ferdig").toBool();
+            QTreeWidgetItem *prosjektGjenstand = new QTreeWidgetItem(QTreeWidgetItem::Type);
+            prosjektGjenstand->setText(0, filtrertKartotek.at(i).value("prosjektnavn").toString());
+
+            if (ferdig)
+                prosjektGjenstand->setIcon(0,prosjektFerdigIkon);
+            else
+                prosjektGjenstand->setIcon(0, prosjektIkon);
+
+            int ordrenummer = filtrertKartotek.at(i).value("ordrenummer").toInt();
+            QList<QTreeWidgetItem *> kundeGjenstander;
+            if (bindinger.contains(ordrenummer)) {
+                QList<int> kunder = bindinger.value(ordrenummer);
+                for (int x = 0; x < kunder.size(); ++x) {
+                    QString kundeFornavn, kundeEtternavn, kundeFirmanavn;
+                    for (int z = 0; z < kundeKart.size(); ++z) {
+                        if (kundeKart.at(z).value("id").toInt() == kunder.at(x)) {
+                            kundeFornavn = kundeKart.at(z).value("fornavn").toString();
+                            kundeEtternavn = kundeKart.at(z).value("etternavn").toString();
+                            if (!kundeKart.at(z).value("firmanavn").toString().isEmpty()) {
+                                kundeFirmanavn = QString(tr("(%1)").arg(kundeKart.at(z).value("firmanavn").toString()));
+                            }
+                        }
+                    }
+                    QTreeWidgetItem *kunde = new QTreeWidgetItem(QTreeWidgetItem::UserType);
+                    kunde->setText(0, tr("%1 %2 %3").arg(kundeFornavn, kundeEtternavn, kundeFirmanavn));
+                    kunde->setIcon(0, kundeIkon);
+                    kunde->setData(0, Qt::UserRole, kunder.at(x));
+                    kundeGjenstander.append(kunde);
+                }
+                prosjektGjenstand->addChildren(kundeGjenstander);
+            }
+
+            prosjektGjenstand->setData(0, Qt::UserRole, filtrertKartotek.at(i).value("ordrenummer").toInt());
+            prosjektListe.append(prosjektGjenstand);
+        }
+    }
+
+    ui->prosjektTre->addTopLevelItems(prosjektListe);
+
+    for (int i = 0; i < prosjektListe.size(); ++i) {
+        if (prosjekt > 0 && prosjekt == prosjektListe.at(i)->data(0, Qt::UserRole).toInt()) {
+            prosjektListe.at(i)->setSelected(true);
+            gjenstandKlikk(prosjektListe.at(i), 0);
+        }
+    }
+}
+
+void ProsjektWidget::settGjeldendeProsjekt(ProsjektFil prosjekt) {
+    valgtProsjekt = prosjekt;
+}
+
+void ProsjektWidget::on_pushNy_clicked() {
+    emit opprettProsjekt();
+}
+
+void ProsjektWidget::gjenstandKlikk(QTreeWidgetItem *gjenstand, int kolonne) {
+    if (gjenstand->type() == QTreeWidgetItem::Type) {
+        emit hentProsjektFil(hentKartotekPosisjon(gjenstand->data(kolonne, Qt::UserRole).toInt()));
+        kartotekPosisjon = hentKartotekPosisjon(gjenstand->data(kolonne, Qt::UserRole).toInt());
+
+        ui->labelProsjektNavn->setText(valgtProsjekt.value("prosjektnavn").toString());
+        ui->labelOrdrenrValue->setText(valgtProsjekt.value("ordrenummer").toString());
+        ui->ordreText->setHtml(valgtProsjekt.value("prosjektbeskrivelse").toString());
+
+        quint64 prosjektStart = valgtProsjekt.value("prosjektstart").toULongLong();
+        quint64 prosjektSlutt = valgtProsjekt.value("prosjektslutt").toULongLong();
+        QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(prosjektStart));
+        QDateTime tProsjektSlutt(QDateTime::fromMSecsSinceEpoch(prosjektSlutt));
+        ui->labelBegynnerValue->setText(tProsjektStart.toString("dd.MM.yyyy hh:mm"));
+        ui->labelSlutterValue->setText(tProsjektSlutt.toString("dd.MM.yyyy hh:mm"));
+
+        prosjektUI();
+    } else {
+        QTreeWidgetItem *forelder = gjenstand->parent();
+        kartotekPosisjon = hentKartotekPosisjon(forelder->data(kolonne, Qt::UserRole).toInt());
+        kundeID = gjenstand->data(kolonne, Qt::UserRole).toInt();
+        ui->labelProsjektNavn->setText("Ingen prosjekt valgt");
+        ui->labelOrdrenrValue->setText("-");
+        ui->labelBegynnerValue->setText("-");
+        ui->labelSlutterValue->setText("-");
+        ui->ordreText->clear();
+
+        kundeUI();
+    }
+}
+
+void ProsjektWidget::prosjektUI() {
+    ui->pushFjernKunde->setEnabled(false);
+    ui->pushRediger->setEnabled(true);
+    ui->pushSlett->setEnabled(true);
+    ui->pushMerkFerdig->setEnabled(true);
+}
+
+void ProsjektWidget::kundeUI() {
+    ui->pushFjernKunde->setEnabled(true);
+    ui->pushRediger->setEnabled(false);
+    ui->pushSlett->setEnabled(false);
+    ui->pushMerkFerdig->setEnabled(false);
+}
+
+int ProsjektWidget::hentKartotekPosisjon(int prosjektId) {
+    int posisjon = 0;
+    for (int i = 0; i < lokaltKartotek.size(); ++i) {
+        if (lokaltKartotek.at(i).value("ordrenummer").toInt() == prosjektId)
+            posisjon = i;
+    }
+
+    return posisjon;
+}
+
+
+void ProsjektWidget::on_pushRediger_clicked() {
+    emit redigerProsjekt(kartotekPosisjon);
+}
+
+
+void ProsjektWidget::on_pushSlett_clicked() {
+    emit slettProsjekt(kartotekPosisjon);
+}
+
+
+void ProsjektWidget::on_pushMerkFerdig_clicked() {
+    emit settAktiv(kartotekPosisjon);
+}
+
+
+void ProsjektWidget::on_pushFjernKunde_clicked() {
+    emit fjernKunde(kartotekPosisjon, kundeID);
+}
+
+void ProsjektWidget::on_checkHarBarn_clicked() {
+    emit filtrerKunKunder(ui->checkHarBarn->isChecked());
+}
+
+
+void ProsjektWidget::on_radioVisAlle_clicked() {
+    prosjektFiltre = ProjectFilters::ALL;
+    emit filtrerKunKunder(ui->checkHarBarn->isChecked());
+}
+
+
+void ProsjektWidget::on_radioVisAktive_clicked() {
+    prosjektFiltre = ProjectFilters::ACTIVE;
+    emit filtrerKunKunder(ui->checkHarBarn->isChecked());
+}
+
+
+void ProsjektWidget::on_radioVisFerdige_clicked() {
+    prosjektFiltre = ProjectFilters::INACTIVE;
+    emit filtrerKunKunder(ui->checkHarBarn->isChecked());
+}
+

src/mainwidgets/prosjektwidget.h

@@ -1,49 +1,57 @@
-#ifndef PROSJEKTWIDGET_H
-#define PROSJEKTWIDGET_H
-
-#include <QWidget>
-#include <QTreeWidgetItem>
-#include "datatypes.h"
-
-namespace Ui {
-class ProsjektWidget;
-}
-
-class ProsjektWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ProsjektWidget(QWidget *parent = nullptr);
-    ~ProsjektWidget();
-
-    void oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart);
-    void settGjeldendeProsjekt(ProsjektFil prosjekt);
-
-signals:
-    void opprettProsjekt();
-    void hentProsjektFil(int kartotekPlassering);
-    void redigerProsjekt(int kartotekPlassering);
-    void slettProsjekt(int kartotekPlassering);
-    void settAktiv(int kartotekPlassering);
-    void fjernKunde(int prosjektKartotekPosisjon, int kundeID);
-
-private slots:
-    void on_pushNy_clicked();
-    void gjenstandKlikk(QTreeWidgetItem *gjenstand, int kolonne);
-    void on_pushRediger_clicked();
-    void on_pushSlett_clicked();
-    void on_pushMerkFerdig_clicked();
-    void on_pushFjernKunde_clicked();
-
-private:
-    Ui::ProsjektWidget *ui;
-    ProsjektFil valgtProsjekt;
-
-    void prosjektUI();
-    void kundeUI();
-
-    int kartotekPosisjon, kundeID;
-};
-
-#endif // PROSJEKTWIDGET_H
+#ifndef PROSJEKTWIDGET_H
+#define PROSJEKTWIDGET_H
+
+#include <QWidget>
+#include <QTreeWidgetItem>
+#include "datatypes.h"
+
+namespace Ui {
+class ProsjektWidget;
+}
+
+class ProsjektWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ProsjektWidget(QWidget *parent = nullptr);
+    ~ProsjektWidget();
+
+    void oppdaterProsjektListe(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger, KundeKartotek &kundeKart, int prosjekt = 0, bool visKunKunder = false);
+    void settGjeldendeProsjekt(ProsjektFil prosjekt);
+
+signals:
+    void opprettProsjekt();
+    void hentProsjektFil(int kartotekPlassering);
+    void redigerProsjekt(int kartotekPlassering);
+    void slettProsjekt(int kartotekPlassering);
+    void settAktiv(int kartotekPlassering);
+    void fjernKunde(int prosjektKartotekPosisjon, int kundeID);
+    void filtrerKunKunder(bool visKunKunder);
+
+private slots:
+    void on_pushNy_clicked();
+    void gjenstandKlikk(QTreeWidgetItem *gjenstand, int kolonne);
+    void on_pushRediger_clicked();
+    void on_pushSlett_clicked();
+    void on_pushMerkFerdig_clicked();
+    void on_pushFjernKunde_clicked();
+    void on_checkHarBarn_clicked();
+    void on_radioVisAlle_clicked();
+    void on_radioVisAktive_clicked();
+    void on_radioVisFerdige_clicked();
+
+private:
+    Ui::ProsjektWidget *ui;
+    ProsjektFil valgtProsjekt;
+    ProsjektKartotek lokaltKartotek;
+    ProjectFilters prosjektFiltre;
+
+    void prosjektUI();
+    void kundeUI();
+    int hentKartotekPosisjon(int prosjektId);
+
+    int kartotekPosisjon, kundeID;
+};
+
+#endif // PROSJEKTWIDGET_H

src/mainwidgets/prosjektwidget.ui

@@ -1,351 +1,403 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProsjektWidget</class>
- <widget class="QWidget" name="ProsjektWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>605</width>
-    <height>427</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelHeadline">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Prosjektliste</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QTreeWidget" name="prosjektTre">
-       <attribute name="headerVisible">
-        <bool>false</bool>
-       </attribute>
-       <column>
-        <property name="text">
-         <string notr="true">1</string>
-        </property>
-       </column>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="prosjektDetaljGruppe">
-       <property name="title">
-        <string>Prosjektdetaljer</string>
-       </property>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <spacer name="horizontalSpacer_4">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLabel" name="labelProsjektNavn">
-              <property name="font">
-               <font>
-                <pointsize>10</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Ingen prosjekt valgt</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_5">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_7">
-            <item>
-             <widget class="QLabel" name="labelOrdrenr">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Ordrenummer:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_7">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLabel" name="labelOrdrenrValue">
-              <property name="text">
-               <string>-</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <item>
-             <widget class="QLabel" name="labelBegynner">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Startdato:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLabel" name="labelBegynnerValue">
-              <property name="text">
-               <string>-</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <item>
-             <widget class="QLabel" name="labelSlutter">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Sluttdato:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_6">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLabel" name="labelSlutterValue">
-              <property name="text">
-               <string>-</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBeskrivelse">
-     <property name="title">
-      <string>Ordrebeskrivelse</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QTextBrowser" name="ordreText"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_6">
-     <item>
-      <spacer name="horizontalSpacer_9">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushNy">
-       <property name="text">
-        <string>Nytt prosjekt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushRediger">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Rediger prosjekt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushSlett">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Slett prosjekt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushMerkFerdig">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Marker som avsluttet/startet</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushFjernKunde">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Fjern kunde</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_8">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProsjektWidget</class>
+ <widget class="QWidget" name="ProsjektWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>637</width>
+    <height>439</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelHeadline">
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Prosjektliste</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QTreeWidget" name="prosjektTre">
+       <attribute name="headerVisible">
+        <bool>false</bool>
+       </attribute>
+       <column>
+        <property name="text">
+         <string notr="true">1</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="prosjektDetaljGruppe">
+       <property name="title">
+        <string>Prosjektdetaljer</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <spacer name="horizontalSpacer_4">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelProsjektNavn">
+              <property name="font">
+               <font>
+                <pointsize>10</pointsize>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Ingen prosjekt valgt</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_5">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <item>
+             <widget class="QLabel" name="labelOrdrenr">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Ordrenummer:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_7">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelOrdrenrValue">
+              <property name="text">
+               <string>-</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLabel" name="labelBegynner">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Startdato:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelBegynnerValue">
+              <property name="text">
+               <string>-</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="labelSlutter">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Sluttdato:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_6">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelSlutterValue">
+              <property name="text">
+               <string>-</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <item>
+      <widget class="QLabel" name="labelFiltrerProsjekter">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Vis/ filtrer prosjekter:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
+       <item>
+        <widget class="QRadioButton" name="radioVisAlle">
+         <property name="text">
+          <string>Vis alle prosjekter</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="radioVisAktive">
+         <property name="text">
+          <string>Vis kun aktive</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="radioVisFerdige">
+         <property name="text">
+          <string>Vis kun ferdige</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="checkHarBarn">
+         <property name="text">
+          <string>Vis kun prosjekter med tilordnede kunder</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBeskrivelse">
+     <property name="title">
+      <string>Ordrebeskrivelse</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QTextBrowser" name="ordreText"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <spacer name="horizontalSpacer_9">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushNy">
+       <property name="text">
+        <string>Nytt prosjekt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushRediger">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Rediger prosjekt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushSlett">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Slett prosjekt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushMerkFerdig">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Marker som avsluttet/startet</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushFjernKunde">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Fjern kunde</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_8">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/mainwidgets/utlopwidget.cpp

@@ -0,0 +1,116 @@
+#include "utlopwidget.h"
+#include "ui_utlopwidget.h"
+
+UtlopWidget::UtlopWidget(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::UtlopWidget) {
+    ui->setupUi(this);
+}
+
+UtlopWidget::~UtlopWidget() {
+    delete ui;
+}
+
+void UtlopWidget::tegnUtlopsDatoer(ProsjektKartotek &kartotek) {
+    ui->prosjektTable->clear();
+    ProsjektKartotek gyldigKartotek = fjernUgyldigeProsjekter(kartotek);
+
+    QStringList overskrifter;
+    overskrifter << tr("Prosjektnavn") << tr("Antall dager til prosjektet slutter");
+    ui->prosjektTable->setRowCount(gyldigKartotek.size());
+    ui->prosjektTable->setColumnCount(2);
+    ui->prosjektTable->setHorizontalHeaderLabels(overskrifter);
+
+    for (int i = 0; i < gyldigKartotek.size(); ++i) {
+        QDateTime iDag = QDateTime::currentDateTime();
+        quint64 iDagEpoch = iDag.toMSecsSinceEpoch();
+        quint64 utlop = gyldigKartotek.at(i).value("prosjektslutt").toULongLong() - iDagEpoch;
+        int antallDagerUtlop = utlop / 24 / 60 / 60 / 1000;
+
+        QTableWidgetItem *prosjektNavn = new QTableWidgetItem();
+        prosjektNavn->setFlags(prosjektNavn->flags() ^ Qt::ItemIsEditable);
+        prosjektNavn->setData(Qt::EditRole, gyldigKartotek.at(i).value("prosjektnavn").toString());
+        prosjektNavn->setData(Qt::UserRole, gyldigKartotek.at(i).value("ordrenummer").toInt());
+
+        QTableWidgetItem *utloper = new QTableWidgetItem();
+        utloper->setFlags(utloper->flags() ^ Qt::ItemIsEditable);
+        if (antallDagerUtlop < 0)
+            utloper->setData(Qt::EditRole, tr("Utløpt"));
+        else if (antallDagerUtlop == 0)
+            utloper->setData(Qt::EditRole, tr("I dag"));
+        else
+            utloper->setData(Qt::EditRole, antallDagerUtlop);
+        utloper->setData(Qt::UserRole, gyldigKartotek.at(i).value("ordrenummer").toInt());
+
+        ui->prosjektTable->setItem(i, 0, prosjektNavn);
+        ui->prosjektTable->setItem(i, 1, utloper);
+    }
+
+    ui->prosjektTable->sortItems(1);
+    ui->prosjektTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+}
+
+void UtlopWidget::tegnOppstartsDatoer(ProsjektKartotek &kartotek) {
+    ui->prosjektTable->clear();
+    ProsjektKartotek gyldigKartotek = fjernUgyldigeProsjekter(kartotek);
+
+    QStringList overskrifter;
+    overskrifter << tr("Prosjektnavn") << tr("Antall dager til prosjektet starter");
+    ui->prosjektTable->setRowCount(gyldigKartotek.size());
+    ui->prosjektTable->setColumnCount(2);
+    ui->prosjektTable->setHorizontalHeaderLabels(overskrifter);
+
+    for (int i = 0; i < gyldigKartotek.size(); ++i) {
+        QDateTime iDag = QDateTime::currentDateTime();
+        quint64 iDagEpoch = iDag.toMSecsSinceEpoch();
+        quint64 utlop = gyldigKartotek.at(i).value("prosjektstart").toULongLong() - iDagEpoch;
+        int antallDagerUtlop = utlop / 24 / 60 / 60 / 1000;
+
+        QTableWidgetItem *prosjektNavn = new QTableWidgetItem();
+        prosjektNavn->setFlags(prosjektNavn->flags() ^ Qt::ItemIsEditable);
+        prosjektNavn->setData(Qt::EditRole, gyldigKartotek.at(i).value("prosjektnavn").toString());
+        prosjektNavn->setData(Qt::UserRole, gyldigKartotek.at(i).value("ordrenummer").toInt());
+
+        QTableWidgetItem *utloper = new QTableWidgetItem();
+        utloper->setFlags(utloper->flags() ^ Qt::ItemIsEditable);
+        if (antallDagerUtlop < 0)
+            utloper->setData(Qt::EditRole, tr("Startet"));
+        else if (antallDagerUtlop == 0)
+            utloper->setData(Qt::EditRole, tr("I dag"));
+        else
+            utloper->setData(Qt::EditRole, antallDagerUtlop);
+        utloper->setData(Qt::UserRole, gyldigKartotek.at(i).value("ordrenummer").toInt());
+
+        ui->prosjektTable->setItem(i, 0, prosjektNavn);
+        ui->prosjektTable->setItem(i, 1, utloper);
+    }
+
+    ui->prosjektTable->sortItems(1);
+    ui->prosjektTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+}
+
+void UtlopWidget::on_radioVisAvslutt_clicked() {
+    emit prosjektListeAvslutter();
+}
+
+
+void UtlopWidget::on_radioVisBegynner_clicked() {
+    emit prosjektListeStarter();
+}
+
+ProsjektKartotek UtlopWidget::fjernUgyldigeProsjekter(ProsjektKartotek kartotek) {
+    ProsjektKartotek gyldige;
+
+    for (int i = 0; i < kartotek.size(); ++i) {
+        if (kartotek.at(i).value("active").toBool() && !kartotek.at(i).value("ferdig").toBool())
+            gyldige << kartotek.at(i);
+
+    }
+
+    return gyldige;
+}
+
+
+void UtlopWidget::on_prosjektTable_itemDoubleClicked(QTableWidgetItem *item) {
+    emit visProsjekt(item->data(Qt::UserRole).toInt());
+}

src/mainwidgets/utlopwidget.h

@@ -0,0 +1,40 @@
+#ifndef UTLOPWIDGET_H
+#define UTLOPWIDGET_H
+
+#include <QWidget>
+#include <QTableWidgetItem>
+#include <QDateTime>
+#include "datatypes.h"
+
+namespace Ui {
+class UtlopWidget;
+}
+
+class UtlopWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit UtlopWidget(QWidget *parent = nullptr);
+    ~UtlopWidget();
+
+    void tegnUtlopsDatoer(ProsjektKartotek &kartotek);
+    void tegnOppstartsDatoer(ProsjektKartotek &kartotek);
+
+
+signals:
+    void prosjektListeAvslutter();
+    void prosjektListeStarter();
+    void visProsjekt(int prosjektId);
+
+private slots:
+    void on_radioVisAvslutt_clicked();
+    void on_radioVisBegynner_clicked();
+    void on_prosjektTable_itemDoubleClicked(QTableWidgetItem *item);
+
+private:
+    Ui::UtlopWidget *ui;
+    ProsjektKartotek fjernUgyldigeProsjekter(ProsjektKartotek kartotek);
+};
+
+#endif // UTLOPWIDGET_H

src/mainwidgets/utlopwidget.ui

@@ -1,189 +1,166 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>KundeWidget</class>
- <widget class="QWidget" name="KundeWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>543</width>
-    <height>499</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelHeadline">
-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Kundeliste</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QTableWidget" name="kundeTabell">
-     <attribute name="verticalHeaderVisible">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelValgteKunde">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Valgte kunde: </string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelValgteKundeVerdi">
-       <property name="text">
-        <string>Ingen kunde valgt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_6">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushNyKunde">
-       <property name="text">
-        <string>Ny kunde</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushRediger">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Rediger kunde</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushSlett">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Slett kunde</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushProsjekt">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Tilordne prosjekt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UtlopWidget</class>
+ <widget class="QWidget" name="UtlopWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>764</width>
+    <height>542</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelHeadline">
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Utløpsdatoer</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelSubHeadline">
+       <property name="font">
+        <font>
+         <pointsize>10</pointsize>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Viser tidsfrister i antall dager. Dobbeltklikk for å gå til prosjekt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QTableWidget" name="prosjektTable">
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="radioVisAvslutt">
+       <property name="text">
+        <string>Vis når prosjekter slutter</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="radioVisBegynner">
+       <property name="text">
+        <string>Vis når prosjekter begynner</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/src.pro

@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += core

src/uidialogs/maindialogs/innstillingdialog.cpp

@@ -1,55 +1,55 @@
-#include "innstillingdialog.h"
-#include "ui_innstillingdialog.h"
-
-InnstillingDialog::InnstillingDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::InnstillingDialog) {
-    ui->setupUi(this);
-
-    QCoreApplication::setOrganizationName("Arctic Software");
-    QCoreApplication::setOrganizationDomain("arcticsoftware.no");
-    QCoreApplication::setApplicationName("Saeterprosjekt");
-
-    QSettings settings;
-
-    if (!settings.contains("yellowcondition")) {
-        settings.setValue("yellowcondition", 50);
-    }
-
-    if (!settings.contains("redcondition")) {
-        settings.setValue("redcondition", 90);
-    }
-
-    ui->dialGul->setValue(settings.value("yellowcondition").toInt());
-    ui->dialRod->setValue(settings.value("redcondition").toInt());
-
-    ui->labelGulVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(settings.value("yellowcondition").toString()));
-    ui->labelRodVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(settings.value("redcondition").toString()));
-}
-
-InnstillingDialog::~InnstillingDialog() {
-    delete ui;
-}
-
-void InnstillingDialog::on_dialGul_sliderMoved(int position) {
-    ui->labelGulVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(QString::number(position)));
-}
-
-
-void InnstillingDialog::on_dialRod_sliderMoved(int position) {
-    ui->labelRodVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(QString::number(position)));
-}
-
-
-void InnstillingDialog::on_pushAvbryt_clicked() {
-    QDialog::close();
-}
-
-
-void InnstillingDialog::on_pushLagre_clicked() {
-    QSettings settings;
-    settings.setValue("yellowcondition", ui->dialGul->value());
-    settings.setValue("redcondition", ui->dialRod->value());
-    QDialog::close();
-}
-
+#include "innstillingdialog.h"
+#include "ui_innstillingdialog.h"
+
+InnstillingDialog::InnstillingDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::InnstillingDialog) {
+    ui->setupUi(this);
+
+    QCoreApplication::setOrganizationName("Arctic Software");
+    QCoreApplication::setOrganizationDomain("arcticsoftware.no");
+    QCoreApplication::setApplicationName("Saeterprosjekt");
+
+    QSettings settings;
+
+    if (!settings.contains("yellowcondition")) {
+        settings.setValue("yellowcondition", 50);
+    }
+
+    if (!settings.contains("redcondition")) {
+        settings.setValue("redcondition", 90);
+    }
+
+    ui->dialGul->setValue(settings.value("yellowcondition").toInt());
+    ui->dialRod->setValue(settings.value("redcondition").toInt());
+
+    ui->labelGulVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(settings.value("yellowcondition").toString()));
+    ui->labelRodVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(settings.value("redcondition").toString()));
+}
+
+InnstillingDialog::~InnstillingDialog() {
+    delete ui;
+}
+
+void InnstillingDialog::on_dialGul_sliderMoved(int position) {
+    ui->labelGulVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(QString::number(position)));
+}
+
+
+void InnstillingDialog::on_dialRod_sliderMoved(int position) {
+    ui->labelRodVerdi->setText(tr("%1% av tiden gått før kondisjon").arg(QString::number(position)));
+}
+
+
+void InnstillingDialog::on_pushAvbryt_clicked() {
+    QDialog::close();
+}
+
+
+void InnstillingDialog::on_pushLagre_clicked() {
+    QSettings settings;
+    settings.setValue("yellowcondition", ui->dialGul->value());
+    settings.setValue("redcondition", ui->dialRod->value());
+    QDialog::close();
+}
+

src/uidialogs/maindialogs/innstillingdialog.h

@@ -1,33 +1,33 @@
-#ifndef INNSTILLINGDIALOG_H
-#define INNSTILLINGDIALOG_H
-
-#include <QDialog>
-#include <QSettings>
-#include <QtDebug>
-
-namespace Ui {
-class InnstillingDialog;
-}
-
-class InnstillingDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit InnstillingDialog(QWidget *parent = nullptr);
-    ~InnstillingDialog();
-
-private slots:
-    void on_dialGul_sliderMoved(int position);
-
-    void on_dialRod_sliderMoved(int position);
-
-    void on_pushAvbryt_clicked();
-
-    void on_pushLagre_clicked();
-
-private:
-    Ui::InnstillingDialog *ui;
-};
-
-#endif // INNSTILLINGDIALOG_H
+#ifndef INNSTILLINGDIALOG_H
+#define INNSTILLINGDIALOG_H
+
+#include <QDialog>
+#include <QSettings>
+#include <QtDebug>
+
+namespace Ui {
+class InnstillingDialog;
+}
+
+class InnstillingDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit InnstillingDialog(QWidget *parent = nullptr);
+    ~InnstillingDialog();
+
+private slots:
+    void on_dialGul_sliderMoved(int position);
+
+    void on_dialRod_sliderMoved(int position);
+
+    void on_pushAvbryt_clicked();
+
+    void on_pushLagre_clicked();
+
+private:
+    Ui::InnstillingDialog *ui;
+};
+
+#endif // INNSTILLINGDIALOG_H

src/uidialogs/maindialogs/innstillingdialog.ui

@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>InnstillingDialog</class>
- <widget class="QDialog" name="InnstillingDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>446</width>
-    <height>335</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Juster innstillinger for Sæterprosjekt</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <widget class="QGroupBox" name="groupKondisjoner">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="title">
-      <string>Innstillinger for kondisjons terskler</string>
-     </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="labelKondisjonGul">
-          <property name="font">
-           <font>
-            <pointsize>8</pointsize>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Kondisjon gul:</string>
-          </property>
-          <property name="textFormat">
-           <enum>Qt::PlainText</enum>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QDial" name="dialGul">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelGulVerdi">
-          <property name="font">
-           <font>
-            <pointsize>10</pointsize>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>% igjen av varslingstid</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <widget class="QLabel" name="labelKondisjonRod">
-          <property name="font">
-           <font>
-            <pointsize>8</pointsize>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Kondisjon rød:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QDial" name="dialRod">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelRodVerdi">
-          <property name="font">
-           <font>
-            <pointsize>10</pointsize>
-            <weight>50</weight>
-            <bold>false</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>% igjen av varslingstid</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushAvbryt">
-       <property name="text">
-        <string>Avbryt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushLagre">
-       <property name="text">
-        <string>Lagre</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InnstillingDialog</class>
+ <widget class="QDialog" name="InnstillingDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>446</width>
+    <height>335</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Juster innstillinger for Sæterprosjekt</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <widget class="QGroupBox" name="groupKondisjoner">
+     <property name="font">
+      <font>
+       <pointsize>10</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="title">
+      <string>Innstillinger for kondisjons terskler</string>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="labelKondisjonGul">
+          <property name="font">
+           <font>
+            <pointsize>8</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Kondisjon gul:</string>
+          </property>
+          <property name="textFormat">
+           <enum>Qt::PlainText</enum>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QDial" name="dialGul">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelGulVerdi">
+          <property name="font">
+           <font>
+            <pointsize>10</pointsize>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>% igjen av varslingstid</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QLabel" name="labelKondisjonRod">
+          <property name="font">
+           <font>
+            <pointsize>8</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Kondisjon rød:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QDial" name="dialRod">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelRodVerdi">
+          <property name="font">
+           <font>
+            <pointsize>10</pointsize>
+            <weight>50</weight>
+            <bold>false</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>% igjen av varslingstid</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushAvbryt">
+       <property name="text">
+        <string>Avbryt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushLagre">
+       <property name="text">
+        <string>Lagre</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/uidialogs/maindialogs/maindialogs.pri

@@ -0,0 +1,24 @@
+INCLUDEPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+DEPENDPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+
+SOURCES += \
+    $$PWD/innstillingdialog.cpp \
+    $$PWD/omdialog.cpp \
+    $$PWD/varsledialog.cpp 
+
+HEADERS += \
+	$$PWD/innstillingdialog.h \
+    $$PWD/omdialog.h \
+    $$PWD/varsledialog.h 
+
+FORMS += \
+    $$PWD/innstillingdialog.ui \
+    $$PWD/omdialog.ui \
+    $$PWD/varsledialog.ui
+
+RESOURCES += \
+    $$PWD/../../../resources.qrc

src/uidialogs/maindialogs/omdialog.cpp

@@ -1,21 +1,28 @@
-#include "omdialog.h"
-#include "ui_omdialog.h"
-
-OmDialog::OmDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::OmDialog) {
-    ui->setupUi(this);
-}
-
-OmDialog::~OmDialog() {
-    delete ui;
-}
-
-void OmDialog::setVersjon(qreal versjon) {
-    ui->labelVersjon->setText(tr("Versjon %1").arg(versjon));
-}
-
-void OmDialog::on_pushOk_clicked() {
-    QDialog::close();
-}
-
+#include "omdialog.h"
+#include "ui_omdialog.h"
+
+OmDialog::OmDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::OmDialog) {
+    ui->setupUi(this);
+
+    QFile lisensFil(":/res/LICENSE");
+    if (lisensFil.open(QIODevice::ReadOnly)) {
+        QTextStream lisens(&lisensFil);
+        ui->textBrowserLisens->setText(lisens.readAll());
+    }
+    lisensFil.close();
+}
+
+OmDialog::~OmDialog() {
+    delete ui;
+}
+
+void OmDialog::setVersjon(qreal versjon) {
+    ui->labelVersjon->setText(tr("Versjon %1").arg(versjon));
+}
+
+void OmDialog::on_pushOk_clicked() {
+    QDialog::close();
+}
+

src/uidialogs/maindialogs/omdialog.h

@@ -1,27 +1,29 @@
-#ifndef OMDIALOG_H
-#define OMDIALOG_H
-
-#include <QDialog>
-
-namespace Ui {
-class OmDialog;
-}
-
-class OmDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit OmDialog(QWidget *parent = nullptr);
-    ~OmDialog();
-
-    void setVersjon(qreal versjon);
-
-private slots:
-    void on_pushOk_clicked();
-
-private:
-    Ui::OmDialog *ui;
-};
-
-#endif // OMDIALOG_H
+#ifndef OMDIALOG_H
+#define OMDIALOG_H
+
+#include <QDialog>
+#include <QFile>
+#include <QTextStream>
+
+namespace Ui {
+class OmDialog;
+}
+
+class OmDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit OmDialog(QWidget *parent = nullptr);
+    ~OmDialog();
+
+    void setVersjon(qreal versjon);
+
+private slots:
+    void on_pushOk_clicked();
+
+private:
+    Ui::OmDialog *ui;
+};
+
+#endif // OMDIALOG_H

src/uidialogs/maindialogs/omdialog.ui

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OmDialog</class>
+ <widget class="QDialog" name="OmDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>637</width>
+    <height>656</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Om dette programmet</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelLogo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>128</width>
+         <height>128</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-image: url(:/res/saeterprosjekt_128.png);
+background-repeat: no-repeat;</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="labelAppHeadline">
+         <property name="font">
+          <font>
+           <pointsize>12</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="autoFillBackground">
+          <bool>false</bool>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background-image: none !important;</string>
+         </property>
+         <property name="text">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:18pt; font-weight:600;&quot;&gt;Sæterprosjekt&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="labelVersjon">
+         <property name="font">
+          <font>
+           <pointsize>12</pointsize>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background-image: none;</string>
+         </property>
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>68</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelCopyright">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Kopirett(c) av Helge-Mikael Nordgård</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignHCenter|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelDesc">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;For å laste ned kildekoden, nye utgivelser, rapportere bugs m.m. kan du besøke &lt;a href=&quot;https://git.outlands.no/heno/Saeterprosjekt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;prosjektets hjemmeside&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Dette programmet er kopibeskyttet og lisensiert under GPLv3 (GNU General Public License versjon 3). Programmet er åpen og fri kildekode og kan modifiseres og redistribueres under visse betingelser. Ved å bruke dette programmet, aksepterer du at du har forstått og godtatt lisensbetingelsene under&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="QLabel" name="labelLisens">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Lisensbetingelser:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextBrowser" name="textBrowserLisens">
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushOk">
+       <property name="text">
+        <string>Ok</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/uidialogs/maindialogs/varsledialog.cpp

@@ -1,65 +1,65 @@
-#include "varsledialog.h"
-#include "ui_varsledialog.h"
-
-VarsleDialog::VarsleDialog(QWidget *parent, AlertConditions alertCondition) :
-    QDialog(parent),
-    ui(new Ui::VarsleDialog) {
-    ui->setupUi(this);
-
-    condition = alertCondition;
-
-    switch (condition) {
-    case AlertConditions::CONDITION_GREEN:
-        setConditionGreen();
-        break;
-    case AlertConditions::CONDITION_YELLOW:
-        setConditionYellow();
-        break;
-    case AlertConditions::CONDITION_RED:
-        setConditionRed();
-        break;
-    default:
-        break;
-    }
-}
-
-VarsleDialog::~VarsleDialog() {
-    delete ui;
-}
-
-void VarsleDialog::settProsjektNavn(QString navn) {
-    ui->labelProsjektNavnVerdi->setText(navn);
-}
-
-void VarsleDialog::settStart(quint64 epoch) {
-    QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(epoch));
-    ui->labelStartVerdi->setText(tProsjektStart.toString("dd.MM.yyyy hh:mm"));
-}
-
-void VarsleDialog::settSlutt(quint64 epoch) {
-    QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(epoch));
-    ui->labelSluttVerdi->setText(tProsjektStart.toString("dd.MM.yyyy hh:mm"));
-}
-
-void VarsleDialog::setConditionGreen() {
-    QString kText = "<html><head/><body><p>Kondisjon: <span style=\"color:#00c800;\">Grønn</span></p></body></html>";
-    ui->labelKondisjonVerdi->setTextFormat(Qt::RichText);
-    ui->labelKondisjonVerdi->setText(kText);
-}
-
-void VarsleDialog::setConditionYellow() {
-    QString kText = "<html><head/><body><p>Kondisjon: <span style=\"color:#f1f100;\">! Gul !</span></p></body></html>";
-    ui->labelKondisjonVerdi->setTextFormat(Qt::RichText);
-    ui->labelKondisjonVerdi->setText(kText);
-}
-
-void VarsleDialog::setConditionRed() {
-    QString kText = "<html><head/><body><p>Kondisjon: <span style=\"color:#da0000;\">!!! RØD !!!</span></p></body></html>";
-    ui->labelKondisjonVerdi->setTextFormat(Qt::RichText);
-    ui->labelKondisjonVerdi->setText(kText);
-}
-
-void VarsleDialog::on_pushOk_clicked() {
-    QDialog::close();
-}
-
+#include "varsledialog.h"
+#include "ui_varsledialog.h"
+
+VarsleDialog::VarsleDialog(QWidget *parent, AlertConditions alertCondition) :
+    QDialog(parent),
+    ui(new Ui::VarsleDialog) {
+    ui->setupUi(this);
+
+    condition = alertCondition;
+
+    switch (condition) {
+    case AlertConditions::CONDITION_GREEN:
+        setConditionGreen();
+        break;
+    case AlertConditions::CONDITION_YELLOW:
+        setConditionYellow();
+        break;
+    case AlertConditions::CONDITION_RED:
+        setConditionRed();
+        break;
+    default:
+        break;
+    }
+}
+
+VarsleDialog::~VarsleDialog() {
+    delete ui;
+}
+
+void VarsleDialog::settProsjektNavn(QString navn) {
+    ui->labelProsjektNavnVerdi->setText(navn);
+}
+
+void VarsleDialog::settStart(quint64 epoch) {
+    QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(epoch));
+    ui->labelStartVerdi->setText(tProsjektStart.toString("dd.MM.yyyy hh:mm"));
+}
+
+void VarsleDialog::settSlutt(quint64 epoch) {
+    QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(epoch));
+    ui->labelSluttVerdi->setText(tProsjektStart.toString("dd.MM.yyyy hh:mm"));
+}
+
+void VarsleDialog::setConditionGreen() {
+    QString kText = tr("<html><head/><body><p>%1: <span style=\"color:#00c800;\">%2</span></p></body></html>").arg(tr("Kondisjon"), tr("Grønn"));
+    ui->labelKondisjonVerdi->setTextFormat(Qt::RichText);
+    ui->labelKondisjonVerdi->setText(kText);
+}
+
+void VarsleDialog::setConditionYellow() {
+    QString kText = tr("<html><head/><body><p>%1: <span style=\"color:#f1f100;\">! %2 !</span></p></body></html>").arg(tr("Kondisjon"), tr("Gul"));
+    ui->labelKondisjonVerdi->setTextFormat(Qt::RichText);
+    ui->labelKondisjonVerdi->setText(kText);
+}
+
+void VarsleDialog::setConditionRed() {
+    QString kText = tr("<html><head/><body><p>%1: <span style=\"color:#da0000;\">!!! %2 !!!</span></p></body></html>").arg(tr("Kondisjon"), tr("RØD"));
+    ui->labelKondisjonVerdi->setTextFormat(Qt::RichText);
+    ui->labelKondisjonVerdi->setText(kText);
+}
+
+void VarsleDialog::on_pushOk_clicked() {
+    QDialog::close();
+}
+

src/uidialogs/maindialogs/varsledialog.h

@@ -1,35 +1,35 @@
-#ifndef VARSLEDIALOG_H
-#define VARSLEDIALOG_H
-
-#include <QDialog>
-#include "datatypes.h"
-
-namespace Ui {
-class VarsleDialog;
-}
-
-class VarsleDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit VarsleDialog(QWidget *parent = nullptr, AlertConditions alertCondition = AlertConditions::CONDITION_GREEN);
-    ~VarsleDialog();
-
-    void settProsjektNavn(QString navn);
-    void settStart(quint64 epoch);
-    void settSlutt(quint64 epoch);
-
-private slots:
-    void on_pushOk_clicked();
-
-private:
-    Ui::VarsleDialog *ui;
-    AlertConditions condition;
-
-    void setConditionGreen();
-    void setConditionYellow();
-    void setConditionRed();
-};
-
-#endif // VARSLEDIALOG_H
+#ifndef VARSLEDIALOG_H
+#define VARSLEDIALOG_H
+
+#include <QDialog>
+#include "datatypes.h"
+
+namespace Ui {
+class VarsleDialog;
+}
+
+class VarsleDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit VarsleDialog(QWidget *parent = nullptr, AlertConditions alertCondition = AlertConditions::CONDITION_GREEN);
+    ~VarsleDialog();
+
+    void settProsjektNavn(QString navn);
+    void settStart(quint64 epoch);
+    void settSlutt(quint64 epoch);
+
+private slots:
+    void on_pushOk_clicked();
+
+private:
+    Ui::VarsleDialog *ui;
+    AlertConditions condition;
+
+    void setConditionGreen();
+    void setConditionYellow();
+    void setConditionRed();
+};
+
+#endif // VARSLEDIALOG_H

src/uidialogs/maindialogs/varsledialog.ui

@@ -1,251 +1,251 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>VarsleDialog</class>
- <widget class="QDialog" name="VarsleDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>422</width>
-    <height>311</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Varsel om prosjekt</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelVarselHeading">
-       <property name="font">
-        <font>
-         <pointsize>16</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Varsel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelKondisjonVerdi">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kondisjon: &lt;span style=&quot; color:#00c800;&quot;&gt;Grønn&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLabel" name="labelProsjektnavn">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Prosjektnavn:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelProsjektNavnVerdi">
-       <property name="text">
-        <string>-</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <widget class="QLabel" name="labelStart">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Start:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_6">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelStartVerdi">
-       <property name="text">
-        <string>-</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QLabel" name="labelSlutt">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Slutt:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_7">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelSluttVerdi">
-       <property name="text">
-        <string>-</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QPushButton" name="pushOk">
-     <property name="text">
-      <string>Lukk varsel</string>
-     </property>
-     <property name="default">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VarsleDialog</class>
+ <widget class="QDialog" name="VarsleDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>422</width>
+    <height>311</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Varsel om prosjekt</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelVarselHeading">
+       <property name="font">
+        <font>
+         <pointsize>16</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Varsel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelKondisjonVerdi">
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+        </font>
+       </property>
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kondisjon: &lt;span style=&quot; color:#00c800;&quot;&gt;Grønn&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="labelProsjektnavn">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Prosjektnavn:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelProsjektNavnVerdi">
+       <property name="text">
+        <string>-</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QLabel" name="labelStart">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Start:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_6">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelStartVerdi">
+       <property name="text">
+        <string>-</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QLabel" name="labelSlutt">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Slutt:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_7">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelSluttVerdi">
+       <property name="text">
+        <string>-</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QPushButton" name="pushOk">
+     <property name="text">
+      <string>Lukk varsel</string>
+     </property>
+     <property name="default">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/uidialogs/widgetdialogs/kunde/kundedialoger.pri

@@ -0,0 +1,24 @@
+INCLUDEPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+DEPENDPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+
+SOURCES += \
+       $$PWD/nykundedialog.cpp \
+	   $$PWD/redigerkundedialog.cpp \
+	   $$PWD/velgkundeprosjektdialog.cpp
+
+HEADERS += \
+	$$PWD/nykundedialog.h \
+	$$PWD/redigerkundedialog.h \
+	$$PWD/velgkundeprosjektdialog.h
+
+FORMS += \
+    $$PWD/nykundedialog.ui \
+	$$PWD/redigerkundedialog.ui \
+	$$PWD/velgkundeprosjektdialog.ui
+
+RESOURCES += \
+    $$PWD/../../../../resources.qrc

src/uidialogs/widgetdialogs/kunde/nykundedialog.cpp

@@ -1,67 +1,74 @@
-#include "nykundedialog.h"
-#include "ui_nykundedialog.h"
-
-NyKundeDialog::NyKundeDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::NyKundeDialog) {
-    ui->setupUi(this);
-
-    ui->lineTlf->setValidator(new QIntValidator(10000000, 99999999, this));
-    ui->linePostnr->setValidator(new QIntValidator(1000, 9999, this));
-    ui->labelFeilMelding->setText("");
-}
-
-NyKundeDialog::~NyKundeDialog() {
-    delete ui;
-}
-
-void NyKundeDialog::startTopp() {
-    ui->lineFornavn->setFocus();
-}
-
-void NyKundeDialog::nyKundeId(quint64 id) {
-    ui->lineKundenummer->setText(QString::number(id));
-}
-
-void NyKundeDialog::fokuserElement(UIElementer element) {
-    switch (element) {
-    case UIElementer::FORNAVN:
-        ui->lineFornavn->selectAll();
-        ui->lineFornavn->setFocus();
-        break;
-    case UIElementer::ETTERNAVN:
-        ui->lineEtternavn->selectAll();
-        ui->lineEtternavn->setFocus();
-        break;
-    case UIElementer::FIRMANAVN:
-        ui->lineFirmanavn->selectAll();
-        ui->lineFirmanavn->setFocus();
-        break;
-    }
-}
-
-void NyKundeDialog::settFeilMelding(QString feilMelding) {
-    ui->labelFeilMelding->setText(tr("<span style=\"font-weight:600; color:#ff0000;\">Feil: </span><span style=\"font-weight:600;\"/><span style=\"color:#000000;\">%1</span>").arg(feilMelding));
-}
-
-void NyKundeDialog::on_pushAvbryt_clicked() {
-    QDialog::close();
-}
-
-
-void NyKundeDialog::on_pushButton_clicked() {
-    KundeFil nyKunde;
-    nyKunde.insert("fornavn", ui->lineFornavn->text());
-    nyKunde.insert("etternavn", ui->lineEtternavn->text());
-    nyKunde.insert("firmanavn", ui->lineFirmanavn->text());
-    nyKunde.insert("adresse", ui->lineGate->text());
-    nyKunde.insert("postnr", ui->linePostnr->text().toInt());
-    nyKunde.insert("sted", ui->lineSted->text());
-    nyKunde.insert("epost", ui->lineEpost->text());
-    nyKunde.insert("tlf", ui->lineTlf->text().toInt());
-    nyKunde.insert("id", ui->lineKundenummer->text().toInt());
-    nyKunde.insert("active", true);
-
-    emit leggTilKunde(nyKunde);
-}
-
+#include "nykundedialog.h"
+#include "ui_nykundedialog.h"
+
+NyKundeDialog::NyKundeDialog(QWidget *parent, PostNummerTabell *postNrTabell) :
+    QDialog(parent),
+    ui(new Ui::NyKundeDialog) {
+    ui->setupUi(this);
+
+    ui->lineTlf->setValidator(new QIntValidator(10000000, 99999999, this));
+    ui->linePostnr->setValidator(new QIntValidator(1000, 9999, this));
+    ui->labelFeilMelding->setText("");
+
+    postNummere = postNrTabell;
+}
+
+NyKundeDialog::~NyKundeDialog() {
+    delete ui;
+}
+
+void NyKundeDialog::startTopp() {
+    ui->lineFornavn->setFocus();
+}
+
+void NyKundeDialog::nyKundeId(quint64 id) {
+    ui->lineKundenummer->setText(QString::number(id));
+}
+
+void NyKundeDialog::fokuserElement(UIElementer element) {
+    switch (element) {
+    case UIElementer::FORNAVN:
+        ui->lineFornavn->selectAll();
+        ui->lineFornavn->setFocus();
+        break;
+    case UIElementer::ETTERNAVN:
+        ui->lineEtternavn->selectAll();
+        ui->lineEtternavn->setFocus();
+        break;
+    case UIElementer::FIRMANAVN:
+        ui->lineFirmanavn->selectAll();
+        ui->lineFirmanavn->setFocus();
+        break;
+    }
+}
+
+void NyKundeDialog::settFeilMelding(QString feilMelding) {
+    ui->labelFeilMelding->setText(tr("<span style=\"font-weight:600; color:#ff0000;\">%1: </span><span style=\"font-weight:600;\"/><span style=\"color:#000000;\">%2</span>").arg(tr("Feil:"),feilMelding));
+}
+
+void NyKundeDialog::on_pushAvbryt_clicked() {
+    QDialog::close();
+}
+
+void NyKundeDialog::on_pushButton_clicked() {
+    KundeFil nyKunde;
+    nyKunde.insert("fornavn", ui->lineFornavn->text());
+    nyKunde.insert("etternavn", ui->lineEtternavn->text());
+    nyKunde.insert("firmanavn", ui->lineFirmanavn->text());
+    nyKunde.insert("adresse", ui->lineGate->text());
+    nyKunde.insert("postnr", ui->linePostnr->text().toInt());
+    nyKunde.insert("sted", ui->lineSted->text());
+    nyKunde.insert("epost", ui->lineEpost->text());
+    nyKunde.insert("tlf", ui->lineTlf->text().toInt());
+    nyKunde.insert("id", ui->lineKundenummer->text().toInt());
+    nyKunde.insert("active", true);
+    nyKunde.insert("created_at", DataHandler::datoStempel());
+    nyKunde.insert("updated_at", DataHandler::datoStempel());
+
+    emit leggTilKunde(nyKunde);
+}
+
+void NyKundeDialog::on_linePostnr_editingFinished() {
+    ui->lineSted->setText(postNummere->value(ui->linePostnr->text().toInt()));
+}
+

src/uidialogs/widgetdialogs/kunde/nykundedialog.h

@@ -1,37 +1,40 @@
-#ifndef NYKUNDEDIALOG_H
-#define NYKUNDEDIALOG_H
-
-#include <QDialog>
-#include <QIntValidator>
-#include "datatypes.h"
-
-namespace Ui {
-class NyKundeDialog;
-}
-
-class NyKundeDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NyKundeDialog(QWidget *parent = nullptr);
-    ~NyKundeDialog();
-
-    void startTopp();
-    void nyKundeId(quint64 id);
-
-    void fokuserElement(UIElementer element);
-    void settFeilMelding(QString feilMelding);
-
-signals:
-    void leggTilKunde(KundeFil kunde);
-
-private slots:
-    void on_pushAvbryt_clicked();
-    void on_pushButton_clicked();
-
-private:
-    Ui::NyKundeDialog *ui;
-};
-
-#endif // NYKUNDEDIALOG_H
+#ifndef NYKUNDEDIALOG_H
+#define NYKUNDEDIALOG_H
+
+#include <QDialog>
+#include <QIntValidator>
+#include "datahandler.h"
+#include "datatypes.h"
+
+namespace Ui {
+class NyKundeDialog;
+}
+
+class NyKundeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit NyKundeDialog(QWidget *parent = nullptr, PostNummerTabell *postNrTabell = nullptr);
+    ~NyKundeDialog();
+
+    void startTopp();
+    void nyKundeId(quint64 id);
+
+    void fokuserElement(UIElementer element);
+    void settFeilMelding(QString feilMelding);
+
+signals:
+    void leggTilKunde(KundeFil kunde);
+
+private slots:
+    void on_pushAvbryt_clicked();
+    void on_pushButton_clicked();
+    void on_linePostnr_editingFinished();
+
+private:
+    Ui::NyKundeDialog *ui;
+    PostNummerTabell *postNummere;
+};
+
+#endif // NYKUNDEDIALOG_H

src/uidialogs/widgetdialogs/kunde/nykundedialog.ui

@@ -1,259 +1,259 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NyKundeDialog</class>
- <widget class="QDialog" name="NyKundeDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>474</width>
-    <height>358</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Opprett ny kunde</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="labelFornavn">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Fornavn:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineFornavn"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="labelEtternavn">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Etternavn:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="lineEtternavn"/>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="labelFirmanavn">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Firmanavn:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="lineFirmanavn"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QFormLayout" name="formLayout_2">
-       <item row="0" column="0">
-        <widget class="QLabel" name="labelGateadresse">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Gateadresse:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineGate"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="labelPostnr">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Postnr:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="linePostnr"/>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="labelSted">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Sted:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="lineSted"/>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="labelTlf">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Telefon:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="lineTlf"/>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="labelEpost">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Epost:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QLineEdit" name="lineEpost"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QLabel" name="labelID">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Kundenummer:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="lineKundenummer">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelFeilMelding">
-       <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;Feil: &lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;/&gt;&lt;span style=&quot; color:#000000;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::RichText</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pushAvbryt">
-         <property name="text">
-          <string>Avbryt</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pushButton">
-         <property name="text">
-          <string>Lagre</string>
-         </property>
-         <property name="default">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NyKundeDialog</class>
+ <widget class="QDialog" name="NyKundeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>474</width>
+    <height>358</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Opprett ny kunde</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="labelFornavn">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Fornavn:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="lineFornavn"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="labelEtternavn">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Etternavn:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="lineEtternavn"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelFirmanavn">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Firmanavn:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="lineFirmanavn"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="labelGateadresse">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Gateadresse:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="lineGate"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="labelPostnr">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Postnr:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="linePostnr"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelSted">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Sted:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="lineSted"/>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelTlf">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Telefon:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="lineTlf"/>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="labelEpost">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Epost:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="lineEpost"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="labelID">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Kundenummer:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineKundenummer">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelFeilMelding">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;Feil: &lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;/&gt;&lt;span style=&quot; color:#000000;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushAvbryt">
+         <property name="text">
+          <string>Avbryt</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton">
+         <property name="text">
+          <string>Lagre</string>
+         </property>
+         <property name="default">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/uidialogs/widgetdialogs/kunde/redigerkundedialog.cpp

@@ -1,73 +1,81 @@
-#include "redigerkundedialog.h"
-#include "ui_redigerkundedialog.h"
-
-RedigerKundeDialog::RedigerKundeDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::RedigerKundeDialog) {
-    ui->setupUi(this);
-
-    ui->labelFeilMelding->setText("");
-}
-
-RedigerKundeDialog::~RedigerKundeDialog() {
-    delete ui;
-}
-
-void RedigerKundeDialog::settInnGamleVerdier(KundeFil gjeldendeKundeFil) {
-    ui->lineKundenummer->setText(gjeldendeKundeFil.value("id").toString());
-
-    ui->lineFornavn->setText(gjeldendeKundeFil.value("fornavn").toString());
-    ui->lineEtternavn->setText(gjeldendeKundeFil.value("etternavn").toString());
-    ui->lineFirmanavn->setText(gjeldendeKundeFil.value("firmanavn").toString());
-    ui->lineGate->setText(gjeldendeKundeFil.value("adresse").toString());
-    ui->linePostnr->setText(gjeldendeKundeFil.value("postnr").toString());
-    ui->lineSted->setText(gjeldendeKundeFil.value("sted").toString());
-    ui->lineEpost->setText(gjeldendeKundeFil.value("epost").toString());
-    ui->lineTlf->setText(gjeldendeKundeFil.value("tlf").toString());
-
-    ui->lineFornavn->selectAll();
-    ui->lineFornavn->setFocus();
-}
-
-void RedigerKundeDialog::fokuserElement(UIElementer element) {
-    switch (element) {
-    case UIElementer::FORNAVN:
-        ui->lineFornavn->selectAll();
-        ui->lineFornavn->setFocus();
-        break;
-    case UIElementer::ETTERNAVN:
-        ui->lineEtternavn->selectAll();
-        ui->lineEtternavn->setFocus();
-        break;
-    case UIElementer::FIRMANAVN:
-        ui->lineFirmanavn->selectAll();
-        ui->lineFirmanavn->setFocus();
-        break;
-    }
-}
-
-void RedigerKundeDialog::settFeilMelding(QString feilMelding) {
-    ui->labelFeilMelding->setText(tr("<span style=\"font-weight:600; color:#ff0000;\">Feil: </span><span style=\"font-weight:600;\"/><span style=\"color:#000000;\">%1</span>").arg(feilMelding));
-}
-
-void RedigerKundeDialog::on_pushAvbryt_clicked() {
-    QDialog::close();
-}
-
-
-void RedigerKundeDialog::on_pushButton_clicked() {
-    KundeFil oppdatertFil;
-    oppdatertFil.insert("id", ui->lineKundenummer->text().toInt());
-    oppdatertFil.insert("fornavn", ui->lineFornavn->text());
-    oppdatertFil.insert("etternavn", ui->lineEtternavn->text());
-    oppdatertFil.insert("firmanavn", ui->lineFirmanavn->text());
-    oppdatertFil.insert("adresse", ui->lineGate->text());
-    oppdatertFil.insert("postnr", ui->linePostnr->text().toInt());
-    oppdatertFil.insert("sted", ui->lineSted->text());
-    oppdatertFil.insert("epost", ui->lineEpost->text());
-    oppdatertFil.insert("tlf", ui->lineTlf->text().toInt());
-    oppdatertFil.insert("active", true);
-
-    emit oppdaterKundeFil(oppdatertFil);
-}
-
+#include "redigerkundedialog.h"
+#include "ui_redigerkundedialog.h"
+
+RedigerKundeDialog::RedigerKundeDialog(QWidget *parent, PostNummerTabell *postNrTabell) :
+    QDialog(parent),
+    ui(new Ui::RedigerKundeDialog) {
+    ui->setupUi(this);
+
+    ui->labelFeilMelding->setText("");
+
+    postNummere = postNrTabell;
+}
+
+RedigerKundeDialog::~RedigerKundeDialog() {
+    delete ui;
+}
+
+void RedigerKundeDialog::settInnGamleVerdier(KundeFil gjeldendeKundeFil) {
+    ui->lineKundenummer->setText(gjeldendeKundeFil.value("id").toString());
+
+    ui->lineFornavn->setText(gjeldendeKundeFil.value("fornavn").toString());
+    ui->lineEtternavn->setText(gjeldendeKundeFil.value("etternavn").toString());
+    ui->lineFirmanavn->setText(gjeldendeKundeFil.value("firmanavn").toString());
+    ui->lineGate->setText(gjeldendeKundeFil.value("adresse").toString());
+    ui->linePostnr->setText(gjeldendeKundeFil.value("postnr").toString());
+    ui->lineSted->setText(gjeldendeKundeFil.value("sted").toString());
+    ui->lineEpost->setText(gjeldendeKundeFil.value("epost").toString());
+    ui->lineTlf->setText(gjeldendeKundeFil.value("tlf").toString());
+
+    ui->lineFornavn->selectAll();
+    ui->lineFornavn->setFocus();
+}
+
+void RedigerKundeDialog::fokuserElement(UIElementer element) {
+    switch (element) {
+    case UIElementer::FORNAVN:
+        ui->lineFornavn->selectAll();
+        ui->lineFornavn->setFocus();
+        break;
+    case UIElementer::ETTERNAVN:
+        ui->lineEtternavn->selectAll();
+        ui->lineEtternavn->setFocus();
+        break;
+    case UIElementer::FIRMANAVN:
+        ui->lineFirmanavn->selectAll();
+        ui->lineFirmanavn->setFocus();
+        break;
+    }
+}
+
+void RedigerKundeDialog::settFeilMelding(QString feilMelding) {
+    ui->labelFeilMelding->setText(tr("<span style=\"font-weight:600; color:#ff0000;\">%1: </span><span style=\"font-weight:600;\"/><span style=\"color:#000000;\">%2</span>").arg(tr("Feil:"),feilMelding));
+}
+
+void RedigerKundeDialog::on_pushAvbryt_clicked() {
+    QDialog::close();
+}
+
+
+void RedigerKundeDialog::on_pushButton_clicked() {
+    KundeFil oppdatertFil;
+    oppdatertFil.insert("id", ui->lineKundenummer->text().toInt());
+    oppdatertFil.insert("fornavn", ui->lineFornavn->text());
+    oppdatertFil.insert("etternavn", ui->lineEtternavn->text());
+    oppdatertFil.insert("firmanavn", ui->lineFirmanavn->text());
+    oppdatertFil.insert("adresse", ui->lineGate->text());
+    oppdatertFil.insert("postnr", ui->linePostnr->text().toInt());
+    oppdatertFil.insert("sted", ui->lineSted->text());
+    oppdatertFil.insert("epost", ui->lineEpost->text());
+    oppdatertFil.insert("tlf", ui->lineTlf->text().toInt());
+    oppdatertFil.insert("active", true);
+    oppdatertFil.insert("updated_at", DataHandler::datoStempel());
+
+    emit oppdaterKundeFil(oppdatertFil);
+}
+
+
+void RedigerKundeDialog::on_linePostnr_editingFinished() {
+    ui->lineSted->setText(postNummere->value(ui->linePostnr->text().toInt()));
+}
+

src/uidialogs/widgetdialogs/kunde/redigerkundedialog.h

@@ -1,34 +1,38 @@
-#ifndef REDIGERKUNDEDIALOG_H
-#define REDIGERKUNDEDIALOG_H
-
-#include <QDialog>
-#include "datatypes.h"
-
-namespace Ui {
-class RedigerKundeDialog;
-}
-
-class RedigerKundeDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit RedigerKundeDialog(QWidget *parent = nullptr);
-    ~RedigerKundeDialog();
-
-    void settInnGamleVerdier(KundeFil gjeldendeKundeFil);
-    void fokuserElement(UIElementer element);
-    void settFeilMelding(QString feilMelding);
-
-signals:
-    void oppdaterKundeFil(KundeFil redigertKundeFil);
-
-private slots:
-    void on_pushAvbryt_clicked();
-    void on_pushButton_clicked();
-
-private:
-    Ui::RedigerKundeDialog *ui;
-};
-
-#endif // REDIGERKUNDEDIALOG_H
+#ifndef REDIGERKUNDEDIALOG_H
+#define REDIGERKUNDEDIALOG_H
+
+#include <QDialog>
+#include "datahandler.h"
+#include "datatypes.h"
+
+namespace Ui {
+class RedigerKundeDialog;
+}
+
+class RedigerKundeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit RedigerKundeDialog(QWidget *parent = nullptr, PostNummerTabell *postNrTabell = nullptr);
+    ~RedigerKundeDialog();
+
+    void settInnGamleVerdier(KundeFil gjeldendeKundeFil);
+    void fokuserElement(UIElementer element);
+    void settFeilMelding(QString feilMelding);
+
+signals:
+    void oppdaterKundeFil(KundeFil redigertKundeFil);
+
+private slots:
+    void on_pushAvbryt_clicked();
+    void on_pushButton_clicked();
+
+    void on_linePostnr_editingFinished();
+
+private:
+    Ui::RedigerKundeDialog *ui;
+    PostNummerTabell *postNummere;
+};
+
+#endif // REDIGERKUNDEDIALOG_H

src/uidialogs/widgetdialogs/kunde/redigerkundedialog.ui

@@ -1,256 +1,256 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RedigerKundeDialog</class>
- <widget class="QDialog" name="RedigerKundeDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>359</width>
-    <height>365</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Rediger Kunde</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="0">
-        <widget class="QLabel" name="labelFornavn">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Fornavn:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineFornavn"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="labelEtternavn">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Etternavn:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="lineEtternavn"/>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="labelFirmanavn">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Firmanavn:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="lineFirmanavn"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QFormLayout" name="formLayout_2">
-       <item row="0" column="0">
-        <widget class="QLabel" name="labelGateadresse">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Gateadresse:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="lineGate"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="labelPostnr">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Postnr:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="linePostnr"/>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="labelSted">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Sted:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="lineSted"/>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="labelTlf">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Telefon:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="lineTlf"/>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="labelEpost">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Epost:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <widget class="QLineEdit" name="lineEpost"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="line_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QLabel" name="labelID">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Kundenummer:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="lineKundenummer">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelFeilMelding">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pushAvbryt">
-         <property name="text">
-          <string>Avbryt</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="pushButton">
-         <property name="text">
-          <string>Lagre</string>
-         </property>
-         <property name="default">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RedigerKundeDialog</class>
+ <widget class="QDialog" name="RedigerKundeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>359</width>
+    <height>365</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Rediger Kunde</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="labelFornavn">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Fornavn:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="lineFornavn"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="labelEtternavn">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Etternavn:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="lineEtternavn"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelFirmanavn">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Firmanavn:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="lineFirmanavn"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="labelGateadresse">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Gateadresse:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="lineGate"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="labelPostnr">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Postnr:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="linePostnr"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelSted">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Sted:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="lineSted"/>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="labelTlf">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Telefon:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="lineTlf"/>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="labelEpost">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Epost:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="lineEpost"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="Line" name="line_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLabel" name="labelID">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Kundenummer:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineKundenummer">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="labelFeilMelding">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushAvbryt">
+         <property name="text">
+          <string>Avbryt</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton">
+         <property name="text">
+          <string>Lagre</string>
+         </property>
+         <property name="default">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/uidialogs/widgetdialogs/kunde/velgkundeprosjektdialog.cpp

@@ -1,47 +1,47 @@
-#include "velgkundeprosjektdialog.h"
-#include "ui_velgkundeprosjektdialog.h"
-
-VelgKundeProsjektDialog::VelgKundeProsjektDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::VelgKundeProsjektDialog) {
-    ui->setupUi(this);
-}
-
-VelgKundeProsjektDialog::~VelgKundeProsjektDialog() {
-    delete ui;
-}
-
-void VelgKundeProsjektDialog::settKundeID(int id) {
-    kundeID = id;
-}
-
-int VelgKundeProsjektDialog::hentKundeID() {
-    return kundeID;
-}
-
-void VelgKundeProsjektDialog::hentProsjekter(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger) {
-    for (int i = 0; i < kartotek.size(); ++i) {
-        QList<int> prosjektMedlemmer = bindinger.value(kartotek.at(i).value("ordrenummer").toInt());
-        if (!prosjektMedlemmer.contains(kundeID)) {
-            QListWidgetItem *prosjekt = new QListWidgetItem(kartotek.at(i).value("prosjektnavn").toString());
-            prosjekt->setData(Qt::UserRole, kartotek.at(i).value("ordrenummer").toInt());
-            ui->prosjektListe->addItem(prosjekt);
-        }
-    }
-}
-
-void VelgKundeProsjektDialog::on_pushAvbryt_clicked() {
-    QDialog::close();
-}
-
-
-void VelgKundeProsjektDialog::on_prosjektListe_itemClicked(QListWidgetItem *item) {
-    ui->pushVelg->setEnabled(true);
-    prosjektID = item->data(Qt::UserRole).toInt();
-}
-
-
-void VelgKundeProsjektDialog::on_pushVelg_clicked() {
-    emit opprettBinding(kundeID, prosjektID);
-}
-
+#include "velgkundeprosjektdialog.h"
+#include "ui_velgkundeprosjektdialog.h"
+
+VelgKundeProsjektDialog::VelgKundeProsjektDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::VelgKundeProsjektDialog) {
+    ui->setupUi(this);
+}
+
+VelgKundeProsjektDialog::~VelgKundeProsjektDialog() {
+    delete ui;
+}
+
+void VelgKundeProsjektDialog::settKundeID(int id) {
+    kundeID = id;
+}
+
+int VelgKundeProsjektDialog::hentKundeID() {
+    return kundeID;
+}
+
+void VelgKundeProsjektDialog::hentProsjekter(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger) {
+    for (int i = 0; i < kartotek.size(); ++i) {
+        QList<int> prosjektMedlemmer = bindinger.value(kartotek.at(i).value("ordrenummer").toInt());
+        if (!prosjektMedlemmer.contains(kundeID)) {
+            QListWidgetItem *prosjekt = new QListWidgetItem(kartotek.at(i).value("prosjektnavn").toString());
+            prosjekt->setData(Qt::UserRole, kartotek.at(i).value("ordrenummer").toInt());
+            ui->prosjektListe->addItem(prosjekt);
+        }
+    }
+}
+
+void VelgKundeProsjektDialog::on_pushAvbryt_clicked() {
+    QDialog::close();
+}
+
+
+void VelgKundeProsjektDialog::on_prosjektListe_itemClicked(QListWidgetItem *item) {
+    ui->pushVelg->setEnabled(true);
+    prosjektID = item->data(Qt::UserRole).toInt();
+}
+
+
+void VelgKundeProsjektDialog::on_pushVelg_clicked() {
+    emit opprettBinding(kundeID, prosjektID);
+}
+

src/uidialogs/widgetdialogs/kunde/velgkundeprosjektdialog.h

@@ -1,39 +1,39 @@
-#ifndef VELGKUNDEPROSJEKTDIALOG_H
-#define VELGKUNDEPROSJEKTDIALOG_H
-
-#include <QDialog>
-#include <QListWidgetItem>
-#include "datatypes.h"
-
-namespace Ui {
-class VelgKundeProsjektDialog;
-}
-
-class VelgKundeProsjektDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit VelgKundeProsjektDialog(QWidget *parent = nullptr);
-    ~VelgKundeProsjektDialog();
-
-    void settKundeID(int id);
-    int hentKundeID();
-
-    void hentProsjekter(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger);
-
-signals:
-    void opprettBinding(int kunde, int prosjekt);
-
-private slots:
-    void on_pushAvbryt_clicked();
-    void on_prosjektListe_itemClicked(QListWidgetItem *item);
-
-    void on_pushVelg_clicked();
-
-private:
-    Ui::VelgKundeProsjektDialog *ui;
-    int kundeID, prosjektID;
-};
-
-#endif // VELGKUNDEPROSJEKTDIALOG_H
+#ifndef VELGKUNDEPROSJEKTDIALOG_H
+#define VELGKUNDEPROSJEKTDIALOG_H
+
+#include <QDialog>
+#include <QListWidgetItem>
+#include "datatypes.h"
+
+namespace Ui {
+class VelgKundeProsjektDialog;
+}
+
+class VelgKundeProsjektDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit VelgKundeProsjektDialog(QWidget *parent = nullptr);
+    ~VelgKundeProsjektDialog();
+
+    void settKundeID(int id);
+    int hentKundeID();
+
+    void hentProsjekter(ProsjektKartotek &kartotek, ProsjektBindinger &bindinger);
+
+signals:
+    void opprettBinding(int kunde, int prosjekt);
+
+private slots:
+    void on_pushAvbryt_clicked();
+    void on_prosjektListe_itemClicked(QListWidgetItem *item);
+
+    void on_pushVelg_clicked();
+
+private:
+    Ui::VelgKundeProsjektDialog *ui;
+    int kundeID, prosjektID;
+};
+
+#endif // VELGKUNDEPROSJEKTDIALOG_H

src/uidialogs/widgetdialogs/kunde/velgkundeprosjektdialog.ui

@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>VelgKundeProsjektDialog</class>
- <widget class="QDialog" name="VelgKundeProsjektDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Velg et prosjekt for kunden</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QListWidget" name="prosjektListe"/>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushAvbryt">
-       <property name="text">
-        <string>Avbryt</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushVelg">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Velg prosjekt</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VelgKundeProsjektDialog</class>
+ <widget class="QDialog" name="VelgKundeProsjektDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Velg et prosjekt for kunden</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QListWidget" name="prosjektListe"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushAvbryt">
+       <property name="text">
+        <string>Avbryt</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushVelg">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Velg prosjekt</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/uidialogs/widgetdialogs/prosjekt/nyttprosjektdialog.cpp

@@ -1,91 +1,93 @@
-#include "nyttprosjektdialog.h"
-#include "ui_nyttprosjektdialog.h"
-
-NyttProsjektDialog::NyttProsjektDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::NyttProsjektDialog) {
-    ui->setupUi(this);
-
-    QDateTime iDag = QDateTime::currentDateTime();
-    QDate dagensDato = iDag.date();
-
-    ui->dateStart->setMinimumDate(dagensDato);
-    ui->dateSlutt->setMinimumDate(dagensDato);
-}
-
-NyttProsjektDialog::~NyttProsjektDialog() {
-    delete ui;
-}
-
-void NyttProsjektDialog::opprettOrdreNr(int ordreNr) {
-    ui->lineOrdrenummer->setText(QString::number(ordreNr));
-}
-
-void NyttProsjektDialog::fokusStart() {
-    ui->lineProsjektNavn->setFocus();
-}
-
-void NyttProsjektDialog::on_pushAvbryt_clicked() {
-    QDialog::close();
-}
-
-
-void NyttProsjektDialog::on_pushLagre_clicked() {
-    ProsjektFil nyttProsjekt;
-
-    nyttProsjekt.insert("prosjektnavn", ui->lineProsjektNavn->text());
-    nyttProsjekt.insert("ordrenummer", ui->lineOrdrenummer->text().toInt());
-    nyttProsjekt.insert("prosjektbeskrivelse", ui->textEditProsjektBeskrivelse->toHtml());
-    nyttProsjekt.insert("varslestart", ui->checkVarsleStart->isChecked());
-    nyttProsjekt.insert("varsleslutt", ui->checkVarsleSlutt->isChecked());
-
-    QDateTime prosjektStartDato = ui->dateStart->dateTime();
-    quint64 mSekStart = prosjektStartDato.toMSecsSinceEpoch() + ui->timeStart->time().msecsSinceStartOfDay();
-
-    QDateTime prosjektSluttDato = ui->dateSlutt->dateTime();
-    quint64 mSekSlutt = prosjektSluttDato.toMSecsSinceEpoch() + ui->timeSlutt->time().msecsSinceStartOfDay();
-
-    nyttProsjekt.insert("prosjektstart", mSekStart);
-    nyttProsjekt.insert("prosjektslutt", mSekSlutt);
-
-    int dognVarselStart = ui->spinBoxAntallDognVarslingStart->value();
-    int timerVarselStart = ui->spinBoxTimerForStart->value();
-    quint64 epochVarselDognStart = dognVarselStart * 24 * 60 * 60 * 1000;
-    quint64 epochVarselTimerStart = timerVarselStart * 60 * 60 * 1000;
-    quint64 epochVarselStart = epochVarselDognStart + epochVarselTimerStart;
-
-    int dognVarselSlutt = ui->spinBoxAntallDognVarslingSlutt->value();
-    int timerVarselSlutt = ui->spinBoxTimerForSlutt->value();
-    quint64 epochVarselDognSlutt = dognVarselSlutt * 24 * 60 * 60 * 1000;
-    quint64 epochVarselTimerSlutt = timerVarselSlutt * 60 * 60 * 1000;
-    quint64 epochVarselSlutt = epochVarselDognSlutt + epochVarselTimerSlutt;
-
-    nyttProsjekt.insert("varselstart", epochVarselStart);
-    nyttProsjekt.insert("varselslutt", epochVarselSlutt);
-    nyttProsjekt.insert("dognvarselstart", ui->spinBoxAntallDognVarslingStart->value());
-    nyttProsjekt.insert("dognvarselslutt", ui->spinBoxAntallDognVarslingSlutt->value());
-    nyttProsjekt.insert("timervarselstart", ui->spinBoxTimerForStart->value());
-    nyttProsjekt.insert("timercarselslutt", ui->spinBoxTimerForSlutt->value());
-
-    nyttProsjekt.insert("active", true);
-    nyttProsjekt.insert("ferdig", false);
-
-    emit leggTilProsjekt(nyttProsjekt);
-}
-
-
-void NyttProsjektDialog::on_checkVarsleStart_clicked() {
-    endreVarselStatus();
-}
-
-
-void NyttProsjektDialog::on_checkVarsleSlutt_clicked() {
-    endreVarselStatus();
-}
-
-void NyttProsjektDialog::endreVarselStatus() {
-    ui->spinBoxAntallDognVarslingSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
-    ui->spinBoxTimerForSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
-    ui->spinBoxAntallDognVarslingStart->setEnabled(ui->checkVarsleStart->isChecked());
-    ui->spinBoxTimerForStart->setEnabled(ui->checkVarsleStart->isChecked());
-}
+#include "nyttprosjektdialog.h"
+#include "ui_nyttprosjektdialog.h"
+
+NyttProsjektDialog::NyttProsjektDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::NyttProsjektDialog) {
+    ui->setupUi(this);
+
+    QDateTime iDag = QDateTime::currentDateTime();
+    QDate dagensDato = iDag.date();
+
+    ui->dateStart->setMinimumDate(dagensDato);
+    ui->dateSlutt->setMinimumDate(dagensDato);
+}
+
+NyttProsjektDialog::~NyttProsjektDialog() {
+    delete ui;
+}
+
+void NyttProsjektDialog::opprettOrdreNr(int ordreNr) {
+    ui->lineOrdrenummer->setText(QString::number(ordreNr));
+}
+
+void NyttProsjektDialog::fokusStart() {
+    ui->lineProsjektNavn->setFocus();
+}
+
+void NyttProsjektDialog::on_pushAvbryt_clicked() {
+    QDialog::close();
+}
+
+
+void NyttProsjektDialog::on_pushLagre_clicked() {
+    ProsjektFil nyttProsjekt;
+
+    nyttProsjekt.insert("prosjektnavn", ui->lineProsjektNavn->text());
+    nyttProsjekt.insert("ordrenummer", ui->lineOrdrenummer->text().toInt());
+    nyttProsjekt.insert("prosjektbeskrivelse", ui->textEditProsjektBeskrivelse->toHtml());
+    nyttProsjekt.insert("varslestart", ui->checkVarsleStart->isChecked());
+    nyttProsjekt.insert("varsleslutt", ui->checkVarsleSlutt->isChecked());
+
+    QDateTime prosjektStartDato = ui->dateStart->dateTime();
+    quint64 mSekStart = prosjektStartDato.toMSecsSinceEpoch() + ui->timeStart->time().msecsSinceStartOfDay();
+
+    QDateTime prosjektSluttDato = ui->dateSlutt->dateTime();
+    quint64 mSekSlutt = prosjektSluttDato.toMSecsSinceEpoch() + ui->timeSlutt->time().msecsSinceStartOfDay();
+
+    nyttProsjekt.insert("prosjektstart", mSekStart);
+    nyttProsjekt.insert("prosjektslutt", mSekSlutt);
+
+    int dognVarselStart = ui->spinBoxAntallDognVarslingStart->value();
+    int timerVarselStart = ui->spinBoxTimerForStart->value();
+    quint64 epochVarselDognStart = dognVarselStart * 24 * 60 * 60 * 1000;
+    quint64 epochVarselTimerStart = timerVarselStart * 60 * 60 * 1000;
+    quint64 epochVarselStart = epochVarselDognStart + epochVarselTimerStart;
+
+    int dognVarselSlutt = ui->spinBoxAntallDognVarslingSlutt->value();
+    int timerVarselSlutt = ui->spinBoxTimerForSlutt->value();
+    quint64 epochVarselDognSlutt = dognVarselSlutt * 24 * 60 * 60 * 1000;
+    quint64 epochVarselTimerSlutt = timerVarselSlutt * 60 * 60 * 1000;
+    quint64 epochVarselSlutt = epochVarselDognSlutt + epochVarselTimerSlutt;
+
+    nyttProsjekt.insert("varselstart", epochVarselStart);
+    nyttProsjekt.insert("varselslutt", epochVarselSlutt);
+    nyttProsjekt.insert("dognvarselstart", ui->spinBoxAntallDognVarslingStart->value());
+    nyttProsjekt.insert("dognvarselslutt", ui->spinBoxAntallDognVarslingSlutt->value());
+    nyttProsjekt.insert("timervarselstart", ui->spinBoxTimerForStart->value());
+    nyttProsjekt.insert("timercarselslutt", ui->spinBoxTimerForSlutt->value());
+
+    nyttProsjekt.insert("active", true);
+    nyttProsjekt.insert("ferdig", false);
+    nyttProsjekt.insert("created_at", DataHandler::datoStempel());
+    nyttProsjekt.insert("updated_at", DataHandler::datoStempel());
+
+    emit leggTilProsjekt(nyttProsjekt);
+}
+
+
+void NyttProsjektDialog::on_checkVarsleStart_clicked() {
+    endreVarselStatus();
+}
+
+
+void NyttProsjektDialog::on_checkVarsleSlutt_clicked() {
+    endreVarselStatus();
+}
+
+void NyttProsjektDialog::endreVarselStatus() {
+    ui->spinBoxAntallDognVarslingSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
+    ui->spinBoxTimerForSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
+    ui->spinBoxAntallDognVarslingStart->setEnabled(ui->checkVarsleStart->isChecked());
+    ui->spinBoxTimerForStart->setEnabled(ui->checkVarsleStart->isChecked());
+}

src/uidialogs/widgetdialogs/prosjekt/nyttprosjektdialog.h

@@ -1,37 +1,38 @@
-#ifndef NYTTPROSJEKTDIALOG_H
-#define NYTTPROSJEKTDIALOG_H
-
-#include <QDialog>
-#include "datatypes.h"
-
-namespace Ui {
-class NyttProsjektDialog;
-}
-
-class NyttProsjektDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NyttProsjektDialog(QWidget *parent = nullptr);
-    ~NyttProsjektDialog();
-
-    void opprettOrdreNr(int ordreNr);
-    void fokusStart();
-
-signals:
-    void leggTilProsjekt(ProsjektFil prosjekt);
-
-private slots:
-    void on_pushAvbryt_clicked();
-    void on_pushLagre_clicked();
-    void on_checkVarsleStart_clicked();
-    void on_checkVarsleSlutt_clicked();
-
-private:
-    Ui::NyttProsjektDialog *ui;
-
-    void endreVarselStatus();
-};
-
-#endif // NYTTPROSJEKTDIALOG_H
+#ifndef NYTTPROSJEKTDIALOG_H
+#define NYTTPROSJEKTDIALOG_H
+
+#include <QDialog>
+#include "datahandler.h"
+#include "datatypes.h"
+
+namespace Ui {
+class NyttProsjektDialog;
+}
+
+class NyttProsjektDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit NyttProsjektDialog(QWidget *parent = nullptr);
+    ~NyttProsjektDialog();
+
+    void opprettOrdreNr(int ordreNr);
+    void fokusStart();
+
+signals:
+    void leggTilProsjekt(ProsjektFil prosjekt);
+
+private slots:
+    void on_pushAvbryt_clicked();
+    void on_pushLagre_clicked();
+    void on_checkVarsleStart_clicked();
+    void on_checkVarsleSlutt_clicked();
+
+private:
+    Ui::NyttProsjektDialog *ui;
+
+    void endreVarselStatus();
+};
+
+#endif // NYTTPROSJEKTDIALOG_H

src/uidialogs/widgetdialogs/prosjekt/prosjektdialoger.pri

@@ -0,0 +1,21 @@
+INCLUDEPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+DEPENDPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+
+SOURCES += \
+    $$PWD/nyttprosjektdialog.cpp \
+    $$PWD/redigerprosjektdialog.cpp
+
+HEADERS += \
+    $$PWD/nyttprosjektdialog.h \
+    $$PWD/redigerprosjektdialog.h
+
+FORMS += \
+    $$PWD/nyttprosjektdialog.ui \
+    $$PWD/redigerprosjektdialog.ui
+
+RESOURCES += \
+    $$PWD/../../../../resources.qrc

src/uidialogs/widgetdialogs/prosjekt/redigerprosjektdialog.cpp

@@ -1,111 +1,112 @@
-#include "redigerprosjektdialog.h"
-#include "ui_redigerprosjektdialog.h"
-
-RedigerProsjektDialog::RedigerProsjektDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::RedigerProsjektDialog) {
-    ui->setupUi(this);
-}
-
-RedigerProsjektDialog::~RedigerProsjektDialog() {
-    delete ui;
-}
-
-void RedigerProsjektDialog::settProsjektFil(ProsjektFil prosjekt) {
-    prosjektFil = prosjekt;
-    fyllSkjemaElementer();
-}
-
-void RedigerProsjektDialog::fyllSkjemaElementer() {
-    ui->lineProsjektNavn->setText(prosjektFil.value("prosjektnavn").toString());
-    ui->lineOrdrenummer->setText(prosjektFil.value("ordrenummer").toString());
-    ui->textEditProsjektBeskrivelse->setHtml(prosjektFil.value("prosjektbeskrivelse").toString());
-    ui->checkVarsleStart->setChecked(prosjektFil.value("varslestart").toBool());
-    ui->checkVarsleSlutt->setChecked(prosjektFil.value("varsleslutt").toBool());
-    endreVarselStatus();
-
-    quint64 prosjektStart = prosjektFil.value("prosjektstart").toULongLong();
-    quint64 prosjektSlutt = prosjektFil.value("prosjektslutt").toULongLong();
-    QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(prosjektStart));
-    QDateTime tProsjektSlutt(QDateTime::fromMSecsSinceEpoch(prosjektSlutt));
-
-    ui->dateStart->setDateTime(tProsjektStart);
-    ui->dateSlutt->setDateTime(tProsjektSlutt);
-    ui->timeStart->setDateTime(tProsjektStart);
-    ui->timeSlutt->setDateTime(tProsjektSlutt);
-
-    ui->spinBoxAntallDognVarslingStart->setValue(prosjektFil.value("dognvarselstart").toInt());
-    ui->spinBoxAntallDognVarslingSlutt->setValue(prosjektFil.value("dognvarselslutt").toInt());
-    ui->spinBoxTimerForStart->setValue(prosjektFil.value("timervarselstart").toInt());
-    ui->spinBoxTimerForSlutt->setValue(prosjektFil.value("timercarselslutt").toInt());
-}
-
-void RedigerProsjektDialog::on_checkVarsleStart_clicked() {
-    endreVarselStatus();
-}
-
-
-void RedigerProsjektDialog::on_checkVarsleSlutt_clicked() {
-    endreVarselStatus();
-}
-
-void RedigerProsjektDialog::endreVarselStatus() {
-    ui->spinBoxAntallDognVarslingSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
-    ui->spinBoxTimerForSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
-    ui->spinBoxAntallDognVarslingStart->setEnabled(ui->checkVarsleStart->isChecked());
-    ui->spinBoxTimerForStart->setEnabled(ui->checkVarsleStart->isChecked());
-}
-
-
-void RedigerProsjektDialog::on_pushAvbryt_clicked() {
-    QDialog::close();
-}
-
-
-void RedigerProsjektDialog::on_pushLagre_clicked() {
-    ProsjektFil nyttProsjekt;
-
-    nyttProsjekt.insert("prosjektnavn", ui->lineProsjektNavn->text());
-    nyttProsjekt.insert("ordrenummer", ui->lineOrdrenummer->text().toInt());
-    nyttProsjekt.insert("prosjektbeskrivelse", ui->textEditProsjektBeskrivelse->toHtml());
-    nyttProsjekt.insert("varslestart", ui->checkVarsleStart->isChecked());
-    nyttProsjekt.insert("varsleslutt", ui->checkVarsleSlutt->isChecked());
-
-    QDateTime prosjektStartDato = ui->dateStart->dateTime();
-    quint64 mSekStart = prosjektStartDato.toMSecsSinceEpoch() + ui->timeStart->time().msecsSinceStartOfDay();
-
-    QDateTime prosjektSluttDato = ui->dateSlutt->dateTime();
-    quint64 mSekSlutt = prosjektSluttDato.toMSecsSinceEpoch() + ui->timeSlutt->time().msecsSinceStartOfDay();
-
-    nyttProsjekt.insert("prosjektstart", mSekStart);
-    nyttProsjekt.insert("prosjektslutt", mSekSlutt);
-
-    int dognVarselStart = ui->spinBoxAntallDognVarslingStart->value();
-    int timerVarselStart = ui->spinBoxTimerForStart->value();
-    quint64 epochVarselDognStart = dognVarselStart * 24 * 60 * 60 * 1000;
-    quint64 epochVarselTimerStart = timerVarselStart * 60 * 60 * 1000;
-    quint64 epochVarselStart = epochVarselDognStart + epochVarselTimerStart;
-
-    int dognVarselSlutt = ui->spinBoxAntallDognVarslingSlutt->value();
-    int timerVarselSlutt = ui->spinBoxTimerForSlutt->value();
-    quint64 epochVarselDognSlutt = dognVarselSlutt * 24 * 60 * 60 * 1000;
-    quint64 epochVarselTimerSlutt = timerVarselSlutt * 60 * 60 * 1000;
-    quint64 epochVarselSlutt = epochVarselDognSlutt + epochVarselTimerSlutt;
-
-    nyttProsjekt.insert("varselstart", epochVarselStart);
-    nyttProsjekt.insert("varselslutt", epochVarselSlutt);
-    nyttProsjekt.insert("dognvarselstart", ui->spinBoxAntallDognVarslingStart->value());
-    nyttProsjekt.insert("dognvarselslutt", ui->spinBoxAntallDognVarslingSlutt->value());
-    nyttProsjekt.insert("timervarselstart", ui->spinBoxTimerForStart->value());
-    nyttProsjekt.insert("timercarselslutt", ui->spinBoxTimerForSlutt->value());
-
-    nyttProsjekt.insert("active", true);
-    nyttProsjekt.insert("ferdig", false);
-
-    emit lagreProsjekt(nyttProsjekt);
-}
-
-void RedigerProsjektDialog::fokusStart() {
-    ui->lineProsjektNavn->setFocus();
-    ui->lineProsjektNavn->selectAll();
-}
+#include "redigerprosjektdialog.h"
+#include "ui_redigerprosjektdialog.h"
+
+RedigerProsjektDialog::RedigerProsjektDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::RedigerProsjektDialog) {
+    ui->setupUi(this);
+}
+
+RedigerProsjektDialog::~RedigerProsjektDialog() {
+    delete ui;
+}
+
+void RedigerProsjektDialog::settProsjektFil(ProsjektFil prosjekt) {
+    prosjektFil = prosjekt;
+    fyllSkjemaElementer();
+}
+
+void RedigerProsjektDialog::fyllSkjemaElementer() {
+    ui->lineProsjektNavn->setText(prosjektFil.value("prosjektnavn").toString());
+    ui->lineOrdrenummer->setText(prosjektFil.value("ordrenummer").toString());
+    ui->textEditProsjektBeskrivelse->setHtml(prosjektFil.value("prosjektbeskrivelse").toString());
+    ui->checkVarsleStart->setChecked(prosjektFil.value("varslestart").toBool());
+    ui->checkVarsleSlutt->setChecked(prosjektFil.value("varsleslutt").toBool());
+    endreVarselStatus();
+
+    quint64 prosjektStart = prosjektFil.value("prosjektstart").toULongLong();
+    quint64 prosjektSlutt = prosjektFil.value("prosjektslutt").toULongLong();
+    QDateTime tProsjektStart(QDateTime::fromMSecsSinceEpoch(prosjektStart));
+    QDateTime tProsjektSlutt(QDateTime::fromMSecsSinceEpoch(prosjektSlutt));
+
+    ui->dateStart->setDateTime(tProsjektStart);
+    ui->dateSlutt->setDateTime(tProsjektSlutt);
+    ui->timeStart->setDateTime(tProsjektStart);
+    ui->timeSlutt->setDateTime(tProsjektSlutt);
+
+    ui->spinBoxAntallDognVarslingStart->setValue(prosjektFil.value("dognvarselstart").toInt());
+    ui->spinBoxAntallDognVarslingSlutt->setValue(prosjektFil.value("dognvarselslutt").toInt());
+    ui->spinBoxTimerForStart->setValue(prosjektFil.value("timervarselstart").toInt());
+    ui->spinBoxTimerForSlutt->setValue(prosjektFil.value("timercarselslutt").toInt());
+}
+
+void RedigerProsjektDialog::on_checkVarsleStart_clicked() {
+    endreVarselStatus();
+}
+
+
+void RedigerProsjektDialog::on_checkVarsleSlutt_clicked() {
+    endreVarselStatus();
+}
+
+void RedigerProsjektDialog::endreVarselStatus() {
+    ui->spinBoxAntallDognVarslingSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
+    ui->spinBoxTimerForSlutt->setEnabled(ui->checkVarsleSlutt->isChecked());
+    ui->spinBoxAntallDognVarslingStart->setEnabled(ui->checkVarsleStart->isChecked());
+    ui->spinBoxTimerForStart->setEnabled(ui->checkVarsleStart->isChecked());
+}
+
+
+void RedigerProsjektDialog::on_pushAvbryt_clicked() {
+    QDialog::close();
+}
+
+
+void RedigerProsjektDialog::on_pushLagre_clicked() {
+    ProsjektFil nyttProsjekt;
+
+    nyttProsjekt.insert("prosjektnavn", ui->lineProsjektNavn->text());
+    nyttProsjekt.insert("ordrenummer", ui->lineOrdrenummer->text().toInt());
+    nyttProsjekt.insert("prosjektbeskrivelse", ui->textEditProsjektBeskrivelse->toHtml());
+    nyttProsjekt.insert("varslestart", ui->checkVarsleStart->isChecked());
+    nyttProsjekt.insert("varsleslutt", ui->checkVarsleSlutt->isChecked());
+
+    QDateTime prosjektStartDato = ui->dateStart->dateTime();
+    quint64 mSekStart = prosjektStartDato.toMSecsSinceEpoch() + ui->timeStart->time().msecsSinceStartOfDay();
+
+    QDateTime prosjektSluttDato = ui->dateSlutt->dateTime();
+    quint64 mSekSlutt = prosjektSluttDato.toMSecsSinceEpoch() + ui->timeSlutt->time().msecsSinceStartOfDay();
+
+    nyttProsjekt.insert("prosjektstart", mSekStart);
+    nyttProsjekt.insert("prosjektslutt", mSekSlutt);
+
+    int dognVarselStart = ui->spinBoxAntallDognVarslingStart->value();
+    int timerVarselStart = ui->spinBoxTimerForStart->value();
+    quint64 epochVarselDognStart = dognVarselStart * 24 * 60 * 60 * 1000;
+    quint64 epochVarselTimerStart = timerVarselStart * 60 * 60 * 1000;
+    quint64 epochVarselStart = epochVarselDognStart + epochVarselTimerStart;
+
+    int dognVarselSlutt = ui->spinBoxAntallDognVarslingSlutt->value();
+    int timerVarselSlutt = ui->spinBoxTimerForSlutt->value();
+    quint64 epochVarselDognSlutt = dognVarselSlutt * 24 * 60 * 60 * 1000;
+    quint64 epochVarselTimerSlutt = timerVarselSlutt * 60 * 60 * 1000;
+    quint64 epochVarselSlutt = epochVarselDognSlutt + epochVarselTimerSlutt;
+
+    nyttProsjekt.insert("varselstart", epochVarselStart);
+    nyttProsjekt.insert("varselslutt", epochVarselSlutt);
+    nyttProsjekt.insert("dognvarselstart", ui->spinBoxAntallDognVarslingStart->value());
+    nyttProsjekt.insert("dognvarselslutt", ui->spinBoxAntallDognVarslingSlutt->value());
+    nyttProsjekt.insert("timervarselstart", ui->spinBoxTimerForStart->value());
+    nyttProsjekt.insert("timercarselslutt", ui->spinBoxTimerForSlutt->value());
+
+    nyttProsjekt.insert("active", true);
+    nyttProsjekt.insert("ferdig", false);
+    nyttProsjekt.insert("updated_at", DataHandler::datoStempel());
+
+    emit lagreProsjekt(nyttProsjekt);
+}
+
+void RedigerProsjektDialog::fokusStart() {
+    ui->lineProsjektNavn->setFocus();
+    ui->lineProsjektNavn->selectAll();
+}

src/uidialogs/widgetdialogs/prosjekt/redigerprosjektdialog.h

@@ -1,38 +1,39 @@
-#ifndef REDIGERPROSJEKTDIALOG_H
-#define REDIGERPROSJEKTDIALOG_H
-
-#include <QDialog>
-#include "datatypes.h"
-
-namespace Ui {
-class RedigerProsjektDialog;
-}
-
-class RedigerProsjektDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit RedigerProsjektDialog(QWidget *parent = nullptr);
-    ~RedigerProsjektDialog();
-    void settProsjektFil(ProsjektFil prosjekt);
-    void fokusStart();
-
-signals:
-    void lagreProsjekt(ProsjektFil prosjekt);
-
-private slots:
-    void on_checkVarsleStart_clicked();
-    void on_checkVarsleSlutt_clicked();
-    void endreVarselStatus();
-    void on_pushAvbryt_clicked();
-    void on_pushLagre_clicked();
-
-private:
-    Ui::RedigerProsjektDialog *ui;
-    ProsjektFil prosjektFil;
-
-    void fyllSkjemaElementer();
-};
-
-#endif // REDIGERPROSJEKTDIALOG_H
+#ifndef REDIGERPROSJEKTDIALOG_H
+#define REDIGERPROSJEKTDIALOG_H
+
+#include <QDialog>
+#include "datahandler.h"
+#include "datatypes.h"
+
+namespace Ui {
+class RedigerProsjektDialog;
+}
+
+class RedigerProsjektDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit RedigerProsjektDialog(QWidget *parent = nullptr);
+    ~RedigerProsjektDialog();
+    void settProsjektFil(ProsjektFil prosjekt);
+    void fokusStart();
+
+signals:
+    void lagreProsjekt(ProsjektFil prosjekt);
+
+private slots:
+    void on_checkVarsleStart_clicked();
+    void on_checkVarsleSlutt_clicked();
+    void endreVarselStatus();
+    void on_pushAvbryt_clicked();
+    void on_pushLagre_clicked();
+
+private:
+    Ui::RedigerProsjektDialog *ui;
+    ProsjektFil prosjektFil;
+
+    void fyllSkjemaElementer();
+};
+
+#endif // REDIGERPROSJEKTDIALOG_H