Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update #282

Merged
merged 114 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
0fb538a
gt tables changes
conlooptechnologies Nov 23, 2023
6699c3e
Merge pull request #466 from africanmathsinitiative/master
conlooptechnologies Nov 23, 2023
d2976a0
Merge pull request #467 from Patowhiz/PlotNullBug
conlooptechnologies Nov 23, 2023
33811d1
Merge pull request #468 from Patowhiz/PlotNullBug
conlooptechnologies Nov 23, 2023
cf2a1b4
more initial implementation
conlooptechnologies Nov 24, 2023
c4d7f56
Merge branch 'master' into GtTable
conlooptechnologies Feb 19, 2024
6520a3c
Added formating options
conlooptechnologies Feb 20, 2024
bb8f443
Removed white spaces
conlooptechnologies Feb 20, 2024
6979c5e
Added source notes feature
conlooptechnologies Feb 20, 2024
33e7740
Restored themes functionality
conlooptechnologies Feb 20, 2024
e918eb2
removed title and subtitle bug
conlooptechnologies Feb 20, 2024
8f1f280
Refactored summary table dialog
conlooptechnologies Feb 20, 2024
2b2d925
fixes themes bugs and improves code
conlooptechnologies Feb 22, 2024
bc841b7
Added header footers and disable alignement format
conlooptechnologies Apr 5, 2024
a772b49
made changes to xelss expression footers
conlooptechnologies Apr 8, 2024
5f5b425
made changes to labelling
conlooptechnologies Apr 8, 2024
935e2ff
Merge pull request #483 from IDEMSInternational/master
conlooptechnologies May 7, 2024
9143a41
More addtions
conlooptechnologies May 16, 2024
97445c7
Dded group by column
conlooptechnologies May 16, 2024
c4808db
Added more functionalities
conlooptechnologies May 16, 2024
5192d41
Merge pull request #484 from IDEMSInternational/master
conlooptechnologies May 16, 2024
93dec06
Made changes to frmMain
conlooptechnologies May 17, 2024
75a3f2d
Merge branch 'master' into GtTableNew
conlooptechnologies May 21, 2024
d3ab2f6
made corrections to frmMain
conlooptechnologies May 21, 2024
66a5716
Added 2 header footer notes
conlooptechnologies May 21, 2024
e4d6578
Removed syntax errors
conlooptechnologies May 21, 2024
3adf7bb
Fixed formatting bug
conlooptechnologies May 22, 2024
68bb982
Removed formating comments
conlooptechnologies May 22, 2024
15d1564
Added row name functionality
conlooptechnologies May 22, 2024
e8a3464
Made changes to user interface
conlooptechnologies May 23, 2024
03a0051
more changes
conlooptechnologies May 23, 2024
83ac020
Added Groups functionality
conlooptechnologies May 23, 2024
af6b6e5
Spanners design additons
conlooptechnologies May 29, 2024
c57fe1a
Added column spanners functionality
conlooptechnologies May 30, 2024
2060321
Added column labels
conlooptechnologies May 30, 2024
52e17ab
Added stub tab
conlooptechnologies May 30, 2024
ffc5229
Stub design changes
conlooptechnologies May 30, 2024
7c37345
Added stub functionality
conlooptechnologies May 30, 2024
7f5a417
Made rows changes
conlooptechnologies May 30, 2024
082e06f
added column format design
conlooptechnologies May 30, 2024
c5c9d18
Merge pull request #487 from IDEMSInternational/master
Patowhiz Jun 11, 2024
401a3f1
Made structural changes and added cell features
conlooptechnologies Jun 19, 2024
3113050
Table styles UI designs
conlooptechnologies Jun 20, 2024
6aeed76
Structural changes
conlooptechnologies Jun 20, 2024
8115082
Made changes to cells styles
conlooptechnologies Jun 24, 2024
9e8b01e
design changes
conlooptechnologies Jun 26, 2024
3e419a2
Added cell foot notes
conlooptechnologies Jun 27, 2024
8546157
Made structural changes and added more features
conlooptechnologies Jun 27, 2024
6813fb5
Made structural changes to header and its footers.
conlooptechnologies Jun 27, 2024
26ae154
Added stub styling structure
conlooptechnologies Jun 28, 2024
9ca1fe4
Update to crops definition function to allow for "both"
lilyclements Jul 4, 2024
2b054b3
Update instat_object_R6.R
lilyclements Jul 5, 2024
64c053c
changes
Vitalis95 Jul 8, 2024
4343516
changes
Vitalis95 Jul 8, 2024
82fd684
Merge pull request #254 from lilyclements/crop_prob_r_code
Vitalis95 Jul 8, 2024
969c2f2
Merge pull request #255 from IDEMSInternational/master
Vitalis95 Jul 8, 2024
0e069f4
adding line end
lilyclements Jul 9, 2024
1e29be9
Merge pull request #258 from lilyclements/crop_prob_r_code
Vitalis95 Jul 9, 2024
9db28cc
more stub options
conlooptechnologies Jul 11, 2024
3f33d9b
bug fix - reverting how we are storing "by"
lilyclements Jul 12, 2024
07092c6
Merge pull request #260 from lilyclements/crop_prob_r_code
Vitalis95 Jul 12, 2024
f662591
Added stub style functionality
conlooptechnologies Jul 25, 2024
ef87037
added styling to column spanners
conlooptechnologies Jul 26, 2024
68ba2b3
changes to spanners, formats and styles
conlooptechnologies Jul 28, 2024
3b5251c
Merge pull request #490 from IDEMSInternational/master
Patowhiz Jul 28, 2024
ead8824
changes
Vitalis95 Jul 30, 2024
464ecda
Merge pull request #243 from IDEMSInternational/master
MeSophie Jul 31, 2024
fa31266
Added styling of group label and changed the control designed
conlooptechnologies Aug 1, 2024
9eff7a1
code cleaning
conlooptechnologies Aug 1, 2024
bfe58e9
initial row summaries designs
conlooptechnologies Aug 1, 2024
6a6116a
Merge pull request #245 from IDEMSInternational/master
MeSophie Aug 1, 2024
721abfb
row summaries design additions
conlooptechnologies Aug 1, 2024
5f45872
mor row summary changes
conlooptechnologies Aug 5, 2024
7cb36f6
changes to the code
Vitalis95 Aug 6, 2024
979e91a
more summary changes
conlooptechnologies Aug 7, 2024
d6d3281
Finished row summary feature
conlooptechnologies Aug 8, 2024
b39ba1b
disabled nanoplots
conlooptechnologies Aug 8, 2024
51c0c52
deleted styling through html
conlooptechnologies Aug 8, 2024
a8b3d3a
changes to the code
Vitalis95 Aug 9, 2024
39e5917
changes to the code
Vitalis95 Aug 9, 2024
ea8870e
changes
Vitalis95 Aug 9, 2024
9548bef
changes to the code
Vitalis95 Aug 12, 2024
03afe5b
Merge pull request #493 from IDEMSInternational/master
Patowhiz Aug 13, 2024
0ee879f
changes to the code
Vitalis95 Aug 13, 2024
72f6a20
changes
Vitalis95 Aug 14, 2024
b305412
Merge pull request #250 from IDEMSInternational/master
MeSophie Sep 4, 2024
3cd481a
Merge pull request #251 from lilyclements/adding_drop
MeSophie Sep 4, 2024
268cb38
Added drop parameter on Start and End of rain
MeSophie Sep 4, 2024
373d22c
Change made
MeSophie Sep 11, 2024
cd48f46
Merge branch 'master' into GtTableNew
Patowhiz Sep 14, 2024
b352f41
Implemented suggested changes
conlooptechnologies Sep 16, 2024
28ca7f1
fixed alignment bug
conlooptechnologies Sep 16, 2024
5652619
Merge pull request #956 from MeSophie/NewStartEndRainIssue9117
lilyclements Sep 19, 2024
2057133
Update summary_functions.R
lilyclements Sep 19, 2024
5d5843a
Merge pull request #256 from IDEMSInternational/master
MeSophie Sep 22, 2024
978346e
Merge pull request #257 from lilyclements/sophie_pr9125
MeSophie Sep 22, 2024
7708f48
Added drop parameter on Start and End of rain.
MeSophie Sep 23, 2024
c9784d9
changes
Vitalis95 Sep 23, 2024
37c7c7b
changes
Vitalis95 Sep 23, 2024
cbb34f4
changes to the code
Vitalis95 Sep 23, 2024
dc8dec7
Creating additional libray on vb.net
N-thony Sep 23, 2024
4b43e4a
minor code changes
N-thony Sep 23, 2024
4431bf4
code addition for not debug mode
N-thony Sep 24, 2024
eec78dc
Made suggested changes
conlooptechnologies Sep 24, 2024
b744a92
Merge branch 'master' into GtTableNew
Patowhiz Sep 24, 2024
7f2a384
Change made
MeSophie Sep 24, 2024
50af292
Update summary_functions.R
lilyclements Sep 24, 2024
97a4b0b
minor code change
N-thony Sep 25, 2024
75b837a
Merge pull request #8978 from Patowhiz/GtTableNew
N-thony Sep 25, 2024
ec8981a
Merge pull request #9148 from Vitalis95/distancedlg
N-thony Sep 25, 2024
168a5f3
Change made
MeSophie Sep 25, 2024
36fe0cf
Merge pull request #9150 from N-thony/fixing_additional_lib_directory
N-thony Sep 26, 2024
daaa9ee
Merge pull request #9147 from MeSophie/DropStartofxRain9117
N-thony Sep 26, 2024
a23dd89
Merge pull request #9085 from Vitalis95/picsa_crops
N-thony Sep 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 202 additions & 0 deletions instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

126 changes: 126 additions & 0 deletions instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="colStyles.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colStyles.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>
Loading
Loading